X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fsierpinski.c;h=3e3d89b30a6ea0b500ee1f40394954b3b1015011;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=8d5215630417dd4aa6f262e4e9f292b5c7099763;hpb=96a411663168b0ba5432b407a83be55f3df0c802;p=xscreensaver

diff --git a/hacks/sierpinski.c b/hacks/sierpinski.c
index 8d521563..3e3d89b3 100644
--- a/hacks/sierpinski.c
+++ b/hacks/sierpinski.c
@@ -33,29 +33,30 @@ static const char sccsid[] = "@(#)sierpinski.c	5.00 2000/11/01 xlockmore";
  */
 
 #ifdef STANDALONE
-#define MODE_sierpinski
-#define PROGCLASS "Sierpinski"
-#define HACK_INIT init_sierpinski
-#define HACK_DRAW draw_sierpinski
-#define sierpinski_opts xlockmore_opts
-#define DEFAULTS "*delay: 400000 \n" \
- "*count: 2000 \n" \
- "*cycles: 100 \n" \
- "*ncolors: 64 \n"
-#define BRIGHT_COLORS
-#include "xlockmore.h"		/* in xscreensaver distribution */
+# define MODE_sierpinski
+# define DEFAULTS	"*delay: 400000 \n" \
+					"*count: 2000 \n" \
+					"*cycles: 100 \n" \
+					"*ncolors: 64 \n" \
+					"*fpsSolid: true \n" \
+					"*ignoreRotation: True \n" \
+
+# define BRIGHT_COLORS
+# define release_sierpinski 0
+# define sierpinski_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_sierpinski
 
-ModeSpecOpt sierpinski_opts =
+ENTRYPOINT ModeSpecOpt sierpinski_opts =
 {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL};
 
 #ifdef USE_MODULES
 ModStruct   sierpinski_description =
-{"sierpinski", "init_sierpinski", "draw_sierpinski", "release_sierpinski",
+{"sierpinski", "init_sierpinski", "draw_sierpinski", (char *) NULL,
  "refresh_sierpinski", "init_sierpinski", (char *) NULL, &sierpinski_opts,
  400000, 2000, 100, 1, 64, 1.0, "",
  "Shows Sierpinski's triangle", 0, NULL};
@@ -115,8 +116,9 @@ startover(ModeInfo * mi)
 }
 
 static void
-free_sierpinski(sierpinskistruct *sp)
+free_sierpinski(ModeInfo * mi)
 {
+	sierpinskistruct *sp = &tris[MI_SCREEN(mi)];
 	int corner;
 
 	for (corner = 0; corner < MAXCORNERS; corner++)
@@ -126,17 +128,13 @@ free_sierpinski(sierpinskistruct *sp)
 		}
 }
 
-void
+ENTRYPOINT void
 init_sierpinski(ModeInfo * mi)
 {
 	int         i;
 	sierpinskistruct *sp;
 
-	if (tris == NULL) {
-		if ((tris = (sierpinskistruct *) calloc(MI_NUM_SCREENS(mi),
-					 sizeof (sierpinskistruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, tris, free_sierpinski);
 	sp = &tris[MI_SCREEN(mi)];
 
 	sp->width = MI_WIDTH(mi);
@@ -153,14 +151,14 @@ init_sierpinski(ModeInfo * mi)
 		if (!sp->pointBuffer[i])
 			if ((sp->pointBuffer[i] = (XPoint *) malloc(sp->total_npoints *
 					sizeof (XPoint))) == NULL) {
-				free_sierpinski(sp);
+				free_sierpinski(mi);
 				return;
 			}
 	}
 	startover(mi);
 }
 
-void
+ENTRYPOINT void
 draw_sierpinski(ModeInfo * mi)
 {
 	Display    *display = MI_DISPLAY(mi);
@@ -200,23 +198,19 @@ draw_sierpinski(ModeInfo * mi)
 		startover(mi);
 }
 
-void
-release_sierpinski(ModeInfo * mi)
+ENTRYPOINT void
+reshape_sierpinski(ModeInfo * mi, int width, int height)
 {
-	if (tris != NULL) {
-		int         screen;
-
-		for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-			free_sierpinski(&tris[screen]);
-		(void) free((void *) tris);
-		tris = (sierpinskistruct *) NULL;
-	}
+  XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
+  init_sierpinski (mi);
 }
 
-void
+ENTRYPOINT void
 refresh_sierpinski(ModeInfo * mi)
 {
 	MI_CLEARWINDOW(mi);
 }
 
+XSCREENSAVER_MODULE ("Sierpinski", sierpinski)
+
 #endif /* MODE_sierpinski */