X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=hacks%2Frotor.c;h=c22479b9f4d4ee7ff684a6c49ba60baa75e99791;hb=39809ded547bdbb08207d3e514950425215b4410;hp=4b32bdf7f5fe494b419b63f9d1f62e215502ec1c;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/rotor.c b/hacks/rotor.c
index 4b32bdf7..c22479b9 100644
--- a/hacks/rotor.c
+++ b/hacks/rotor.c
@@ -37,8 +37,12 @@ static const char sccsid[] = "@(#)rotor.c	5.00 2000/11/01 xlockmore";
 					"*count: 4 \n" \
 					"*cycles: 20 \n" \
 					"*size: -6 \n" \
-					"*ncolors: 200 \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 */
@@ -53,8 +57,8 @@ ENTRYPOINT ModeSpecOpt rotor_opts =
 
 #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};
 
@@ -104,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;
@@ -125,14 +130,10 @@ init_rotor (ModeInfo * mi)
 	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_COCOA
+#ifdef HAVE_JWXYZ
     jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi),  False);
 #endif
 
@@ -177,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);
@@ -186,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++) {
@@ -367,19 +368,7 @@ draw_rotor (ModeInfo * mi)
 			   LineSolid, CapButt, JoinMiter);
 }
 
-ENTRYPOINT 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;
-	}
-}
-
+#ifndef STANDALONE
 ENTRYPOINT void
 refresh_rotor (ModeInfo * mi)
 {
@@ -393,6 +382,7 @@ refresh_rotor (ModeInfo * mi)
 	rp->redrawing = 1;
 	rp->redrawpos = 1;
 }
+#endif
 
 XSCREENSAVER_MODULE ("Rotor", rotor)