X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fdemon.c;h=eb926ca6b150c7403dca4d30932e367ea28a01aa;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=c9a15e25c711d51d47cf89c2d1f0a2cb042a351e;hpb=b81f521c5ad7022ac12db18ca8fcdd9fb063831e;p=xscreensaver

diff --git a/hacks/demon.c b/hacks/demon.c
index c9a15e25..eb926ca6 100644
--- a/hacks/demon.c
+++ b/hacks/demon.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)demon.c	5.00 2000/11/01 xlockmore";
   Triangle 3, 9, or 12
 */
 
-#ifndef HAVE_COCOA
+#ifndef HAVE_JWXYZ
 # define DO_STIPPLE
 #endif
 
@@ -55,12 +55,13 @@ static const char sccsid[] = "@(#)demon.c	5.00 2000/11/01 xlockmore";
 # define DEFAULTS	"*delay:   50000 \n" \
 					"*count:   0     \n" \
 					"*cycles:  1000  \n" \
-					"*size:    -7    \n" \
+					"*size:    -30   \n" \
 					"*ncolors: 64    \n" \
 					"*fpsSolid: true    \n" \
+				    "*ignoreRotation: True  \n" \
 
-# define demon_handle_event 0
 # define UNIFORM_COLORS
+# define release_demon 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
 #else /* STANDALONE */
 # include "xlock.h"		/* in xlockmore distribution */
@@ -95,7 +96,7 @@ ENTRYPOINT ModeSpecOpt demon_opts =
 
 #ifdef USE_MODULES
 ModStruct   demon_description =
-{"demon", "init_demon", "draw_demon", "release_demon",
+{"demon", "init_demon", "draw_demon", (char *) NULL,
  "refresh_demon", "init_demon", (char *) NULL, &demon_opts,
  50000, 0, 1000, -7, 64, 1.0, "",
  "Shows Griffeath's cellular automata", 0, NULL};
@@ -104,8 +105,8 @@ ModStruct   demon_description =
 
 #define DEMONBITS(n,w,h)\
   if ((dp->pixmaps[dp->init_bits]=\
-  XCreatePixmapFromBitmapData(display,window,(char *)n,w,h,1,0,1))==None){\
-  free_demon(display,dp); return;} else {dp->init_bits++;}
+  XCreatePixmapFromBitmapData(MI_DISPLAY(mi),window,(char *)n,w,h,1,0,1))==None){\
+  free_demon(mi); return;} else {dp->init_bits++;}
 
 #define REDRAWSTEP 2000		/* How many cells to draw per cycle */
 #define MINSTATES 2
@@ -228,25 +229,6 @@ addtolist(ModeInfo * mi, int col, int row, unsigned char state)
 	return True;
 }
 
-#ifdef DEBUG
-static void
-print_state(ModeInfo * mi, int state)
-{
-	demonstruct *dp = &demons[MI_SCREEN(mi)];
-	CellList   *locallist;
-	int         i = 0;
-
-	locallist = dp->cellList[state];
-	(void) printf("state %d\n", state);
-	while (locallist) {
-		(void) printf("%d	x %d, y %d\n", i,
-			      locallist->pt.x, locallist->pt.y);
-		locallist = locallist->next;
-		i++;
-	}
-}
-
-#endif
 
 static void
 free_state(demonstruct * dp, int state)
@@ -296,8 +278,10 @@ free_struct(demonstruct * dp)
 }
 
 static void
-free_demon(Display *display, demonstruct *dp)
+free_demon(ModeInfo * mi)
 {
+	Display    *display = MI_DISPLAY(mi);
+	demonstruct *dp = &demons[MI_SCREEN(mi)];
 	int         shade;
 
 	if (dp->stippledGC != None) {
@@ -428,15 +412,10 @@ RandomSoup(ModeInfo * mi)
 ENTRYPOINT void
 init_demon (ModeInfo * mi)
 {
-	Display    *display = MI_DISPLAY(mi);
 	int         size = MI_SIZE(mi), nk;
 	demonstruct *dp;
 
-	if (demons == NULL) {
-		if ((demons = (demonstruct *) calloc(MI_NUM_SCREENS(mi),
-					      sizeof (demonstruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, demons, free_demon);
 	dp = &demons[MI_SCREEN(mi)];
 
 	dp->generation = 0;
@@ -448,9 +427,9 @@ init_demon (ModeInfo * mi)
 			XGCValues   gcv;
 
 			gcv.fill_style = FillOpaqueStippled;
-			if ((dp->stippledGC = XCreateGC(display, window,
+			if ((dp->stippledGC = XCreateGC(MI_DISPLAY(mi), window,
 				 GCFillStyle, &gcv)) == None) {
-				free_demon(display, dp);
+				free_demon(mi);
 				return;
 			}
 		}
@@ -465,7 +444,7 @@ init_demon (ModeInfo * mi)
 #endif /* DO_STIPPLE */
 	free_struct(dp);
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
     jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi), False);
 #endif
 
@@ -488,11 +467,11 @@ init_demon (ModeInfo * mi)
 		dp->states = plots[1][nk];
 	if ((dp->cellList = (CellList **) calloc(dp->states,
 		sizeof (CellList *))) == NULL) {
-		free_demon(display, dp);
+		free_demon(mi);
 		return;
 	}
 	if ((dp->ncells = (int *) calloc(dp->states, sizeof (int))) == NULL) {
-		free_demon(display, dp);
+		free_demon(mi);
 		return;
 	}
 
@@ -584,13 +563,13 @@ init_demon (ModeInfo * mi)
 
 	if ((dp->oldcell = (unsigned char *)
 		malloc(dp->ncols * dp->nrows * sizeof (unsigned char))) == NULL) {
-		free_demon(display, dp);
+		free_demon(mi);
 		return;
 	}
 
 	if ((dp->newcell = (unsigned char *)
 		malloc(dp->ncols * dp->nrows * sizeof (unsigned char))) == NULL) {
-		free_demon(display, dp);
+		free_demon(mi);
 		return;
 	}
 
@@ -917,7 +896,7 @@ draw_demon (ModeInfo * mi)
 				if (dp->oldcell[i + mj] != dp->newcell[i + mj]) {
 					dp->oldcell[i + mj] = dp->newcell[i + mj];
 					if (!addtolist(mi, i, j, dp->oldcell[i + mj])) {
-						free_demon(MI_DISPLAY(mi), dp);
+						free_demon(mi);
 						return;
 					}
 				}
@@ -929,7 +908,7 @@ draw_demon (ModeInfo * mi)
 	} else {
 		if (dp->ncells[dp->state])
 			if (!draw_state(mi, dp->state)) {
-				free_demon(MI_DISPLAY(mi), dp);
+				free_demon(mi);
 				return;
 			}
 		dp->state++;
@@ -957,19 +936,6 @@ reshape_demon(ModeInfo * mi, int width, int height)
 }
 
 
-ENTRYPOINT void
-release_demon (ModeInfo * mi)
-{
-	if (demons != NULL) {
-		int         screen;
-
-		for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-			free_demon(MI_DISPLAY(mi), &demons[screen]);
-		(void) free((void *) demons);
-		demons = (demonstruct *) NULL;
-	}
-}
-
 ENTRYPOINT void
 refresh_demon (ModeInfo * mi)
 {
@@ -983,6 +949,19 @@ refresh_demon (ModeInfo * mi)
 	dp->redrawpos = 0;
 }
 
+ENTRYPOINT Bool
+demon_handle_event (ModeInfo *mi, XEvent *event)
+{
+  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      reshape_demon (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+      return True;
+    }
+  return False;
+}
+
+
+
 XSCREENSAVER_MODULE ("Demon", demon)
 
 #endif /* MODE_demon */