X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fflow.c;h=df9aadc366efc82d5866e3e75c18a3d0b2e849fc;hp=6f60d1d35243b621d38a4b74a0a3b59a3863a769;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=bc7b7a8eb122206d239ec0e693676bcce31be1aa

diff --git a/hacks/flow.c b/hacks/flow.c
index 6f60d1d3..df9aadc3 100644
--- a/hacks/flow.c
+++ b/hacks/flow.c
@@ -2,13 +2,11 @@
 /* flow --- flow of strange bees */
 
 #if 0
-#if !defined( lint ) && !defined( SABER )
 static const char sccsid[] = "@(#)flow.c	5.00 2000/11/01 xlockmore";
 #endif
-#endif
 
 /*-
- * Copyright (c) 1996 by Tim Auckland <Tim.Auckland@Procket.com>
+ * Copyright (c) 1996 by Tim Auckland <tda10.geo@yahoo.com>
  * Incorporating some code from Stephen Davies Copyright (c) 2000
  *
  * Search code based on techniques described in "Strange Attractors:
@@ -98,25 +96,14 @@ static const char sccsid[] = "@(#)flow.c	5.00 2000/11/01 xlockmore";
 
 #ifdef STANDALONE
 # define MODE_flow
-# define PROGCLASS "Flow"
-# define HACK_INIT init_flow
-# define HACK_DRAW draw_flow
-# define flow_opts xlockmore_opts
 # define DEFAULTS   "*delay:       10000 \n" \
-					"*count:        3000 \n" \
-					"*size:         -10 \n" \
-					"*cycles:       10000 \n" \
-					"*ncolors:      200 \n" \
-					"*rotate:       True \n" \
-					"*ride:         True \n" \
-					"*box:          True \n" \
-					"*periodic:     True \n" \
-					"*search:       True \n" \
-					"*dbuf:         True \n"
+					"*count:       3000  \n" \
+					"*size:        -10   \n" \
+					"*cycles:      10000 \n" \
+					"*ncolors:     200   \n"
+
+# define release_flow 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
-# ifndef MI_DEPTH
-#  define MI_DEPTH MI_WIN_DEPTH
-# endif
 #else /* STANDALONE */
 # include "xlock.h"		/* in xlockmore distribution */
 #endif /* STANDALONE */
@@ -170,7 +157,7 @@ static OptionStruct desc[] = {
     {"-/+dbuf",     "turn on/off double buffering."},
 };
 
-ModeSpecOpt flow_opts =
+ENTRYPOINT ModeSpecOpt flow_opts =
 {sizeof opts / sizeof opts[0], opts,
  sizeof vars / sizeof vars[0], vars, desc};
 
@@ -399,11 +386,12 @@ Iterate(dvector *p, dvector(*ODE)(Par par, double x, double y, double z),
 
 #define deallocate(p,t) if (p!=NULL) {free(p); p=(t*)NULL; }
 #define allocate(p,t,s) if ((p=(t*)malloc(sizeof(t)*s))==NULL)\
-{free_flow(sp);return;}
+{free_flow(mi);return;}
 
 static void
-free_flow(flowstruct *sp)
+free_flow(ModeInfo * mi)
 {
+	flowstruct *sp = &flows[MI_SCREEN(mi)];
 	deallocate(sp->csegs, XSegment);
 	deallocate(sp->cnsegs, int);
 	deallocate(sp->old_segs, XSegment);
@@ -632,17 +620,13 @@ clip(double nx, double ny, double nz, double d, dvector *s, dvector *e)
  * Public functions
  */
 
-void
-init_flow(ModeInfo * mi)
+ENTRYPOINT void
+init_flow (ModeInfo * mi)
 {
 	flowstruct *sp;
 	char       *name;
 	
-	if (flows == NULL) {
-		if ((flows = (flowstruct *) calloc(MI_NUM_SCREENS(mi),
-										   sizeof (flowstruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, flows, free_flow);
 	sp = &flows[MI_SCREEN(mi)];
 
 	sp->count2 = 0;
@@ -784,12 +768,17 @@ init_flow(ModeInfo * mi)
 
 	sp->count2 = 0; /* Reset search */
 
-	free_flow(sp);
 	sp->beecount = MI_COUNT(mi);
-	if (sp->beecount < 0) {	/* random variations */
+	if (!sp->beecount) {
+		sp->beecount = 1; /* The camera requires 1 or more */
+	} else if (sp->beecount < 0) {	/* random variations */
 		sp->beecount = NRAND(-sp->beecount) + 1; /* Minimum 1 */
 	}
 
+# ifdef HAVE_JWXYZ	/* Don't second-guess Quartz's double-buffering */
+  dbufp = False;
+# endif
+
 	if(dbufp) { /* Set up double buffer */
 		if (sp->buffer != None)
 			XFreePixmap(MI_DISPLAY(mi), sp->buffer);
@@ -813,7 +802,7 @@ init_flow(ModeInfo * mi)
 		allocate(sp->csegs, XSegment,
 				 (sp->beecount + BOX_L) * MI_NPIXELS(mi) * sp->taillen);
 		allocate(sp->cnsegs, int, MI_NPIXELS(mi));
-		allocate(sp->old_segs, XSegment, sp->beecount * sp->taillen);
+		allocate(sp->old_segs, XSegment, (sp->beecount + BOX_L) * sp->taillen);
 		allocate(sp->p, dvector, sp->beecount * sp->taillen);
 	}
 
@@ -826,8 +815,8 @@ init_flow(ModeInfo * mi)
 	Z(1, 0) = sp->cam[1].z = 0;
 }
 
-void
-draw_flow(ModeInfo * mi)
+ENTRYPOINT void
+draw_flow (ModeInfo * mi)
 {
 	int         b, i;
 	int         col, begin, end;
@@ -842,6 +831,10 @@ draw_flow(ModeInfo * mi)
 	if (sp->csegs == NULL)
 		return;
 
+#ifdef HAVE_JWXYZ	/* Don't second-guess Quartz's double-buffering */
+    XClearWindow (MI_DISPLAY(mi), MI_WINDOW(mi));
+#endif
+
 	/* multiplier for indexing segment arrays.  Used in IX macro, etc. */
 	segindex = (sp->beecount + BOX_L) * sp->taillen;
 
@@ -1113,7 +1106,7 @@ draw_flow(ModeInfo * mi)
 				   are ok, they help to outline the Poincare'
 				   slice. */
 				for(j = i; j < end; j++) Y(j,b) = Y(i,b);
-				begin = i + 1;
+				/*begin = i + 1;*/
 				break;
 			}
 			
@@ -1203,23 +1196,31 @@ draw_flow(ModeInfo * mi)
 	}
 }
 
-void
-release_flow(ModeInfo * mi)
+ENTRYPOINT void
+reshape_flow(ModeInfo * mi, int width, int height)
 {
-	if (flows != NULL) {
-		int         screen;
-
-		for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-			free_flow(&flows[screen]);
-		free(flows);
-		flows = (flowstruct *) NULL;
-	}
+  init_flow (mi);
 }
 
-void
-refresh_flow(ModeInfo * mi)
+
+ENTRYPOINT void
+refresh_flow (ModeInfo * mi)
 {
 	if(!dbufp) MI_CLEARWINDOW(mi);
 }
 
+ENTRYPOINT Bool
+flow_handle_event (ModeInfo *mi, XEvent *event)
+{
+  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      init_flow (mi);
+      return True;
+    }
+  return False;
+}
+
+
+XSCREENSAVER_MODULE ("Flow", flow)
+
 #endif /* MODE_flow */