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

[xscreensaver] / hacks / rotor.c

diff --git a/hacks/rotor.c b/hacks/rotor.c
index 65a1fdd738880c6eea00f0aa9577c8d4956d0117..293b273cb58bfbfc4b108c191d5c6cba5c8ec0dd 100644 (file)
--- a/hacks/rotor.c
+++ b/hacks/rotor.c
@@ -1,9 +1,8 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* rotor --- a swirly rotor */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)rotor.c      5.00 2000/11/01 xlockmore";
-
 #endif
 
 /*-
@@ -34,24 +33,24 @@ static const char sccsid[] = "@(#)rotor.c   5.00 2000/11/01 xlockmore";
 
 #ifdef STANDALONE
 #define MODE_rotor
-#define PROGCLASS "Rotor"
-#define HACK_INIT init_rotor
-#define HACK_DRAW draw_rotor
-#define rotor_opts xlockmore_opts
-#define DEFAULTS "*delay: 10000 \n" \
- "*count: 4 \n" \
- "*cycles: 20 \n" \
- "*size: -6 \n" \
- "*ncolors: 200 \n"
-#define SMOOTH_COLORS
-#include "xlockmore.h"         /* in xscreensaver distribution */
+#define DEFAULTS       "*delay: 10000 \n" \
+                                       "*count: 4 \n" \
+                                       "*cycles: 20 \n" \
+                                       "*size: -6 \n" \
+                                       "*ncolors: 200 \n" \
+                                       "*fpsSolid: true \n" \
+
+# define SMOOTH_COLORS
+# define reshape_rotor 0
+# define rotor_handle_event 0
+# include "xlockmore.h"                /* in xscreensaver distribution */
 #else /* STANDALONE */
-#include "xlock.h"             /* in xlockmore distribution */
+# include "xlock.h"            /* in xlockmore distribution */
 #endif /* STANDALONE */
 
 #ifdef MODE_rotor
 
-ModeSpecOpt rotor_opts =
+ENTRYPOINT ModeSpecOpt rotor_opts =
 {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL};
 
 #ifdef USE_MODULES
@@ -120,21 +119,21 @@ free_rotor(rotorstruct *rp)
        }
 }
 
-void
-init_rotor(ModeInfo * mi)
+ENTRYPOINT void
+init_rotor (ModeInfo * mi)
 {
        int         x;
        elem       *pelem;
        unsigned char wasiconified;
        rotorstruct *rp;
 
-       if (rotors == NULL) {
-               if ((rotors = (rotorstruct *) calloc(MI_NUM_SCREENS(mi),
-                                             sizeof (rotorstruct))) == NULL)
-                       return;
-       }
+       MI_INIT (mi, rotors, 0);
        rp = &rotors[MI_SCREEN(mi)];
 
+#ifdef HAVE_JWXYZ
+    jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi),  False);
+#endif
+
        rp->prevcenterx = rp->centerx;
        rp->prevcentery = rp->centery;
 
@@ -225,8 +224,8 @@ init_rotor(ModeInfo * mi)
        MI_CLEARWINDOW(mi);
 }
 
-void
-draw_rotor(ModeInfo * mi)
+ENTRYPOINT void
+draw_rotor (ModeInfo * mi)
 {
        Display    *display = MI_DISPLAY(mi);
        GC          gc = MI_GC(mi);
@@ -366,8 +365,8 @@ draw_rotor(ModeInfo * mi)
                           LineSolid, CapButt, JoinMiter);
 }
 
-void
-release_rotor(ModeInfo * mi)
+ENTRYPOINT void
+release_rotor (ModeInfo * mi)
 {
        if (rotors != NULL) {
                int         screen;
@@ -379,8 +378,8 @@ release_rotor(ModeInfo * mi)
        }
 }
 
-void
-refresh_rotor(ModeInfo * mi)
+ENTRYPOINT void
+refresh_rotor (ModeInfo * mi)
 {
        rotorstruct *rp;
 
@@ -393,4 +392,6 @@ refresh_rotor(ModeInfo * mi)
        rp->redrawpos = 1;
 }
 
+XSCREENSAVER_MODULE ("Rotor", rotor)
+
 #endif /* MODE_rotor */