X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fgltext.c;h=a4d80b050edc1d93c392eba38163ecf14812a12a;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=75073fb31a05ec30e73a29b984770e64a3d0a4f3;hpb=96bdd7cf6ea60c418a76921acaf0e34d6f5be930;p=xscreensaver diff --git a/hacks/glx/gltext.c b/hacks/glx/gltext.c index 75073fb3..a4d80b05 100644 --- a/hacks/glx/gltext.c +++ b/hacks/glx/gltext.c @@ -1,4 +1,4 @@ -/* gltext, Copyright (c) 2001, 2002, 2003 Jamie Zawinski +/* gltext, Copyright (c) 2001-2014 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 @@ -9,30 +9,12 @@ * implied warranty. */ -#include - -extern XtAppContext app; - -#define PROGCLASS "GLText" -#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" \ - "*showFPS: False \n" \ - "*wireframe: False \n" \ - "*spin: " DEF_SPIN "\n" \ - "*wander: " DEF_WANDER "\n" \ - "*text: " DEF_TEXT "\n" - +#define DEFAULTS "*delay: 20000 \n" \ + "*showFPS: False \n" \ + "*wireframe: False \n" \ + "*usePty: False \n" \ +# define refresh_text 0 #define SMOOTH_TUBE /* whether to have smooth or faceted tubes */ #ifdef SMOOTH_TUBE @@ -48,20 +30,26 @@ extern XtAppContext app; #include "xlockmore.h" #include "colors.h" #include "tube.h" +#include "sphere.h" #include "rotator.h" #include "gltrackball.h" -#include -#include +#include "textclient.h" +#include "utf8wc.h" + #include #ifdef USE_GL /* whole file */ +#define DEF_TEXT "(default)" +#define DEF_PROGRAM "(default)" +#define DEF_SPIN "XYZ" +#define DEF_WANDER "True" +#define DEF_FACE_FRONT "True" + #ifdef HAVE_UNAME # include #endif /* HAVE_UNAME */ - -#include #include "glutstroke.h" #include "glut_roman.h" #define GLUT_FONT (&glutStrokeRoman) @@ -69,9 +57,10 @@ extern XtAppContext app; typedef struct { GLXContext *glx_context; - rotator *rot; + rotator *rot, *rot2; trackball_state *trackball; Bool button_down_p; + Bool spinx, spiny, spinz; GLuint text_list; @@ -80,35 +69,46 @@ typedef struct { int ccolor; char *text; + int reload; + + time_t last_update; + text_data *tc; } text_configuration; static text_configuration *tps = NULL; static char *text_fmt; +static char *program_str; static char *do_spin; static Bool do_wander; +static Bool face_front_p; static XrmOptionDescRec opts[] = { - { "-text", ".text", XrmoptionSepArg, 0 }, - { "-spin", ".spin", XrmoptionSepArg, 0 }, - { "+spin", ".spin", XrmoptionNoArg, "" }, - { "-wander", ".wander", XrmoptionNoArg, "True" }, - { "+wander", ".wander", XrmoptionNoArg, "False" } + { "-text", ".text", XrmoptionSepArg, 0 }, + { "-program", ".program", XrmoptionSepArg, 0 }, + { "-spin", ".spin", XrmoptionSepArg, 0 }, + { "+spin", ".spin", XrmoptionNoArg, "" }, + { "-wander", ".wander", XrmoptionNoArg, "True" }, + { "+wander", ".wander", XrmoptionNoArg, "False" }, + { "-front", ".faceFront", XrmoptionNoArg, "True" }, + { "+front", ".faceFront", XrmoptionNoArg, "False" } }; 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}, + {&program_str, "program", "Program", DEF_PROGRAM, t_String}, + {&do_spin, "spin", "Spin", DEF_SPIN, t_String}, + {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, + {&face_front_p, "faceFront", "FaceFront", DEF_FACE_FRONT, t_Bool}, }; -ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL}; +ENTRYPOINT ModeSpecOpt text_opts = {countof(opts), opts, countof(vars), vars, NULL}; /* Window management, etc */ -void +ENTRYPOINT void reshape_text (ModeInfo *mi, int width, int height) { GLfloat h = (GLfloat) height / (GLfloat) width; @@ -125,6 +125,14 @@ reshape_text (ModeInfo *mi, int width, int height) 0.0, 0.0, 0.0, 0.0, 1.0, 0.0); +# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */ + { + int o = (int) current_device_rotation(); + if (o != 0 && o != 180 && o != -180) + glScalef (1/h, 1/h, 1/h); + } +# endif + glClear(GL_COLOR_BUFFER_BIT); } @@ -135,7 +143,7 @@ gl_init (ModeInfo *mi) text_configuration *tp = &tps[MI_SCREEN(mi)]; int wire = MI_IS_WIREFRAME(mi); - static GLfloat pos[4] = {5.0, 5.0, 10.0, 1.0}; + static const GLfloat pos[4] = {5.0, 5.0, 10.0, 1.0}; if (!wire) { @@ -156,10 +164,41 @@ static void parse_text (ModeInfo *mi) { text_configuration *tp = &tps[MI_SCREEN(mi)]; + char *old = tp->text; - if (tp->text) free (tp->text); + if (program_str && *program_str && !!strcmp(program_str, "(default)")) + { + int max_lines = 8; + char buf[1024]; + char *p = buf; + int lines = 0; - if (!text_fmt || !*text_fmt || !strcmp(text_fmt, "(default)")) + if (! tp->tc) + tp->tc = textclient_open (mi->dpy); + + while (p < buf + sizeof(buf) - 1 && + lines < max_lines) + { + int c = textclient_getc (tp->tc); + if (c == '\n') + lines++; + if (c > 0) + *p++ = (char) c; + else + break; + } + *p = 0; + if (lines == 0 && buf[0]) + lines++; + + tp->text = strdup (buf); + + tp->reload = 7; /* Let this one linger for a few seconds */ + if (!*tp->text) + tp->reload = 1; + + } + else if (!text_fmt || !*text_fmt || !strcmp(text_fmt, "(default)")) { # ifdef HAVE_UNAME struct utsname uts; @@ -180,9 +219,39 @@ parse_text (ModeInfo *mi) # if defined(_AIX) sprintf(tp->text, "%s\n%s %s.%s", uts.nodename, uts.sysname, uts.version, uts.release); +# elif defined(USE_IPHONE) + /* "My iPhone\n iPhone4,1\n Darwin 11.0.0" */ + sprintf(tp->text, "%s\n%s\n%s %s", + uts.nodename, uts.machine, uts.sysname, uts.release); # elif defined(__APPLE__) /* MacOS X + XDarwin */ - sprintf(tp->text, "%s\n%s %s\n%s", - uts.nodename, uts.sysname, uts.release, uts.machine); + { + const char *file = + "/System/Library/CoreServices/SystemVersion.plist"; + FILE *f = fopen (file, "r"); + char *pbv = 0, *pn = 0, *puvv = 0; + if (f) { + char *s, buf[255]; + + while (fgets (buf, sizeof(buf)-1, f)) { +# define GRAB(S,V) \ + if (strstr(buf, S)) { \ + fgets (buf, sizeof(buf)-1, f); \ + if ((s = strchr (buf, '>'))) V = strdup(s+1); \ + if ((s = strchr (V, '<'))) *s = 0; \ + } + GRAB ("ProductName", pn) + GRAB ("ProductBuildVersion", pbv) + GRAB ("ProductUserVisibleVersion", puvv) +# undef GRAB + } + } + if (pbv) + sprintf (tp->text, "%s\n%s\n%s\n%s", + uts.nodename, pn, puvv, uts.machine); + else + 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); @@ -210,44 +279,44 @@ parse_text (ModeInfo *mi) strftime (tp->text, L-1, text_fmt, tm); if (!*tp->text) sprintf (tp->text, "strftime error:\n%s", text_fmt); + tp->reload = 1; + } + + { + /* The GLUT font only has ASCII characters. */ + char *s1 = utf8_to_latin1 (tp->text, True); + free (tp->text); + tp->text = s1; + } + + /* If we had text before but got no text this time, hold on to the + old one, to avoid flickering. + */ + if (old && *old && !*tp->text) + { + free (tp->text); + tp->text = old; } + else if (old) + free (old); } -Bool +ENTRYPOINT 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; - } + if (gltrackball_event_handler (event, tp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &tp->button_down_p)) + return True; return False; } -void +ENTRYPOINT void init_text (ModeInfo *mi) { text_configuration *tp; @@ -260,8 +329,6 @@ init_text (ModeInfo *mi) fprintf(stderr, "%s: out of memory\n", progname); exit(1); } - - tp = &tps[MI_SCREEN(mi)]; } tp = &tps[MI_SCREEN(mi)]; @@ -272,17 +339,18 @@ init_text (ModeInfo *mi) } { - Bool spinx=False, spiny=False, spinz=False; - double spin_speed = 1.0; - double wander_speed = 0.05; - double spin_accel = 1.0; + double spin_speed = 0.5; + double wander_speed = 0.02; + double tilt_speed = 0.03; + double spin_accel = 0.5; char *s = do_spin; while (*s) { - if (*s == 'x' || *s == 'X') spinx = True; - else if (*s == 'y' || *s == 'Y') spiny = True; - else if (*s == 'z' || *s == 'Z') spinz = True; + if (*s == 'x' || *s == 'X') tp->spinx = True; + else if (*s == 'y' || *s == 'Y') tp->spiny = True; + else if (*s == 'z' || *s == 'Z') tp->spinz = True; + else if (*s == '0') ; else { fprintf (stderr, @@ -293,13 +361,16 @@ init_text (ModeInfo *mi) s++; } - tp->rot = make_rotator (spinx ? spin_speed : 0, - spiny ? spin_speed : 0, - spinz ? spin_speed : 0, + tp->rot = make_rotator (tp->spinx ? spin_speed : 0, + tp->spiny ? spin_speed : 0, + tp->spinz ? spin_speed : 0, spin_accel, do_wander ? wander_speed : 0, False); - tp->trackball = gltrackball_init (); + tp->rot2 = (face_front_p + ? make_rotator (0, 0, 0, 0, tilt_speed, True) + : 0); + tp->trackball = gltrackball_init (False); } tp->ncolors = 255; @@ -322,7 +393,7 @@ init_text (ModeInfo *mi) static int -fill_character (GLUTstrokeFont font, int c, Bool wire) +fill_character (GLUTstrokeFont font, int c, Bool wire, int *polysP) { GLfloat tube_width = 10; @@ -350,17 +421,29 @@ fill_character (GLUTstrokeFont font, int c, Bool wire) # else int smooth = False; # endif + if (j != stroke->num_coords) - tube (lx, ly, 0, - coord->x, coord->y, 0, - tube_width, - tube_width * 0.15, - TUBE_FACES, smooth, True, wire); + *polysP += tube (lx, ly, 0, + coord->x, coord->y, 0, + tube_width, + tube_width * 0.15, + TUBE_FACES, smooth, False, wire); lx = coord->x; ly = coord->y; + + /* Put a sphere at the endpoint of every line segment. Wasteful + on curves like "0" but necessary on corners like "4". */ + if (! wire) + { + glPushMatrix(); + glTranslatef (lx, ly, 0); + glScalef (tube_width, tube_width, tube_width); + *polysP += unit_sphere (TUBE_FACES, TUBE_FACES, wire); + glPopMatrix(); + } } } - return (int) (ch->right + tube_width/2); + return (int) (ch->right + tube_width); } return 0; } @@ -389,9 +472,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++; @@ -400,17 +483,17 @@ text_extents (const char *string, int *wP, int *hP) } -static void +static unsigned long fill_string (const char *string, Bool wire) { + int polys = 0; const char *s, *start; int line_height = GLUT_FONT->top - GLUT_FONT->bottom; int off; GLfloat x = 0, y = 0; - int lines; int ow, oh; - lines = text_extents (string, &ow, &oh); + text_extents (string, &ow, &oh); y = oh / 2 - line_height; @@ -439,7 +522,7 @@ fill_string (const char *string, Bool wire) { glPushMatrix(); glTranslatef(x, y, 0); - off = fill_character (GLUT_FONT, *s2, wire); + off = fill_character (GLUT_FONT, *s2, wire, &polys); x += off; glPopMatrix(); } @@ -452,10 +535,11 @@ fill_string (const char *string, Bool wire) } else s++; + return polys; } -void +ENTRYPOINT void draw_text (ModeInfo *mi) { text_configuration *tp = &tps[MI_SCREEN(mi)]; @@ -463,19 +547,21 @@ draw_text (ModeInfo *mi) Window window = MI_WINDOW(mi); int wire = MI_IS_WIREFRAME(mi); - static GLfloat color[4] = {0.0, 0.0, 0.0, 1.0}; - static GLfloat white[4] = {1.0, 1.0, 1.0, 1.0}; + GLfloat white[4] = {1.0, 1.0, 1.0, 1.0}; + GLfloat color[4] = {0.0, 0.0, 0.0, 1.0}; if (!tp->glx_context) return; - if (strchr (text_fmt, '%')) + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(tp->glx_context)); + + if (tp->reload) { - static time_t last_update = -1; - time_t now = time ((time_t *) 0); - if (now != last_update) /* do it once a second */ - parse_text (mi); - last_update = now; + if (time ((time_t *) 0) >= tp->last_update + tp->reload) + { + parse_text (mi); + tp->last_update = time ((time_t *) 0); + } } glShadeModel(GL_SMOOTH); @@ -484,11 +570,12 @@ draw_text (ModeInfo *mi) glEnable(GL_NORMALIZE); glEnable(GL_CULL_FACE); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glPushMatrix (); - glScalef(1.1, 1.1, 1.1); + glRotatef(current_device_rotation(), 0, 0, 1); { double x, y, z; @@ -499,10 +586,21 @@ draw_text (ModeInfo *mi) 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); + if (face_front_p) + { + double max = 90; + get_position (tp->rot2, &x, &y, &z, !tp->button_down_p); + if (tp->spinx) glRotatef (max/2 - x*max, 1, 0, 0); + if (tp->spiny) glRotatef (max/2 - y*max, 0, 1, 0); + if (tp->spinz) glRotatef (max/2 - z*max, 0, 0, 1); + } + else + { + get_rotation (tp->rot, &x, &y, &z, !tp->button_down_p); + glRotatef (x * 360, 1, 0, 0); + glRotatef (y * 360, 0, 1, 0); + glRotatef (z * 360, 0, 0, 1); + } } @@ -518,7 +616,7 @@ draw_text (ModeInfo *mi) glScalef(0.01, 0.01, 0.01); - fill_string(tp->text, wire); + mi->polygon_count = fill_string(tp->text, wire); glPopMatrix (); @@ -528,4 +626,25 @@ draw_text (ModeInfo *mi) glXSwapBuffers(dpy, window); } +ENTRYPOINT void +release_text(ModeInfo * mi) +{ + if (tps) + { + int screen; + for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) + { + text_configuration *tp = &tps[MI_SCREEN(mi)]; + if (tp->tc) + textclient_close (tp->tc); + } + } + (void) free(tps); + tps = 0; + FreeAllGL(mi); +} + + +XSCREENSAVER_MODULE_2 ("GLText", gltext, text) + #endif /* USE_GL */