X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fspiral.c;h=bfef07d8b6a30ebcdf7b89882d9ef3ace230cd64;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=214cbfbbaa524d1b80ff6c5c786b70b9cbb128e9;hpb=a94197e76a5dea5cb60542840809d6c20d0abbf3;p=xscreensaver

diff --git a/hacks/spiral.c b/hacks/spiral.c
index 214cbfbb..bfef07d8 100644
--- a/hacks/spiral.c
+++ b/hacks/spiral.c
@@ -1,9 +1,8 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* spiral --- spiraling dots */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)spiral.c	5.00 2000/11/01 xlockmore";
-
 #endif
 
 /*-
@@ -35,24 +34,24 @@ static const char sccsid[] = "@(#)spiral.c	5.00 2000/11/01 xlockmore";
  */
 
 #ifdef STANDALONE
-#define MODE_spiral
-#define PROGCLASS "Spiral"
-#define HACK_INIT init_spiral
-#define HACK_DRAW draw_spiral
-#define spiral_opts xlockmore_opts
-#define DEFAULTS "*delay: 50000 \n" \
- "*count: 40 \n" \
- "*cycles: 350 \n" \
- "*ncolors: 64 \n"
-#define SMOOTH_COLORS
-#include "xlockmore.h"		/* from the xscreensaver distribution */
+# define MODE_spiral
+#define DEFAULTS	"*delay: 50000 \n" \
+					"*count: 40 \n" \
+					"*cycles: 350 \n" \
+					"*ncolors: 64 \n" \
+					"*fpsSolid: true \n" \
+
+# define SMOOTH_COLORS
+# define reshape_spiral 0
+# define spiral_handle_event 0
+# include "xlockmore.h"		/* from the xscreensaver distribution */
 #else /* !STANDALONE */
-#include "xlock.h"		/* from the xlockmore distribution */
+# include "xlock.h"		/* from the xlockmore distribution */
 #endif /* !STANDALONE */
 
 #ifdef MODE_spiral
 
-ModeSpecOpt spiral_opts =
+ENTRYPOINT ModeSpecOpt spiral_opts =
 {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL};
 
 #ifdef USE_MODULES
@@ -122,7 +121,7 @@ draw_dots(ModeInfo * mi, int in)
 	}
 }
 
-void
+ENTRYPOINT void
 init_spiral(ModeInfo * mi)
 {
 	spiralstruct *sp;
@@ -135,6 +134,10 @@ init_spiral(ModeInfo * mi)
 	}
 	sp = &spirals[MI_SCREEN(mi)];
 
+#ifdef HAVE_JWXYZ
+    jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi),  False);
+#endif
+
 	sp->width = MI_WIDTH(mi);
 	sp->height = MI_HEIGHT(mi);
 
@@ -191,7 +194,7 @@ init_spiral(ModeInfo * mi)
 		sp->dots = MINDOTS;
 }
 
-void
+ENTRYPOINT void
 draw_spiral(ModeInfo * mi)
 {
 	Display    *display = MI_DISPLAY(mi);
@@ -296,7 +299,7 @@ draw_spiral(ModeInfo * mi)
 	}
 }
 
-void
+ENTRYPOINT void
 release_spiral(ModeInfo * mi)
 {
 	if (spirals != NULL) {
@@ -313,7 +316,7 @@ release_spiral(ModeInfo * mi)
 	}
 }
 
-void
+ENTRYPOINT void
 refresh_spiral(ModeInfo * mi)
 {
 	spiralstruct *sp;
@@ -327,4 +330,6 @@ refresh_spiral(ModeInfo * mi)
 	sp->redrawpos = 0;
 }
 
+XSCREENSAVER_MODULE ("Spiral", spiral)
+
 #endif /* MODE_spiral */