X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fgltext.c;h=a4d80b050edc1d93c392eba38163ecf14812a12a;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=a24eefa38f1eaa6798a64fb545147e19b08a5b48;hpb=07faf451b99879183ed7e909e43a0e065be1ee7f;p=xscreensaver diff --git a/hacks/glx/gltext.c b/hacks/glx/gltext.c index a24eefa3..a4d80b05 100644 --- a/hacks/glx/gltext.c +++ b/hacks/glx/gltext.c @@ -1,4 +1,4 @@ -/* gltext, Copyright (c) 2001-2006 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 @@ -12,9 +12,9 @@ #define DEFAULTS "*delay: 20000 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ + "*usePty: False \n" \ # define refresh_text 0 -# define release_text 0 #define SMOOTH_TUBE /* whether to have smooth or faceted tubes */ #ifdef SMOOTH_TUBE @@ -30,23 +30,21 @@ #include "xlockmore.h" #include "colors.h" #include "tube.h" +#include "sphere.h" #include "rotator.h" #include "gltrackball.h" +#include "textclient.h" +#include "utf8wc.h" #include #ifdef USE_GL /* whole file */ -#ifdef HAVE_COCOA -# define DEF_TEXT "%A%n%d %b %Y%n%r" -#else -# define DEF_TEXT "(default)" -#endif - +#define DEF_TEXT "(default)" #define DEF_PROGRAM "(default)" #define DEF_SPIN "XYZ" #define DEF_WANDER "True" -#define DEF_FRONT "True" +#define DEF_FACE_FRONT "True" #ifdef HAVE_UNAME # include @@ -74,6 +72,7 @@ typedef struct { int reload; time_t last_update; + text_data *tc; } text_configuration; @@ -97,11 +96,11 @@ static XrmOptionDescRec opts[] = { }; static argtype vars[] = { - {&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_FRONT, 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}, }; ENTRYPOINT ModeSpecOpt text_opts = {countof(opts), opts, countof(vars), vars, NULL}; @@ -126,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); } @@ -153,73 +160,43 @@ gl_init (ModeInfo *mi) } -/* 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 -latin1_to_ascii (char *s) -{ - 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) - { - if (*us >= 161) - *us = ascii[*us - 161]; - else if (*us > 127) - *us = '?'; - us++; - } -} - - static void parse_text (ModeInfo *mi) { text_configuration *tp = &tps[MI_SCREEN(mi)]; - - if (tp->text) free (tp->text); + char *old = tp->text; if (program_str && *program_str && !!strcmp(program_str, "(default)")) { - FILE *p; - int i; + int max_lines = 8; char buf[1024]; - sprintf (buf, "( %.900s ) 2>&1", program_str); - p = popen (buf, "r"); - if (! p) - sprintf (buf, "error running '%.900s'", program_str); - else + char *p = buf; + int lines = 0; + + if (! tp->tc) + tp->tc = textclient_open (mi->dpy); + + while (p < buf + sizeof(buf) - 1 && + lines < max_lines) { - char *out = buf; - char *end = out + sizeof(buf) - 1; - int n; - do { - n = fread (out, 1, end - out, p); - if (n > 0) - out += n; - *out = 0; - } while (n > 0); - fclose (p); + int c = textclient_getc (tp->tc); + if (c == '\n') + lines++; + if (c > 0) + *p++ = (char) c; + else + break; } - - /* Truncate it to 10 lines */ - { - char *s = buf; - for (i = 0; i < 10; i++) - if (s && (s = strchr (s, '\n'))) - s++; - if (s) *s = 0; - } + *p = 0; + if (lines == 0 && buf[0]) + lines++; tp->text = strdup (buf); - tp->reload = 5; + + 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)")) { @@ -242,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); @@ -275,7 +282,23 @@ parse_text (ModeInfo *mi) tp->reload = 1; } - latin1_to_ascii (tp->text); + { + /* 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); } @@ -284,37 +307,10 @@ 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 == ButtonPress && - (event->xbutton.button == Button4 || - event->xbutton.button == Button5)) - { - gltrackball_mousewheel (tp->trackball, event->xbutton.button, 10, - !!event->xbutton.state); - 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; } @@ -333,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)]; @@ -376,7 +370,7 @@ init_text (ModeInfo *mi) tp->rot2 = (face_front_p ? make_rotator (0, 0, 0, 0, tilt_speed, True) : 0); - tp->trackball = gltrackball_init (); + tp->trackball = gltrackball_init (False); } tp->ncolors = 255; @@ -399,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; @@ -427,14 +421,26 @@ 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); @@ -477,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; @@ -516,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(); } @@ -529,6 +535,7 @@ fill_string (const char *string, Bool wire) } else s++; + return polys; } @@ -567,8 +574,8 @@ draw_text (ModeInfo *mi) 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; @@ -609,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 (); @@ -619,6 +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 */