X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fgltext.c;h=276c44898293dbe175e3286106b3d944eb480ebf;hb=39809ded547bdbb08207d3e514950425215b4410;hp=e33280be7916a2cef7d76cb950185338ff70d667;hpb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;p=xscreensaver diff --git a/hacks/glx/gltext.c b/hacks/glx/gltext.c index e33280be..276c4489 100644 --- a/hacks/glx/gltext.c +++ b/hacks/glx/gltext.c @@ -1,4 +1,4 @@ -/* gltext, Copyright (c) 2001-2014 Jamie Zawinski +/* gltext, Copyright (c) 2001-2017 Jamie Zawinski #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" +#define DEF_TEXT "(default)" +#define DEF_PROGRAM "(default)" +#define DEF_SCALE_FACTOR "0.01" +#define DEF_WANDER_SPEED "0.02" +#define DEF_MAX_LINES "8" +#define DEF_SPIN "XYZ" +#define DEF_WANDER "True" +#define DEF_FACE_FRONT "True" +#define DEF_USE_MONOSPACE "False" #ifdef HAVE_UNAME # include @@ -51,7 +56,10 @@ #include "glutstroke.h" #include "glut_roman.h" -#define GLUT_FONT (&glutStrokeRoman) +#include "glut_mroman.h" +#define GLUT_VARI_FONT (&glutStrokeRoman) +#define GLUT_MONO_FONT (&glutStrokeMonoRoman) +#define GLUT_FONT ((use_monospace) ? GLUT_MONO_FONT : GLUT_VARI_FONT) typedef struct { @@ -77,29 +85,42 @@ typedef struct { 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 char *text_fmt; +static char *program_str; +static float scale_factor; +static int max_no_lines; +static float wander_speed; +static char *do_spin; +static Bool do_wander; +static Bool face_front_p; +static Bool use_monospace; static XrmOptionDescRec opts[] = { - { "-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" } + { "-text", ".text", XrmoptionSepArg, 0 }, + { "-program", ".program", XrmoptionSepArg, 0 }, + { "-scale", ".scaleFactor", XrmoptionSepArg, 0 }, + { "-maxlines", ".maxLines", XrmoptionSepArg, 0 }, + { "-wander-speed", ".wanderSpeed", 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" }, + { "-mono", ".useMonoSpace", XrmoptionNoArg, "True" }, + { "+mono", ".useMonoSpace", XrmoptionNoArg, "False" } }; 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_FACE_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}, + {&scale_factor, "scaleFactor", "ScaleFactor", DEF_SCALE_FACTOR, t_Float}, + {&max_no_lines, "maxLines", "MaxLines", DEF_MAX_LINES, t_Int}, + {&wander_speed, "wanderSpeed", "WanderSpeed", DEF_WANDER_SPEED, t_Float}, + {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, + {&face_front_p, "faceFront", "FaceFront", DEF_FACE_FRONT, t_Bool}, + {&use_monospace, "useMonoSpace", "UseMonoSpace", DEF_USE_MONOSPACE, t_Bool}, }; ENTRYPOINT ModeSpecOpt text_opts = {countof(opts), opts, countof(vars), vars, NULL}; @@ -111,8 +132,15 @@ ENTRYPOINT void reshape_text (ModeInfo *mi, int width, int height) { GLfloat h = (GLfloat) height / (GLfloat) width; + int y = 0; - glViewport (0, 0, (GLint) width, (GLint) height); + if (width > height * 5) { /* tiny window: show middle */ + height = width * 9/16; + y = -height/2; + h = height / (GLfloat) width; + } + + glViewport (0, y, (GLint) width, (GLint) height); glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -124,6 +152,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); } @@ -151,44 +187,16 @@ 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); - tp->text = 0; + char *old = tp->text; if (program_str && *program_str && !!strcmp(program_str, "(default)")) { - int max_lines = 20; - char buf[1024]; + int max_lines = max_no_lines; + char buf[4096]; char *p = buf; int lines = 0; @@ -211,7 +219,11 @@ parse_text (ModeInfo *mi) lines++; tp->text = strdup (buf); - tp->reload = 1; + + 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)")) { @@ -297,7 +309,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); } @@ -306,39 +334,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 || - event->xbutton.button == Button6 || - event->xbutton.button == Button7)) - { - 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; } @@ -350,14 +349,7 @@ init_text (ModeInfo *mi) text_configuration *tp; int i; - if (!tps) { - tps = (text_configuration *) - calloc (MI_NUM_SCREENS(mi), sizeof (text_configuration)); - if (!tps) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } - } + MI_INIT (mi, tps); tp = &tps[MI_SCREEN(mi)]; @@ -398,7 +390,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; @@ -642,7 +634,7 @@ draw_text (ModeInfo *mi) glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color); - glScalef(0.01, 0.01, 0.01); + glScalef(scale_factor, scale_factor, scale_factor); mi->polygon_count = fill_string(tp->text, wire); @@ -655,21 +647,11 @@ draw_text (ModeInfo *mi) } ENTRYPOINT void -release_text(ModeInfo * mi) +free_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); + text_configuration *tp = &tps[MI_SCREEN(mi)]; + if (tp->tc) + textclient_close (tp->tc); }