X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Floop.c;h=fd27fd167c63c84a96f66e9efde8c593d461ae8d;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=ad3e1b02cd211467c8c56c18afbdf245c1593743;hpb=4ade52359b6eba3621566dac79793a33aa4c915f;p=xscreensaver

diff --git a/hacks/loop.c b/hacks/loop.c
index ad3e1b02..fd27fd16 100644
--- a/hacks/loop.c
+++ b/hacks/loop.c
@@ -79,7 +79,7 @@ static const char sccsid[] = "@(#)loop.c	5.01 2000/03/15 xlockmore";
    there is handedness at both the initial condition and the transition rule.
  */
 
-#ifndef HAVE_COCOA
+#ifndef HAVE_JWXYZ
 # define DO_STIPPLE
 #endif
 
@@ -94,7 +94,6 @@ static const char sccsid[] = "@(#)loop.c	5.01 2000/03/15 xlockmore";
 					"*ignoreRotation: True \n" \
 
 # define UNIFORM_COLORS
-# define loop_handle_event 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
 #else /* STANDALONE */
 # include "xlock.h"		/* in xlockmore distribution */
@@ -140,8 +139,8 @@ ModStruct   loop_description =
 
 #define LOOPBITS(n,w,h)\
   if ((lp->pixmaps[lp->init_bits]=\
-  XCreatePixmapFromBitmapData(display,window,(char *)n,w,h,1,0,1))==None){\
-  free_loop(display,lp); return;} else {lp->init_bits++;}
+  XCreatePixmapFromBitmapData(MI_DISPLAY(mi),window,(char *)n,w,h,1,0,1))==None){\
+  free_loop(mi); return;} else {lp->init_bits++;}
 
 static int  local_neighbors = 0;
 
@@ -918,8 +917,10 @@ free_list(loopstruct * lp)
 }
 
 static void
-free_loop(Display *display, loopstruct * lp)
+free_loop(ModeInfo * mi)
 {
+	Display    *display = MI_DISPLAY(mi);
+	loopstruct *lp = &loops[MI_SCREEN(mi)];
 	int         shade;
 
 	for (shade = 0; shade < lp->init_bits; shade++)
@@ -951,7 +952,7 @@ addtolist(ModeInfo * mi, int col, int row, unsigned char state)
 	if ((lp->cellList[state] = (CellList *) malloc(sizeof (CellList))) ==
 			NULL) {
 		lp->cellList[state] = current;
-		free_loop(MI_DISPLAY(mi), lp);
+		free_loop(mi);
 		return False;
 	}
 	lp->cellList[state]->pt.x = col;
@@ -1423,14 +1424,6 @@ do_gen(loopstruct * lp)
 ENTRYPOINT void
 release_loop (ModeInfo * mi)
 {
-	if (loops != NULL) {
-		int         screen;
-
-		for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-			free_loop(MI_DISPLAY(mi), &loops[screen]);
-		(void) free((void *) loops);
-		loops = (loopstruct *) NULL;
-	}
 	if (table != NULL) {
 		(void) free((void *) table);
 		table = (unsigned int *) NULL;
@@ -1443,17 +1436,12 @@ static void *stop_warning_about_triangleUnit_already;
 ENTRYPOINT void
 init_loop (ModeInfo * mi)
 {
-	Display    *display = MI_DISPLAY(mi);
 	int         i, size = MI_SIZE(mi);
 	loopstruct *lp;
 
     stop_warning_about_triangleUnit_already = (void *) &triangleUnit;
 
-	if (loops == NULL) {
-		if ((loops = (loopstruct *) calloc(MI_NUM_SCREENS(mi),
-					       sizeof (loopstruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, loops, free_loop);
 	lp = &loops[MI_SCREEN(mi)];
 
 	lp->redrawing = 0;
@@ -1464,9 +1452,9 @@ init_loop (ModeInfo * mi)
           XGCValues   gcv;
         if (lp->stippledGC == None) {
 			gcv.fill_style = FillOpaqueStippled;
-			if ((lp->stippledGC = XCreateGC(display, window,
+			if ((lp->stippledGC = XCreateGC(MI_DISPLAY(mi), window,
 				 GCFillStyle, &gcv)) == None) {
-				free_loop(display, lp);
+				free_loop(mi);
 				return;
 			}
 		}
@@ -1575,7 +1563,7 @@ init_loop (ModeInfo * mi)
 	}
 	if ((lp->oldcells = (unsigned char *) calloc(lp->bncols * lp->bnrows,
 			sizeof (unsigned char))) == NULL) {
-		free_loop(display, lp);
+		free_loop(mi);
 		return;
 	}
 	if (lp->newcells != NULL) {
@@ -1584,7 +1572,7 @@ init_loop (ModeInfo * mi)
 	}
 	if ((lp->newcells = (unsigned char *) calloc(lp->bncols * lp->bnrows,
 			sizeof (unsigned char))) == NULL) {
-		free_loop(display, lp);
+		free_loop(mi);
 		return;
 	}
 	if (!init_table()) {
@@ -1654,7 +1642,7 @@ draw_loop (ModeInfo * mi)
 	}
 	for (i = 0; i < COLORS; i++)
 		if (!draw_state(mi, i)) {
-			free_loop(MI_DISPLAY(mi), lp);
+			free_loop(mi);
 			return;
 		}
 	if (++lp->generation > MI_CYCLES(mi) || lp->dead) {
@@ -1699,6 +1687,17 @@ refresh_loop (ModeInfo * mi)
 	lp->redrawpos = lp->by * lp->ncols + lp->bx;
 }
 
+ENTRYPOINT Bool
+loop_handle_event (ModeInfo *mi, XEvent *event)
+{
+  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      reshape_loop (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+      return True;
+    }
+  return False;
+}
+
 XSCREENSAVER_MODULE ("Loop", loop)
 
 #endif /* MODE_loop */