From http://www.jwz.org/xscreensaver/xscreensaver-5.30.tar.gz

[xscreensaver] / hacks / flow.c

diff --git a/hacks/flow.c b/hacks/flow.c
index a2c819916bc98ec32b5b780022bb1e9d71484373..fc69e3a5d5ffae5be17ce4688cf5b9b87d1c4e62 100644 (file)
--- a/hacks/flow.c
+++ b/hacks/flow.c
@@ -2,10 +2,8 @@
 /* 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 <tda10.geo@yahoo.com>
@@ -104,8 +102,6 @@ static const char sccsid[] = "@(#)flow.c    5.00 2000/11/01 xlockmore";
                                        "*cycles:      10000 \n" \
                                        "*ncolors:     200   \n"
 
-# define reshape_flow 0
-# define flow_handle_event 0
 # include "xlockmore.h"                /* in xscreensaver distribution */
 #else /* STANDALONE */
 # include "xlock.h"            /* in xlockmore distribution */
@@ -776,7 +772,9 @@ init_flow (ModeInfo * mi)
 
        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 */
        }
 
@@ -807,7 +805,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);
        }
 
@@ -1201,6 +1199,13 @@ draw_flow (ModeInfo * mi)
        }
 }
 
+ENTRYPOINT void
+reshape_flow(ModeInfo * mi, int width, int height)
+{
+  init_flow (mi);
+}
+
+
 ENTRYPOINT void
 release_flow (ModeInfo * mi)
 {
@@ -1220,6 +1225,18 @@ 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 */