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

diff --git a/hacks/euler2d.c b/hacks/euler2d.c
index 307bfd29..f804e427 100644
--- a/hacks/euler2d.c
+++ b/hacks/euler2d.c
@@ -49,8 +49,8 @@ static const char sccsid[] = "@(#)euler2d.c	5.00 2000/11/01 xlockmore";
 					"*fpsSolid: true    \n" \
 					"*ignoreRotation: True \n" \
 
-# define euler2d_handle_event 0
 # define SMOOTH_COLORS
+# define release_euler2d 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
 #else /* STANDALONE */
 # include "xlock.h"		/* in xlockmore distribution */
@@ -90,7 +90,7 @@ ENTRYPOINT ModeSpecOpt euler2d_opts =
 
 #ifdef USE_MODULES
 ModStruct   euler2d_description = {
-	"euler2d", "init_euler2d", "draw_euler2d", "release_euler2d",
+	"euler2d", "init_euler2d", "draw_euler2d", (char *) NULL,
 	"refresh_euler2d", "init_euler2d", (char *) NULL, &euler2d_opts,
 	1000, 1024, 3000, 1, 64, 1.0, "",
 	"Simulates 2D incompressible invisid fluid.", 0, NULL
@@ -481,11 +481,12 @@ ode_solve(euler2dstruct *sp)
 
 #define deallocate(p,t) if (p!=NULL) {(void) free((void *) p); p=(t*)NULL; }
 #define allocate(p,t,s) if ((p=(t*)malloc(sizeof(t)*s))==NULL)\
-{free_euler2d(sp);return;}
+{free_euler2d(mi);return;}
 
 static void
-free_euler2d(euler2dstruct *sp)
+free_euler2d(ModeInfo * mi)
 {
+	euler2dstruct *sp = &euler2ds[MI_SCREEN(mi)];
 	deallocate(sp->csegs, XSegment);
 	deallocate(sp->old_segs, XSegment);
 	deallocate(sp->nold_segs, int);
@@ -521,14 +522,10 @@ init_euler2d (ModeInfo * mi)
 	delta_t = 0.001;
         if (power>1.0) delta_t *= pow(0.1,power-1);
 
-	if (euler2ds == NULL) {
-		if ((euler2ds = (euler2dstruct *) calloc(MI_NUM_SCREENS(mi),
-					       sizeof (euler2dstruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, euler2ds, free_euler2d);
 	sp = &euler2ds[MI_SCREEN(mi)];
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
   jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi),  False);
 #endif
 
@@ -553,8 +550,6 @@ init_euler2d (ModeInfo * mi)
 	/* Clear the background. */
 	MI_CLEARWINDOW(mi);
 	 
-	free_euler2d(sp);
-
 	/* Allocate memory. */
 
 	if (sp->csegs == NULL) {
@@ -865,24 +860,24 @@ reshape_euler2d(ModeInfo * mi, int width, int height)
 }
 
 ENTRYPOINT void
-release_euler2d (ModeInfo * mi)
+refresh_euler2d (ModeInfo * mi)
 {
-	if (euler2ds != NULL) {
-		int         screen;
-
-		for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-			free_euler2d(&euler2ds[screen]);
-		(void) free((void *) euler2ds);
-		euler2ds = (euler2dstruct *) NULL;
-	}
+	MI_CLEARWINDOW(mi);
 }
 
-ENTRYPOINT void
-refresh_euler2d (ModeInfo * mi)
+ENTRYPOINT Bool
+euler2d_handle_event (ModeInfo *mi, XEvent *event)
 {
-	MI_CLEARWINDOW(mi);
+  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      init_euler2d (mi);
+      return True;
+    }
+  return False;
 }
 
+
+
 XSCREENSAVER_MODULE ("Euler2D", euler2d)
 
 #endif /* MODE_euler2d */