X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fbouboule.c;h=15bf2278441b01174e98bbb352c5f0cced89104d;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hp=7e77e464bb10120d67b91b9b951e953723f1ede4;hpb=df7adbee81405e2849728a24b498ad2117784b1f;p=xscreensaver

diff --git a/hacks/bouboule.c b/hacks/bouboule.c
index 7e77e464..15bf2278 100644
--- a/hacks/bouboule.c
+++ b/hacks/bouboule.c
@@ -19,9 +19,8 @@
     * other special, indirect and consequential damages.
  */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)bouboule.c	4.00 97/01/01 xlockmore";
-
 #endif
 
 /*-
@@ -75,28 +74,28 @@ static const char sccsid[] = "@(#)bouboule.c	4.00 97/01/01 xlockmore";
  */
 
 #ifdef STANDALONE
-# define PROGCLASS					"Bouboule"
-# define HACK_INIT					init_bouboule
-# define HACK_DRAW					draw_bouboule
-# define bouboule_opts				xlockmore_opts
 # define DEFAULTS	"*count:		100     \n"			\
 					"*size:			15      \n"			\
-					"*delay:		5000    \n"			\
+					"*delay:		20000   \n"			\
 					"*ncolors:		64      \n"			\
 					"*use3d:		False   \n"			\
 					"*delta3d:		1.5		\n"			\
 					"*right3d:		red		\n"			\
 					"*left3d:		blue	\n"			\
 					"*both3d:		magenta	\n"			\
-					"*none3d:		black	\n"
+					"*none3d:		black	\n"			\
+					"*fpsSolid:		true	\n"
 
 # define SMOOTH_COLORS
+# define reshape_bouboule 0
+# define bouboule_handle_event 0
 # include "xlockmore.h"				/* from the xscreensaver distribution */
 #else  /* !STANDALONE */
 # include "xlock.h"					/* from the xlockmore distribution */
+# define ENTRYPOINT /**/
 #endif /* !STANDALONE */
 
-ModeSpecOpt bouboule_opts = {
+ENTRYPOINT ModeSpecOpt bouboule_opts = {
   0, NULL, 0, NULL, NULL };
 
 #define USEOLDXARCS  1		/* If 1, we use old xarcs list for erasing.
@@ -298,8 +297,9 @@ sinfree(SinVariable * point)
 	}
 }
 
+
 /***************/
-void
+ENTRYPOINT void
 init_bouboule(ModeInfo * mi)
 /***************/
 
@@ -529,7 +529,7 @@ init_bouboule(ModeInfo * mi)
 }
 
 /****************/
-void
+ENTRYPOINT void
 draw_bouboule(ModeInfo * mi)
 /****************/
 
@@ -543,6 +543,10 @@ draw_bouboule(ModeInfo * mi)
 	Star       *star;
 	XArc       *arc = NULL, *arcleft = NULL;
 
+#ifdef HAVE_COCOA	/* Don't second-guess Quartz's double-buffering */
+    XClearWindow(MI_DISPLAY(mi), MI_WINDOW(mi));
+#endif
+
 #if (ADAPT_ERASE == 1)
 	struct timeval tv1;
 	struct timeval tv2;
@@ -799,7 +803,7 @@ draw_bouboule(ModeInfo * mi)
 	}
 }
 
-void
+ENTRYPOINT void
 release_bouboule(ModeInfo * mi)
 {
 	if (starfield != NULL) {
@@ -834,8 +838,10 @@ release_bouboule(ModeInfo * mi)
 	}
 }
 
-void
+ENTRYPOINT void
 refresh_bouboule(ModeInfo * mi)
 {
 	/* Do nothing, it will refresh by itself */
 }
+
+XSCREENSAVER_MODULE ("Bouboule", bouboule)