-/* gltext, Copyright (c) 2001-2008 Jamie Zawinski <jwz@jwz.org>
+/* gltext, Copyright (c) 2001-2014 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
"*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 "utf8wc.h"
#include <ctype.h>
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);
}
}
-/* 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;
+ int max_lines = 8;
char buf[1024];
char *p = buf;
int lines = 0;
while (p < buf + sizeof(buf) - 1 &&
lines < max_lines)
{
- char c = textclient_getc (tp->tc);
+ int c = textclient_getc (tp->tc);
if (c == '\n')
lines++;
if (c > 0)
- *p++ = c;
+ *p++ = (char) c;
else
break;
}
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)"))
{
# 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 */
{
const char *file =
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);
}
{
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;
}
+static void free_text(ModeInfo * mi);
+
+
ENTRYPOINT void
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, free_text);
tp = &tps[MI_SCREEN(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;
# else
int smooth = False;
# endif
+
if (j != stroke->num_coords)
*polysP += tube (lx, ly, 0,
coord->x, coord->y, 0,
tube_width,
tube_width * 0.15,
- TUBE_FACES, smooth, True, wire);
+ 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);
glPushMatrix ();
glScalef(1.1, 1.1, 1.1);
+ glRotatef(current_device_rotation(), 0, 0, 1);
{
double x, y, z;
(z - 0.5) * 8);
gltrackball_rotate (tp->trackball);
- glRotatef(current_device_rotation(), 0, 0, 1);
if (face_front_p)
{
}
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);
}
projects / xscreensaver / blobdiff