From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz

[xscreensaver] / hacks / juggle.c

diff --git a/hacks/juggle.c b/hacks/juggle.c
index 8a26ec9a5091ffc5a63282c0af8e78dbf45d39f4..a2dce5e0ab46fbfd41a90ab962e3a322be7420b9 100644 (file)
--- a/hacks/juggle.c
+++ b/hacks/juggle.c
@@ -1,9 +1,8 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* juggle */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)juggle.c     5.10 2003/09/02 xlockmore";
-
 #endif
 
 /*-
@@ -135,7 +134,9 @@ static const char sccsid[] = "@(#)juggle.c  5.10 2003/09/02 xlockmore";
                                        "*count:   200   \n" \
                                        "*cycles:  1000  \n" \
                                        "*ncolors: 32    \n" \
-                                       "*font:    -*-times-bold-r-normal-*-180-*\n"
+                                       "*font:    -*-helvetica-bold-r-normal-*-180-*\n" \
+                                       "*fpsSolid: true\n" \
+
 # define refresh_juggle 0
 # define juggle_handle_event 0
 # undef SMOOTH_COLORS
@@ -2480,17 +2481,7 @@ init_juggle (ModeInfo * mi)
   jugglestruct *sp = 0;
   int i;
 
-  if (juggles == NULL) { /* First-time initialisation */
-
-       /* allocate jugglestruct */
-       if ((juggles =
-                (jugglestruct *)calloc(MI_NUM_SCREENS(mi),
-                                                               sizeof (jugglestruct))) == NULL) {
-         release_juggle(mi);
-         return;
-       }
-  }
-
+  MI_INIT (mi, juggles, 0);
   sp = &juggles[MI_SCREEN(mi)];
 
   if (only && *only && strcmp(only, " ")) {
@@ -2641,7 +2632,7 @@ draw_juggle (ModeInfo * mi)
 
   MI_IS_DRAWN(mi) = True;
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
   /* Don't worry about flicker, trust Quartz's double-buffering.
      This is a fast fix for the pixel-turds I can't track down...
    */