X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fhopalong.c;h=d3cc7df0cbdc5461f9e20ec0ddd263d21295c2c0;hb=39809ded547bdbb08207d3e514950425215b4410;hp=fd64722eac65e17683bb10e2d3a90ced6e0890f7;hpb=ffd8c0873576a9e3065696a624dce6b766b77062;p=xscreensaver

diff --git a/hacks/hopalong.c b/hacks/hopalong.c
index fd64722e..d3cc7df0 100644
--- a/hacks/hopalong.c
+++ b/hacks/hopalong.c
@@ -52,20 +52,20 @@ static const char sccsid[] = "@(#)hop.c	5.00 2000/11/01 xlockmore";
 
 #ifdef STANDALONE
 #define MODE_hop
-#define PROGCLASS "Hop"
-#define HACK_INIT init_hop
-#define HACK_DRAW draw_hop
-#define hop_opts xlockmore_opts
-#define DEFAULTS "*delay: 10000 \n" \
- "*count: 1000 \n" \
- "*cycles: 2500 \n" \
- "*ncolors: 200 \n"
-#define SMOOTH_COLORS
-#include "xlockmore.h"		/* in xscreensaver distribution */
-#include "erase.h"
+#define DEFAULTS	"*delay: 10000 \n" \
+					"*count: 1000 \n" \
+					"*cycles: 2500 \n" \
+					"*ncolors: 200 \n" \
+					"*fpsSolid: true \n" \
+					"*ignoreRotation: True \n" \
+
+# define SMOOTH_COLORS
+# define reshape_hop 0
+# define release_hop 0
+# define hop_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_hop
@@ -148,13 +148,13 @@ static OptionStruct desc[] =
 	{"-/+sine", "turn on/off sine format"}
 };
 
-ModeSpecOpt hop_opts =
+ENTRYPOINT ModeSpecOpt hop_opts =
 {sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc};
 
 #ifdef USE_MODULES
 ModStruct   hop_description =
-{"hop", "init_hop", "draw_hop", "release_hop",
- "refresh_hop", "init_hop", (char *) NULL, &hop_opts,
+{"hop", "init_hop", "draw_hop", (char *) NULL,
+ "refresh_hop", "init_hop", "free_hop", &hop_opts,
  10000, 1000, 2500, 1, 64, 1.0, "",
  "Shows real plane iterated fractals", 0, NULL};
 
@@ -191,7 +191,7 @@ typedef struct {
 
 static hopstruct *hops = (hopstruct *) NULL;
 
-void
+ENTRYPOINT void
 init_hop(ModeInfo * mi)
 {
 	Display    *display = MI_DISPLAY(mi);
@@ -199,11 +199,7 @@ init_hop(ModeInfo * mi)
 	double      range;
 	hopstruct  *hp;
 
-	if (hops == NULL) {
-		if ((hops = (hopstruct *) calloc(MI_NUM_SCREENS(mi),
-						 sizeof (hopstruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, hops);
 	hp = &hops[MI_SCREEN(mi)];
 
 	hp->centerx = MI_WIDTH(mi) / 2;
@@ -393,7 +389,7 @@ init_hop(ModeInfo * mi)
 }
 
 
-void
+ENTRYPOINT void
 draw_hop(ModeInfo * mi)
 {
 	double      oldj, oldi;
@@ -404,6 +400,8 @@ draw_hop(ModeInfo * mi)
 	if (hops == NULL)
 		return;
 	hp = &hops[MI_SCREEN(mi)];
+
+
 	if (hp->pointBuffer == NULL)
 		return;
 	xp = hp->pointBuffer;
@@ -531,34 +529,27 @@ draw_hop(ModeInfo * mi)
 	XDrawPoints(MI_DISPLAY(mi), MI_WINDOW(mi), MI_GC(mi),
 		    hp->pointBuffer, hp->bufsize, CoordModeOrigin);
 	if (++hp->count > MI_CYCLES(mi)) {
-#ifdef STANDALONE
-	    erase_full_window(MI_DISPLAY(mi), MI_WINDOW(mi));
-#endif /* STANDALONE */
 		init_hop(mi);
 	}
 }
 
-void
-release_hop(ModeInfo * mi)
+ENTRYPOINT void
+free_hop(ModeInfo * mi)
 {
-	if (hops != NULL) {
-		int         screen;
-
-		for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
-			hopstruct  *hp = &hops[screen];
+	hopstruct  *hp = &hops[MI_SCREEN(mi)];
 
-			if (hp->pointBuffer != NULL)
-				(void) free((void *) hp->pointBuffer);
-		}
-		(void) free((void *) hops);
-		hops = (hopstruct *) NULL;
-	}
+	if (hp->pointBuffer != NULL)
+		(void) free((void *) hp->pointBuffer);
 }
 
-void
+#ifndef STANDALONE
+ENTRYPOINT void
 refresh_hop(ModeInfo * mi)
 {
 	MI_CLEARWINDOW(mi);
 }
+#endif
+
+XSCREENSAVER_MODULE_2 ("Hopalong", hopalong, hop)
 
 #endif /* MODE_hop */