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

[xscreensaver] / hacks / braid.c

diff --git a/hacks/braid.c b/hacks/braid.c
index c73b89d785e039b4051394e480c4356498197f81..1f82334cbda963575339ee04974fdad51c452ade 100644 (file)
--- a/hacks/braid.c
+++ b/hacks/braid.c
@@ -41,7 +41,7 @@ static const char sccsid[] = "@(#)braid.c     5.00 2000/11/01 xlockmore";
                                   "*ignoreRotation: True" \
 
 # define UNIFORM_COLORS
-# define braid_handle_event 0
+# define release_braid 0
 # include "xlockmore.h"
 # include "erase.h"
 #else /* STANDALONE */
@@ -55,7 +55,7 @@ ENTRYPOINT ModeSpecOpt braid_opts = {0, NULL, 0, NULL, NULL};
 
 #ifdef USE_MODULES
 ModStruct   braid_description =
-{"braid", "init_braid", "draw_braid", "release_braid",
+{"braid", "init_braid", "draw_braid", (char *) NULL,
  "refresh_braid", "init_braid", (char *) NULL, &braid_opts,
  1000, 15, 100, 1, 64, 1.0, "",
  "Shows random braids and knots", 0, NULL};
@@ -171,11 +171,7 @@ init_braid(ModeInfo * mi)
        int         i, count, comp, c;
        float       min_length;
 
-       if (braids == NULL) {
-               if ((braids = (braidtype *) calloc(MI_NUM_SCREENS(mi),
-                                               sizeof (braidtype))) == NULL)
-                       return;
-       }
+       MI_INIT (mi, braids, 0);
        braid = &braids[MI_SCREEN(mi)];
 
        braid->center_x = MI_WIDTH(mi) / 2;
@@ -200,7 +196,7 @@ init_braid(ModeInfo * mi)
                braid->nstrands = INTRAND(MINSTRANDS,
                                       MAX(MIN(MIN(MAXSTRANDS, MI_COUNT(mi)),
                                               (int) ((braid->max_radius - braid->min_radius) / 5.0)), MINSTRANDS));
-       braid->braidlength = INTRAND(MINLENGTH, MIN(MAXLENGTH, braid->nstrands * 6));
+       braid->braidlength = INTRAND(MINLENGTH, MIN(MAXLENGTH -1, braid->nstrands * 6));
 
        for (i = 0; i < braid->braidlength; i++) {
                braid->braidword[i] =
@@ -290,6 +286,8 @@ draw_braid(ModeInfo * mi)
 #ifdef STANDALONE
     if (braid->eraser) {
       braid->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), braid->eraser);
+      if (!braid->eraser)
+        init_braid(mi);
       return;
     }
 #endif
@@ -442,8 +440,9 @@ draw_braid(ModeInfo * mi)
        if (++braid->age > MI_CYCLES(mi)) {
 #ifdef STANDALONE
       braid->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), braid->eraser);
-#endif
+#else
                init_braid(mi);
+#endif
        }
 }
 
@@ -454,13 +453,16 @@ reshape_braid(ModeInfo * mi, int width, int height)
   init_braid (mi);
 }
 
-ENTRYPOINT void
-release_braid(ModeInfo * mi)
+ENTRYPOINT Bool
+braid_handle_event (ModeInfo *mi, XEvent *event)
 {
-       if (braids != NULL) {
-               (void) free((void *) braids);
-               braids = (braidtype *) NULL;
-       }
+  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      reshape_braid (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+      return True;
+    }
+
+  return False;
 }
 
 ENTRYPOINT void