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

diff --git a/hacks/euler2d.c b/hacks/euler2d.c
index b055c45e..f804e427 100644
--- a/hacks/euler2d.c
+++ b/hacks/euler2d.c
@@ -41,19 +41,19 @@ static const char sccsid[] = "@(#)euler2d.c	5.00 2000/11/01 xlockmore";
  */
 
 #ifdef STANDALONE
-#define MODE_euler2d
-#define PROGCLASS "Euler2d"
-#define HACK_INIT init_euler2d
-#define HACK_DRAW draw_euler2d
-#define euler2d_opts xlockmore_opts
-#define DEFAULTS "*delay: 10000 \n" \
-"*count: 1024 \n" \
-"*cycles: 3000 \n" \
-"*ncolors: 64 \n"
-#define SMOOTH_COLORS
-#include "xlockmore.h"		/* in xscreensaver distribution */
+# define MODE_euler2d
+# define DEFAULTS	"*delay:   10000 \n" \
+					"*count:   1024  \n" \
+					"*cycles:  3000  \n" \
+					"*ncolors: 64    \n" \
+					"*fpsSolid: true    \n" \
+					"*ignoreRotation: True \n" \
+
+# define SMOOTH_COLORS
+# define release_euler2d 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_euler2d
@@ -68,31 +68,29 @@ static float power = 1;
 
 static XrmOptionDescRec opts[] =
 {
-  {(char* ) "-eulertail", (char *) ".euler2d.eulertail",
-   XrmoptionSepArg, (caddr_t) NULL},
-  {(char* ) "-eulerpower", (char *) ".euler2d.eulerpower",
-   XrmoptionSepArg, (caddr_t) NULL},
+  {"-eulertail", ".euler2d.eulertail",   XrmoptionSepArg, NULL},
+  {"-eulerpower", ".euler2d.eulerpower", XrmoptionSepArg, NULL},
 };
 static argtype vars[] =
 {
   {&tail_len, "eulertail",
-   (char *) "EulerTail", (char *) DEF_EULERTAIL, t_Int},
+   "EulerTail", (char *) DEF_EULERTAIL, t_Int},
   {&power, "eulerpower",
-   (char *) "EulerPower", (char *) "1", t_Float},
+   "EulerPower", "1", t_Float},
 };
 static OptionStruct desc[] =
 {
-  {(char *) "-eulertail len", (char *) "Length of Euler2d tails"},
-  {(char *) "-eulerpower power", (char *) "power of interaction law for points for Euler2d"},
+  {"-eulertail len", "Length of Euler2d tails"},
+  {"-eulerpower power", "power of interaction law for points for Euler2d"},
 };
 
-ModeSpecOpt euler2d_opts =
+ENTRYPOINT ModeSpecOpt euler2d_opts =
 {sizeof opts / sizeof opts[0], opts,
  sizeof vars / sizeof vars[0], vars, desc};
 
 #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
@@ -483,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);
@@ -506,8 +505,8 @@ free_euler2d(euler2dstruct *sp)
 	deallocate(sp->mod_dp2, double);
 }
 
-void
-init_euler2d(ModeInfo * mi)
+ENTRYPOINT void
+init_euler2d (ModeInfo * mi)
 {
 #define nr_rotates 18 /* how many rotations to try to fill as much of screen as possible - must be even number */
 	euler2dstruct *sp;
@@ -523,13 +522,13 @@ 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_JWXYZ
+  jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi),  False);
+#endif
+
 	sp->boundary_color = NRAND(MI_NPIXELS(mi));
 	sp->hide_vortex = NRAND(4) != 0;
 
@@ -551,8 +550,6 @@ init_euler2d(ModeInfo * mi)
 	/* Clear the background. */
 	MI_CLEARWINDOW(mi);
 	 
-	free_euler2d(sp);
-
 	/* Allocate memory. */
 
 	if (sp->csegs == NULL) {
@@ -746,8 +743,8 @@ init_euler2d(ModeInfo * mi)
 	}
 }
 
-void
-draw_euler2d(ModeInfo * mi)
+ENTRYPOINT void
+draw_euler2d (ModeInfo * mi)
 {
 	Display    *display = MI_DISPLAY(mi);
 	Window      window = MI_WINDOW(mi);
@@ -855,23 +852,32 @@ draw_euler2d(ModeInfo * mi)
 
 }
 
-void
-release_euler2d(ModeInfo * mi)
+ENTRYPOINT void
+reshape_euler2d(ModeInfo * mi, int width, int height)
 {
-	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;
-	}
+  XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
+  init_euler2d (mi);
 }
 
-void
-refresh_euler2d(ModeInfo * mi)
+ENTRYPOINT void
+refresh_euler2d (ModeInfo * mi)
 {
 	MI_CLEARWINDOW(mi);
 }
 
+ENTRYPOINT Bool
+euler2d_handle_event (ModeInfo *mi, XEvent *event)
+{
+  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 */