X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fgltext.c;h=a537c374299fe7f09e6e98fb1dfa0705bdfb67e1;hp=03110fe882d7f6c2952d3e126ccb68c05c453d37;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=a445bdd3e3ba4abbee441844b6665b4c3c13d48c diff --git a/hacks/glx/gltext.c b/hacks/glx/gltext.c index 03110fe8..a537c374 100644 --- a/hacks/glx/gltext.c +++ b/hacks/glx/gltext.c @@ -1,4 +1,4 @@ -/* gltext, Copyright (c) 2001 Jamie Zawinski +/* gltext, Copyright (c) 2001, 2002, 2003, 2004 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -17,13 +17,15 @@ extern XtAppContext app; #define HACK_INIT init_text #define HACK_DRAW draw_text #define HACK_RESHAPE reshape_text +#define HACK_HANDLE_EVENT text_handle_event +#define EVENT_MASK PointerMotionMask #define sws_opts xlockmore_opts #define DEF_TEXT "(default)" #define DEF_SPIN "XYZ" #define DEF_WANDER "True" -#define DEFAULTS "*delay: 10000 \n" \ +#define DEFAULTS "*delay: 20000 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ "*spin: " DEF_SPIN "\n" \ @@ -45,6 +47,11 @@ extern XtAppContext app; #include "xlockmore.h" #include "colors.h" +#include "tube.h" +#include "rotator.h" +#include "gltrackball.h" +#include +#include #include #ifdef USE_GL /* whole file */ @@ -62,11 +69,9 @@ extern XtAppContext app; typedef struct { GLXContext *glx_context; - - GLfloat rotx, roty, rotz; /* current object rotation */ - GLfloat dx, dy, dz; /* current rotational velocity */ - GLfloat ddx, ddy, ddz; /* current rotational acceleration */ - GLfloat d_max; /* max velocity */ + rotator *rot; + trackball_state *trackball; + Bool button_down_p; GLuint text_list; @@ -74,7 +79,6 @@ typedef struct { XColor *colors; int ccolor; - Bool spin_x, spin_y, spin_z; char *text; } text_configuration; @@ -94,9 +98,9 @@ static XrmOptionDescRec opts[] = { }; static argtype vars[] = { - {(caddr_t *) &text_fmt, "text", "Text", DEF_TEXT, t_String}, - {(caddr_t *) &do_spin, "spin", "Spin", DEF_SPIN, t_String}, - {(caddr_t *) &do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, + {&text_fmt, "text", "Text", DEF_TEXT, t_String}, + {&do_spin, "spin", "Spin", DEF_SPIN, t_String}, + {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, }; ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL}; @@ -113,14 +117,13 @@ reshape_text (ModeInfo *mi, int width, int height) glMatrixMode(GL_PROJECTION); glLoadIdentity(); + gluPerspective (30.0, 1/h, 1.0, 100.0); - gluPerspective( 30.0, 1/h, 1.0, 100.0 ); - gluLookAt( 0.0, 0.0, 15.0, - 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - glTranslatef(0.0, 0.0, -15.0); + gluLookAt( 0.0, 0.0, 30.0, + 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0); glClear(GL_COLOR_BUFFER_BIT); } @@ -149,73 +152,28 @@ gl_init (ModeInfo *mi) } -/* lifted from lament.c */ -#define RAND(n) ((long) ((random() & 0x7fffffff) % ((long) (n)))) -#define RANDSIGN() ((random() & 1) ? 1 : -1) - +/* The GLUT font only has ASCII characters in them, so do what we can to + convert Latin1 characters to the nearest ASCII equivalent... + */ static void -rotate(GLfloat *pos, GLfloat *v, GLfloat *dv, GLfloat max_v) +latin1_to_ascii (char *s) { - double ppos = *pos; - - /* tick position */ - if (ppos < 0) - ppos = -(ppos + *v); - else - ppos += *v; - - if (ppos > 1.0) - ppos -= 1.0; - else if (ppos < 0) - ppos += 1.0; - - if (ppos < 0) abort(); - if (ppos > 1.0) abort(); - *pos = (*pos > 0 ? ppos : -ppos); - - /* accelerate */ - *v += *dv; - - /* clamp velocity */ - if (*v > max_v || *v < -max_v) + unsigned char *us = (unsigned char *) s; + const unsigned char ascii[95] = { + '!', 'C', '#', '#', 'Y', '|', 'S', '_', 'C', '?', '<', '=', '-', 'R', '_', + '?', '?', '2', '3', '\'','u', 'P', '.', ',', '1', 'o', '>', '?', '?', '?', + '?', 'A', 'A', 'A', 'A', 'A', 'A', 'E', 'C', 'E', 'E', 'E', 'E', 'I', 'I', + 'I', 'I', 'D', 'N', 'O', 'O', 'O', 'O', 'O', 'x', '0', 'U', 'U', 'U', 'U', + 'Y', 'p', 'S', 'a', 'a', 'a', 'a', 'a', 'a', 'e', 'c', 'e', 'e', 'e', 'e', + 'i', 'i', 'i', 'i', 'o', 'n', 'o', 'o', 'o', 'o', 'o', '/', 'o', 'u', 'u', + 'u', 'u', 'y', 'p', 'y' }; + while (*us) { - *dv = -*dv; - } - /* If it stops, start it going in the other direction. */ - else if (*v < 0) - { - if (random() % 4) - { - *v = 0; - - /* keep going in the same direction */ - if (random() % 2) - *dv = 0; - else if (*dv < 0) - *dv = -*dv; - } - else - { - /* reverse gears */ - *v = -*v; - *dv = -*dv; - *pos = -*pos; - } - } - - /* Alter direction of rotational acceleration randomly. */ - if (! (random() % 120)) - *dv = -*dv; - - /* Change acceleration very occasionally. */ - if (! (random() % 200)) - { - if (*dv == 0) - *dv = 0.00001; - else if (random() & 1) - *dv *= 1.2; - else - *dv *= 0.8; + if (*us >= 161) + *us = ascii[*us - 161]; + else if (*us > 127) + *us = '?'; + us++; } } @@ -245,13 +203,16 @@ parse_text (ModeInfo *mi) strlen(uts.sysname) + strlen(uts.version) + strlen(uts.release) + 10); -# ifdef _AIX +# if defined(_AIX) sprintf(tp->text, "%s\n%s %s.%s", uts.nodename, uts.sysname, uts.version, uts.release); -# else /* !_AIX */ +# elif defined(__APPLE__) /* MacOS X + XDarwin */ + sprintf(tp->text, "%s\n%s %s\n%s", + uts.nodename, uts.sysname, uts.release, uts.machine); +# else sprintf(tp->text, "%s\n%s %s", uts.nodename, uts.sysname, uts.release); -# endif /* !_AIX */ +# endif /* special system types */ } # else /* !HAVE_UNAME */ # ifdef VMS @@ -276,6 +237,41 @@ parse_text (ModeInfo *mi) if (!*tp->text) sprintf (tp->text, "strftime error:\n%s", text_fmt); } + + latin1_to_ascii (tp->text); +} + + +Bool +text_handle_event (ModeInfo *mi, XEvent *event) +{ + text_configuration *tp = &tps[MI_SCREEN(mi)]; + + if (event->xany.type == ButtonPress && + event->xbutton.button & Button1) + { + tp->button_down_p = True; + gltrackball_start (tp->trackball, + event->xbutton.x, event->xbutton.y, + MI_WIDTH (mi), MI_HEIGHT (mi)); + return True; + } + else if (event->xany.type == ButtonRelease && + event->xbutton.button & Button1) + { + tp->button_down_p = False; + return True; + } + else if (event->xany.type == MotionNotify && + tp->button_down_p) + { + gltrackball_track (tp->trackball, + event->xmotion.x, event->xmotion.y, + MI_WIDTH (mi), MI_HEIGHT (mi)); + return True; + } + + return False; } @@ -283,6 +279,7 @@ void init_text (ModeInfo *mi) { text_configuration *tp; + int i; if (!tps) { tps = (text_configuration *) @@ -302,37 +299,18 @@ init_text (ModeInfo *mi) reshape_text (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); } - tp->rotx = frand(1.0) * RANDSIGN(); - tp->roty = frand(1.0) * RANDSIGN(); - tp->rotz = frand(1.0) * RANDSIGN(); - - /* bell curve from 0-6 degrees, avg 3 */ - tp->dx = (frand(1) + frand(1) + frand(1)) / (360/2); - tp->dy = (frand(1) + frand(1) + frand(1)) / (360/2); - tp->dz = (frand(1) + frand(1) + frand(1)) / (360/2); - - tp->d_max = tp->dx * 2; - - tp->ddx = 0.00006 + frand(0.00003); - tp->ddy = 0.00006 + frand(0.00003); - tp->ddz = 0.00006 + frand(0.00003); - - - tp->ncolors = 255; - tp->colors = (XColor *) calloc(tp->ncolors, sizeof(XColor)); - make_smooth_colormap (0, 0, 0, - tp->colors, &tp->ncolors, - False, 0, False); - - parse_text (mi); - { + Bool spinx=False, spiny=False, spinz=False; + double spin_speed = 0.5; + double wander_speed = 0.02; + double spin_accel = 0.5; + char *s = do_spin; while (*s) { - if (*s == 'x' || *s == 'X') tp->spin_x = 1; - else if (*s == 'y' || *s == 'Y') tp->spin_y = 1; - else if (*s == 'z' || *s == 'Z') tp->spin_z = 1; + if (*s == 'x' || *s == 'X') spinx = True; + else if (*s == 'y' || *s == 'Y') spiny = True; + else if (*s == 'z' || *s == 'Z') spinz = True; else { fprintf (stderr, @@ -342,111 +320,35 @@ init_text (ModeInfo *mi) } s++; } - } -} - - -static void -unit_tube (Bool wire) -{ - int i; - int faces = TUBE_FACES; - GLfloat step = M_PI * 2 / faces; - GLfloat th; - int z = 0; - - /* side walls - */ - glFrontFace(GL_CCW); - -# ifdef SMOOTH_TUBE - glBegin(wire ? GL_LINES : GL_QUAD_STRIP); -# else - glBegin(wire ? GL_LINES : GL_QUADS); -# endif + tp->rot = make_rotator (spinx ? spin_speed : 0, + spiny ? spin_speed : 0, + spinz ? spin_speed : 0, + spin_accel, + do_wander ? wander_speed : 0, + False); + tp->trackball = gltrackball_init (); + } - for (i = 0, th = 0; i <= faces; i++) - { - GLfloat x = cos (th); - GLfloat y = sin (th); - glNormal3f(x, 0, y); - glVertex3f(x, 0.0, y); - glVertex3f(x, 1.0, y); - th += step; - -# ifndef SMOOTH_TUBE - x = cos (th); - y = sin (th); - glVertex3f(x, 1.0, y); - glVertex3f(x, 0.0, y); -# endif - } - glEnd(); + tp->ncolors = 255; + tp->colors = (XColor *) calloc(tp->ncolors, sizeof(XColor)); + make_smooth_colormap (0, 0, 0, + tp->colors, &tp->ncolors, + False, 0, False); - /* End caps - */ - for (z = 0; z <= 1; z++) + /* brighter colors, please... */ + for (i = 0; i < tp->ncolors; i++) { - glFrontFace(z == 0 ? GL_CCW : GL_CW); - glNormal3f(0, (z == 0 ? -1 : 1), 0); - glBegin(wire ? GL_LINE_LOOP : GL_TRIANGLE_FAN); - if (! wire) glVertex3f(0, z, 0); - for (i = 0, th = 0; i <= faces; i++) - { - GLfloat x = cos (th); - GLfloat y = sin (th); - glVertex3f(x, z, y); - th += step; - } - glEnd(); + tp->colors[i].red = (tp->colors[i].red / 2) + 32767; + tp->colors[i].green = (tp->colors[i].green / 2) + 32767; + tp->colors[i].blue = (tp->colors[i].blue / 2) + 32767; } -} - - -static void -tube (GLfloat x1, GLfloat y1, GLfloat z1, - GLfloat x2, GLfloat y2, GLfloat z2, - GLfloat diameter, GLfloat cap_size, - Bool wire) -{ - GLfloat length, angle, a, b, c; - - if (diameter <= 0) abort(); - - a = (x2 - x1); - b = (y2 - y1); - c = (z2 - z1); - - length = sqrt (a*a + b*b + c*c); - angle = acos (a / length); - - glPushMatrix(); - glTranslatef(x1, y1, z1); - glScalef (length, length, length); - - if (c == 0 && b == 0) - glRotatef (angle / (M_PI / 180), 0, 1, 0); - else - glRotatef (angle / (M_PI / 180), 0, -c, b); - glRotatef (-90, 0, 0, 1); - glScalef (diameter/length, 1, diameter/length); - - /* extend the endpoints of the tube by the cap size in both directions */ - if (cap_size != 0) - { - GLfloat c = cap_size/length; - glTranslatef (0, -c, 0); - glScalef (1, 1+c+c, 1); - } + parse_text (mi); - unit_tube (wire); - glPopMatrix(); } - static int fill_character (GLUTstrokeFont font, int c, Bool wire) { @@ -465,18 +367,23 @@ fill_character (GLUTstrokeFont font, int c, Bool wire) ch = &(fontinfo->ch[c]); if (ch) { - GLfloat lx, ly; + GLfloat lx=0, ly=0; for (i = ch->num_strokes, stroke = ch->stroke; i > 0; i--, stroke++) { for (j = stroke->num_coords, coord = stroke->coord; j > 0; j--, coord++) { +# ifdef SMOOTH_TUBE + int smooth = True; +# else + int smooth = False; +# endif if (j != stroke->num_coords) - tube (lx, ly, 0, + tube (lx, ly, 0, coord->x, coord->y, 0, tube_width, tube_width * 0.15, - wire); + TUBE_FACES, smooth, True, wire); lx = coord->x; ly = coord->y; } @@ -510,9 +417,9 @@ text_extents (const char *string, int *wP, int *hP) if (w > *wP) *wP = w; *hP += line_height; - s++; lines++; if (*s == 0) break; + s++; } else s++; @@ -612,41 +519,21 @@ draw_text (ModeInfo *mi) glScalef(1.1, 1.1, 1.1); { - GLfloat x, y, z; - - if (do_wander) - { - static int frame = 0; - -# define SINOID(SCALE,SIZE) \ - ((((1 + sin((frame * (SCALE)) / 2 * M_PI)) / 2.0) * (SIZE)) - (SIZE)/2) - - x = SINOID(0.031, 9.0); - y = SINOID(0.023, 9.0); - z = SINOID(0.017, 9.0); - frame++; - glTranslatef(x, y, z); - } - - if (tp->spin_x || tp->spin_y || tp->spin_z) - { - x = tp->rotx; - y = tp->roty; - z = tp->rotz; - if (x < 0) x = 1 - (x + 1); - if (y < 0) y = 1 - (y + 1); - if (z < 0) z = 1 - (z + 1); - - if (tp->spin_x) glRotatef(x * 360, 1.0, 0.0, 0.0); - if (tp->spin_y) glRotatef(y * 360, 0.0, 1.0, 0.0); - if (tp->spin_z) glRotatef(z * 360, 0.0, 0.0, 1.0); - - rotate(&tp->rotx, &tp->dx, &tp->ddx, tp->d_max); - rotate(&tp->roty, &tp->dy, &tp->ddy, tp->d_max); - rotate(&tp->rotz, &tp->dz, &tp->ddz, tp->d_max); - } + double x, y, z; + get_position (tp->rot, &x, &y, &z, !tp->button_down_p); + glTranslatef((x - 0.5) * 8, + (y - 0.5) * 8, + (z - 0.5) * 8); + + gltrackball_rotate (tp->trackball); + + get_rotation (tp->rot, &x, &y, &z, !tp->button_down_p); + glRotatef (x * 360, 1.0, 0.0, 0.0); + glRotatef (y * 360, 0.0, 1.0, 0.0); + glRotatef (z * 360, 0.0, 0.0, 1.0); } + glColor4fv (white); color[0] = tp->colors[tp->ccolor].red / 65536.0;