projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.swin.edu.au/slackware/slackware-9.1/source/xap/xscreensaver/xscreensaver...
[xscreensaver]
/
hacks
/
glx
/
starwars.c
diff --git
a/hacks/glx/starwars.c
b/hacks/glx/starwars.c
index 5772d1ebf150c7492097bdf0a009a95d18ab5953..197f323f476171d29db72c7c78e5348045224fd0 100644
(file)
--- a/
hacks/glx/starwars.c
+++ b/
hacks/glx/starwars.c
@@
-285,13
+285,33
@@
launch_text_generator (sws_configuration *sc)
sprintf (cmd, "cat /usr/src/linux-%s/README", uts.release);
if (!stat (cmd+4, &st))
oprogram = cmd;
sprintf (cmd, "cat /usr/src/linux-%s/README", uts.release);
if (!stat (cmd+4, &st))
oprogram = cmd;
+ else
+ {
+ /* kernel source not installed? try X... */
+ strcpy (cmd, "cat /usr/X11R6/lib/X11/doc/README");
+ if (!stat (cmd+4, &st))
+ oprogram = cmd;
+ }
}
}
}
#endif /* __linux__ */
}
}
}
#endif /* __linux__ */
+
+#ifdef __APPLE__ /* MacOS X + XDarwin */
+ {
+ static int done_once = 0;
+ if (!done_once)
+ {
+ struct stat st;
+ static char *cmd = "cat /usr/X11R6/README";
+ if (!stat (cmd+4, &st))
+ oprogram = cmd;
+ }
+ }
+#endif /* __APPLE__ */
}
}
- program = (char *) malloc (strlen (oprogram) + 10);
+
program = (char *) malloc (strlen (oprogram) + 10);
strcpy (program, "( ");
strcat (program, oprogram);
strcat (program, " ) 2>&1");
strcpy (program, "( ");
strcat (program, oprogram);
strcat (program, " ) 2>&1");
@@
-885,7
+905,9
@@
draw_sws (ModeInfo *mi)
}
if (alignment >= 0)
}
if (alignment >= 0)
- xoff = 1.0 - (glutStrokeLength(GLUT_FONT, line) * sc->font_scale);
+ xoff = 1.0 - (glutStrokeLength(GLUT_FONT,
+ (unsigned char *) line)
+ * sc->font_scale);
if (alignment == 0)
xoff /= 2;
if (alignment == 0)
xoff /= 2;