http://svn.poeml.de/viewvc/ppc/src-unpacked/xscreensaver/xscreensaver-4.12.tar.bz2...

[xscreensaver] / hacks / glx / starwars.c

diff --git a/hacks/glx/starwars.c b/hacks/glx/starwars.c
index 5772d1ebf150c7492097bdf0a009a95d18ab5953..3853007f449f2afd4bf731fc687bf7b03f0b6fdb 100644 (file)
--- a/hacks/glx/starwars.c
+++ b/hacks/glx/starwars.c
@@ -289,9 +289,22 @@ launch_text_generator (sws_configuration *sc)
           }
       }
 #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");
@@ -885,7 +898,9 @@ draw_sws (ModeInfo *mi)
             }
 
           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;