-/* gltext, Copyright (c) 2001-2006 Jamie Zawinski <jwz@jwz.org>
+/* gltext, Copyright (c) 2001-2012 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
#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
#include "xlockmore.h"
#include "colors.h"
#include "tube.h"
+#include "sphere.h"
#include "rotator.h"
#include "gltrackball.h"
+#include "textclient.h"
#include <ctype.h>
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif /* HAVE_LOCALE_H */
-
#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 <sys/utsname.h>
int reload;
time_t last_update;
+ text_data *tc;
} text_configuration;
};
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};
text_configuration *tp = &tps[MI_SCREEN(mi)];
if (tp->text) free (tp->text);
+ tp->text = 0;
if (program_str && *program_str && !!strcmp(program_str, "(default)"))
{
- FILE *p;
- int i;
+ int max_lines = 20;
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);
+ char c = textclient_getc (tp->tc);
+ if (c == '\n')
+ lines++;
+ if (c > 0)
+ *p++ = 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 = 1;
}
else if (!text_fmt || !*text_fmt || !strcmp(text_fmt, "(default)"))
{
# 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);
}
else if (event->xany.type == ButtonPress &&
(event->xbutton.button == Button4 ||
- event->xbutton.button == Button5))
+ event->xbutton.button == Button5 ||
+ event->xbutton.button == Button6 ||
+ event->xbutton.button == Button7))
{
gltrackball_mousewheel (tp->trackball, event->xbutton.button, 10,
!!event->xbutton.state);
text_configuration *tp;
int i;
- /* setlocale (LC_TIME, "") only refers to environment:
- not needed
- */
-#if 0
-# ifdef HAVE_SETLOCALE
- setlocale (LC_TIME, ""); /* for strftime() calls */
-# endif
-#endif
-
if (!tps) {
tps = (text_configuration *)
calloc (MI_NUM_SCREENS(mi), sizeof (text_configuration));
fprintf(stderr, "%s: out of memory\n", progname);
exit(1);
}
-
- tp = &tps[MI_SCREEN(mi)];
}
tp = &tps[MI_SCREEN(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;
# 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);
}
-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;
{
glPushMatrix();
glTranslatef(x, y, 0);
- off = fill_character (GLUT_FONT, *s2, wire);
+ off = fill_character (GLUT_FONT, *s2, wire, &polys);
x += off;
glPopMatrix();
}
}
else
s++;
+ return polys;
}
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;
glScalef(0.01, 0.01, 0.01);
- fill_string(tp->text, wire);
+ mi->polygon_count = fill_string(tp->text, wire);
glPopMatrix ();
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 */