X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fbraid.c;h=1f82334cbda963575339ee04974fdad51c452ade;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=efb424289b130a962f0dcb2809839e8ddfdea9fe;hpb=96a411663168b0ba5432b407a83be55f3df0c802;p=xscreensaver

diff --git a/hacks/braid.c b/hacks/braid.c
index efb42428..1f82334c 100644
--- a/hacks/braid.c
+++ b/hacks/braid.c
@@ -31,32 +31,31 @@ static const char sccsid[] = "@(#)braid.c	5.00 2000/11/01 xlockmore";
  */
 
 #ifdef STANDALONE
-#define MODE_braid
-#define PROGCLASS "Braid"
-#define HACK_INIT init_braid
-#define HACK_DRAW draw_braid
-#define braid_opts xlockmore_opts
-#define DEFAULTS "*delay: 1000 \n" \
- "*count: 15 \n" \
- "*cycles: 100 \n" \
- "*size: -7 \n" \
- "*ncolors: 64 \n"
-#define UNIFORM_COLORS
-#include "xlockmore.h"
-#include "erase.h"
+# define MODE_braid
+# define DEFAULTS  "*delay: 1000 \n" \
+				   "*count: 15 \n" \
+				   "*cycles: 100 \n" \
+				   "*size: -7 \n" \
+				   "*ncolors: 64 \n" \
+				   "*fpsSolid: true \n" \
+				   "*ignoreRotation: True" \
+
+# define UNIFORM_COLORS
+# define release_braid 0
+# include "xlockmore.h"
+# include "erase.h"
 #else /* STANDALONE */
-#include "xlock.h"
-
+# include "xlock.h"
+# define ENTRYPOINT /**/
 #endif /* STANDALONE */
 
 #ifdef MODE_braid
 
-ModeSpecOpt braid_opts =
-{0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL};
+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};
@@ -102,6 +101,9 @@ typedef struct {
 	float       top, bottom, left, right;
 	int         age;
 	int         color_direction;
+#ifdef STANDALONE
+  eraser_state *eraser;
+#endif
 } braidtype;
 
 static braidtype *braids = (braidtype *) NULL;
@@ -161,7 +163,7 @@ applywordbackto(braidtype * braid, int string, int position)
 	return c;
 }
 
-void
+ENTRYPOINT void
 init_braid(ModeInfo * mi)
 {
 	braidtype  *braid;
@@ -169,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;
@@ -183,7 +181,9 @@ init_braid(ModeInfo * mi)
 	/* jwz: go in the other direction sometimes. */
 	braid->color_direction = ((LRAND() & 1) ? 1 : -1);
 
+#ifndef STANDALONE
 	MI_CLEARWINDOW(mi);
+#endif
 
 	min_length = (braid->center_x > braid->center_y) ?
 		braid->center_y : braid->center_x;
@@ -196,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] =
@@ -265,7 +265,7 @@ init_braid(ModeInfo * mi)
 			braid->components[i] *= -1;
 }
 
-void
+ENTRYPOINT void
 draw_braid(ModeInfo * mi)
 {
 	Display    *display = MI_DISPLAY(mi);
@@ -283,6 +283,15 @@ draw_braid(ModeInfo * mi)
 		return;
 	braid = &braids[MI_SCREEN(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
+
 	MI_IS_DRAWN(mi) = True;
 	XSetLineAttributes(display, MI_GC(mi), braid->linewidth,
 			   LineSolid,
@@ -430,25 +439,38 @@ draw_braid(ModeInfo * mi)
 
 	if (++braid->age > MI_CYCLES(mi)) {
 #ifdef STANDALONE
-	  erase_full_window(MI_DISPLAY(mi), MI_WINDOW(mi));
-#endif
+      braid->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), braid->eraser);
+#else
 		init_braid(mi);
+#endif
 	}
 }
 
-void
-release_braid(ModeInfo * mi)
+ENTRYPOINT void
+reshape_braid(ModeInfo * mi, int width, int height)
 {
-	if (braids != NULL) {
-		(void) free((void *) braids);
-		braids = (braidtype *) NULL;
-	}
+  XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
+  init_braid (mi);
+}
+
+ENTRYPOINT Bool
+braid_handle_event (ModeInfo *mi, XEvent *event)
+{
+  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      reshape_braid (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+      return True;
+    }
+
+  return False;
 }
 
-void
+ENTRYPOINT void
 refresh_braid(ModeInfo * mi)
 {
 	MI_CLEARWINDOW(mi);
 }
 
+XSCREENSAVER_MODULE ("Braid", braid)
+
 #endif /* MODE_braid */