X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Frotor.c;h=c22479b9f4d4ee7ff684a6c49ba60baa75e99791;hb=39809ded547bdbb08207d3e514950425215b4410;hp=dde56239ee4083bc088205c1722038820dc123f2;hpb=96a411663168b0ba5432b407a83be55f3df0c802;p=xscreensaver

diff --git a/hacks/rotor.c b/hacks/rotor.c
index dde56239..c22479b9 100644
--- a/hacks/rotor.c
+++ b/hacks/rotor.c
@@ -33,30 +33,32 @@ 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" \
+				    "*lowrez: True \n" \
+
+# define SMOOTH_COLORS
+# define release_rotor 0
+# 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
 ModStruct   rotor_description =
-{"rotor", "init_rotor", "draw_rotor", "release_rotor",
- "refresh_rotor", "init_rotor", (char *) NULL, &rotor_opts,
+{"rotor", "init_rotor", "draw_rotor", (char *) NULL,
+ "refresh_rotor", "init_rotor", "free_rotor", &rotor_opts,
  100, 4, 100, -6, 64, 0.3, "",
  "Shows Tom's Roto-Rooter", 0, NULL};
 
@@ -106,9 +108,10 @@ typedef struct {
 
 static rotorstruct *rotors = (rotorstruct *) NULL;
 
-static void
-free_rotor(rotorstruct *rp)
+ENTRYPOINT void
+free_rotor(ModeInfo * mi)
 {
+	rotorstruct *rp = &rotors[MI_SCREEN(mi)];
 	if (rp->elements != NULL) {
 		(void) free((void *) rp->elements);
 		rp->elements = (elem *) NULL;
@@ -119,21 +122,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);
 	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;
 
@@ -175,7 +178,7 @@ init_rotor(ModeInfo * mi)
 		if (rp->elements == NULL)
 			if ((rp->elements = (elem *) calloc(rp->num,
 					sizeof (elem))) == NULL) {
-				free_rotor(rp);
+				free_rotor(mi);
 				return;
 			}
 		rp->nsave = MI_CYCLES(mi);
@@ -184,7 +187,7 @@ init_rotor(ModeInfo * mi)
 		if (rp->save == NULL)
 			if ((rp->save = (XPoint *) malloc(rp->nsave *
 					sizeof (XPoint))) == NULL) {
-				free_rotor(rp);
+				free_rotor(mi);
 				return;
 			}
 		for (x = 0; x < rp->nsave; x++) {
@@ -224,8 +227,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);
@@ -365,21 +368,9 @@ draw_rotor(ModeInfo * mi)
 			   LineSolid, CapButt, JoinMiter);
 }
 
-void
-release_rotor(ModeInfo * mi)
-{
-	if (rotors != NULL) {
-		int         screen;
-
-		for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-			free_rotor(&rotors[screen]);
-		(void) free((void *) rotors);
-		rotors = (rotorstruct *) NULL;
-	}
-}
-
-void
-refresh_rotor(ModeInfo * mi)
+#ifndef STANDALONE
+ENTRYPOINT void
+refresh_rotor (ModeInfo * mi)
 {
 	rotorstruct *rp;
 
@@ -391,5 +382,8 @@ refresh_rotor(ModeInfo * mi)
 	rp->redrawing = 1;
 	rp->redrawpos = 1;
 }
+#endif
+
+XSCREENSAVER_MODULE ("Rotor", rotor)
 
 #endif /* MODE_rotor */