projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.14.tar.gz
[xscreensaver]
/
hacks
/
glx
/
gltext.c
diff --git
a/hacks/glx/gltext.c
b/hacks/glx/gltext.c
index 5b80d76c68b5aad9cb6183b64515b79a67044e58..aa3e876e4e333d075b1e30220298f2b1cf977b83 100644
(file)
--- a/
hacks/glx/gltext.c
+++ b/
hacks/glx/gltext.c
@@
-1,4
+1,4
@@
-/* gltext, Copyright (c) 2001, 2002 Jamie Zawinski <jwz@jwz.org>
+/* gltext, Copyright (c) 2001, 2002
, 2003
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
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-177,13
+177,16
@@
parse_text (ModeInfo *mi)
strlen(uts.sysname) +
strlen(uts.version) +
strlen(uts.release) + 10);
strlen(uts.sysname) +
strlen(uts.version) +
strlen(uts.release) + 10);
-# if
def _AIX
+# if
defined(_AIX)
sprintf(tp->text, "%s\n%s %s.%s",
uts.nodename, uts.sysname, uts.version, uts.release);
sprintf(tp->text, "%s\n%s %s.%s",
uts.nodename, uts.sysname, uts.version, uts.release);
-# else /* !_AIX */
+# elif defined(__APPLE__) /* MacOS X + XDarwin */
+ 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);
sprintf(tp->text, "%s\n%s %s",
uts.nodename, uts.sysname, uts.release);
-# endif /*
!_AIX
*/
+# endif /*
special system types
*/
}
# else /* !HAVE_UNAME */
# ifdef VMS
}
# else /* !HAVE_UNAME */
# ifdef VMS
@@
-352,7
+355,7
@@
fill_character (GLUTstrokeFont font, int c, Bool wire)
coord->x, coord->y, 0,
tube_width,
tube_width * 0.15,
coord->x, coord->y, 0,
tube_width,
tube_width * 0.15,
- TUBE_FACES, smooth, wire);
+ TUBE_FACES, smooth,
True,
wire);
lx = coord->x;
ly = coord->y;
}
lx = coord->x;
ly = coord->y;
}
@@
-386,9
+389,9
@@
text_extents (const char *string, int *wP, int *hP)
if (w > *wP) *wP = w;
*hP += line_height;
if (w > *wP) *wP = w;
*hP += line_height;
- s++;
lines++;
if (*s == 0) break;
lines++;
if (*s == 0) break;
+ s++;
}
else
s++;
}
else
s++;