X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Ffliptext.c;h=c233e8b5250af91ccdd630c1b4dc8b54c3f29730;hb=39809ded547bdbb08207d3e514950425215b4410;hp=798c1c685ae0f5f6d6f2fc5ad818729d56f6f07e;hpb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;p=xscreensaver diff --git a/hacks/glx/fliptext.c b/hacks/glx/fliptext.c index 798c1c68..c233e8b5 100644 --- a/hacks/glx/fliptext.c +++ b/hacks/glx/fliptext.c @@ -1,5 +1,5 @@ /* - * fliptext, Copyright (c) 2005-2014 Jamie Zawinski + * fliptext, Copyright (c) 2005-2015 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 @@ -14,25 +14,20 @@ # include "config.h" #endif /* HAVE_CONFIG_H */ -/* Utopia 800 needs 64 512x512 textures (4096x4096 bitmap). - Utopia 720 needs 16 512x512 textures (2048x2048 bitmap). - Utopia 480 needs 16 512x512 textures (2048x2048 bitmap). - Utopia 400 needs 4 512x512 textures (1024x1024 bitmap). - Utopia 180 needs 1 512x512 texture. - Times 240 needs 1 512x512 texture. - */ -#define DEF_FONT "-*-utopia-bold-r-normal-*-*-720-*-*-*-*-iso8859-1" +#define DEF_FONT "-*-utopia-bold-r-normal-*-*-720-*-*-*-*-*-*" #define DEF_COLOR "#00CCFF" #define DEFAULTS "*delay: 10000 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ "*usePty: False \n" \ + "*texFontCacheSize: 60 \n" \ "*font: " DEF_FONT "\n" \ ".foreground: " DEF_COLOR "\n" \ + "*program: xscreensaver-text --cols 0" /* don't wrap */ -# define refresh_fliptext 0 -# define fliptext_handle_event 0 +# define release_fliptext 0 +# define fliptext_handle_event xlockmore_no_events #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -54,7 +49,6 @@ # endif -#define DEF_PROGRAM "xscreensaver-text --cols 0" /* don't wrap */ #define DEF_LINES "8" #define DEF_FONT_SIZE "20" #define DEF_COLUMNS "80" @@ -93,6 +87,8 @@ typedef struct { texture_font_data *texfont; text_data *tc; + int alignment; + char *buf; int buf_size; int buf_tail; @@ -120,16 +116,14 @@ typedef struct { static fliptext_configuration *scs = NULL; -static char *program; static int max_lines, min_lines; static float font_size; static int target_columns; static char *alignment_str; -static int alignment, alignment_random_p; +static int alignment_random_p; static GLfloat speed; static XrmOptionDescRec opts[] = { - {"-program", ".program", XrmoptionSepArg, 0 }, {"-lines", ".lines", XrmoptionSepArg, 0 }, {"-size", ".fontSize", XrmoptionSepArg, 0 }, {"-columns", ".columns", XrmoptionSepArg, 0 }, @@ -142,7 +136,6 @@ static XrmOptionDescRec opts[] = { }; static argtype vars[] = { - {&program, "program", "Program", DEF_PROGRAM, t_String}, {&max_lines, "lines", "Integer", DEF_LINES, t_Int}, {&font_size, "fontSize", "Float", DEF_FONT_SIZE, t_Float}, {&target_columns, "columns", "Integer", DEF_COLUMNS, t_Int}, @@ -218,10 +211,12 @@ strip (char *s, Bool leading, Bool trailing) static int char_width (fliptext_configuration *sc, char c) { + XCharStruct e; char s[2]; s[0] = c; s[1] = 0; - return texture_string_width (sc->texfont, s, 0); + texture_string_metrics (sc->texfont, s, &e, 0, 0); + return e.width; } @@ -298,8 +293,8 @@ get_one_line (fliptext_configuration *sc) { char *t = result; char *ut = untabify (t); - strip (ut, (alignment == 0), 1); /* if centering, strip - leading whitespace too */ + strip (ut, (sc->alignment == 0), 1); /* if centering, strip + leading whitespace too */ result = ut; free (t); } @@ -358,6 +353,7 @@ blank_p (const char *s) static line * make_line (fliptext_configuration *sc, Bool skip_blanks_p) { + XCharStruct e; line *ln; char *s; @@ -374,7 +370,8 @@ make_line (fliptext_configuration *sc, Bool skip_blanks_p) ln = (line *) calloc (1, sizeof(*ln)); ln->text = s; ln->state = NEW; - ln->width = sc->font_scale * texture_string_width (sc->texfont, s, 0); + texture_string_metrics (sc->texfont, s, &e, 0, 0); + ln->width = sc->font_scale * e.width; ln->height = sc->font_scale * sc->line_height; memcpy (ln->color, sc->color, sizeof(ln->color)); @@ -433,9 +430,9 @@ draw_line (ModeInfo *mi, line *line) glRotatef (line->cth, 0, 1, 0); - if (alignment == 1) + if (sc->alignment == 1) glTranslatef (-line->width, 0, 0); - else if (alignment == 0) + else if (sc->alignment == 0) glTranslatef (-line->width/2, 0, 0); glScalef (sc->font_scale, sc->font_scale, sc->font_scale); @@ -454,8 +451,11 @@ draw_line (ModeInfo *mi, line *line) glColor3f (0.4, 0.4, 0.4); while (*s) { + XCharStruct e; *c = *s++; - w = texture_string_width (sc->texfont, c, &h); + texture_string_metrics (sc->texfont, c, &e, 0, 0); + w = e.width; + h = e.ascent + e.descent; glBegin (GL_LINE_LOOP); glVertex3f (0, 0, 0); glVertex3f (w, 0, 0); @@ -686,11 +686,11 @@ reset_lines (ModeInfo *mi) maxh = maxy - miny; if (alignment_random_p) - alignment = (random() % 3) - 1; + sc->alignment = (random() % 3) - 1; - if (alignment == -1) maxx -= maxw; - else if (alignment == 1) minx += maxw; - else minx += maxw/2, maxx -= maxw/2; + if (sc->alignment == -1) maxx -= maxw; + else if (sc->alignment == 1) minx += maxw; + else minx += maxw/2, maxx -= maxw/2; miny += maxh/2; maxy -= maxh/2; @@ -767,8 +767,15 @@ reshape_fliptext (ModeInfo *mi, int width, int height) { fliptext_configuration *sc = &scs[MI_SCREEN(mi)]; GLfloat h = (GLfloat) height / (GLfloat) width; + int y = 0; + + if (width > height * 5) { /* tiny window: show middle */ + height = width * 9/16; + y = -height/2; + h = height / (GLfloat) width; + } - glViewport (0, 0, (GLint) width, (GLint) height); + glViewport (0, y, (GLint) width, (GLint) height); glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -794,19 +801,11 @@ init_fliptext (ModeInfo *mi) fliptext_configuration *sc; - if (!scs) { - scs = (fliptext_configuration *) - calloc (MI_NUM_SCREENS(mi), sizeof (fliptext_configuration)); - if (!scs) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } - - sc = &scs[MI_SCREEN(mi)]; - sc->lines = (line **) calloc (max_lines+1, sizeof(char *)); - } + MI_INIT(mi, scs); sc = &scs[MI_SCREEN(mi)]; + sc->lines = (line **) calloc (max_lines+1, sizeof(char *)); + sc->dpy = MI_DISPLAY(mi); if ((sc->glx_context = init_GL(mi)) != NULL) { @@ -814,13 +813,14 @@ init_fliptext (ModeInfo *mi) clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */ } - program = get_string_resource (mi->dpy, "program", "Program"); - { - int cw, lh; + XCharStruct e; + int cw, lh, ascent, descent; sc->texfont = load_texture_font (MI_DISPLAY(mi), "font"); check_gl_error ("loading font"); - cw = texture_string_width (sc->texfont, "n", &lh); + texture_string_metrics (sc->texfont, "n", &e, &ascent, &descent); + cw = e.width; + lh = ascent + descent; sc->char_width = cw; sc->line_height = lh; } @@ -873,14 +873,14 @@ init_fliptext (ModeInfo *mi) alignment_random_p = False; if (!alignment_str || !*alignment_str || !strcasecmp(alignment_str, "left")) - alignment = -1; + sc->alignment = -1; else if (!strcasecmp(alignment_str, "center") || !strcasecmp(alignment_str, "middle")) - alignment = 0; + sc->alignment = 0; else if (!strcasecmp(alignment_str, "right")) - alignment = 1; + sc->alignment = 1; else if (!strcasecmp(alignment_str, "random")) - alignment = -1, alignment_random_p = True; + sc->alignment = -1, alignment_random_p = True; else { @@ -986,21 +986,14 @@ draw_fliptext (ModeInfo *mi) } ENTRYPOINT void -release_fliptext (ModeInfo *mi) +free_fliptext (ModeInfo *mi) { - if (scs) { - int screen; - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - fliptext_configuration *sc = &scs[screen]; - if (sc->tc) - textclient_close (sc->tc); - - /* #### there's more to free here */ - } - free (scs); - scs = 0; - } - FreeAllGL(mi); + fliptext_configuration *sc = &scs[MI_SCREEN(mi)]; + if (sc->tc) + textclient_close (sc->tc); + free(sc->lines); + + /* #### there's more to free here */ } XSCREENSAVER_MODULE ("FlipText", fliptext)