X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fbraid.c;h=4f5a77c9caa4040fd670d068a874e25a7a557a9a;hb=39809ded547bdbb08207d3e514950425215b4410;hp=1a802ff7fdbddb4a52fcdcaf9c2ec1df5e839aed;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/braid.c b/hacks/braid.c
index 1a802ff7..4f5a77c9 100644
--- a/hacks/braid.c
+++ b/hacks/braid.c
@@ -36,12 +36,16 @@ static const char sccsid[] = "@(#)braid.c	5.00 2000/11/01 xlockmore";
 				   "*count: 15 \n" \
 				   "*cycles: 100 \n" \
 				   "*size: -7 \n" \
-				   "*ncolors: 64 \n"
+				   "*ncolors: 64 \n" \
+				   "*fpsSolid: true \n" \
+				   "*ignoreRotation: True" \
+
 # define UNIFORM_COLORS
+# define free_braid 0
+# define release_braid 0
 # define reshape_braid 0
 # define braid_handle_event 0
 # include "xlockmore.h"
-# include "erase.h"
 #else /* STANDALONE */
 # include "xlock.h"
 # define ENTRYPOINT /**/
@@ -49,12 +53,11 @@ static const char sccsid[] = "@(#)braid.c	5.00 2000/11/01 xlockmore";
 
 #ifdef MODE_braid
 
-ENTRYPOINT 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};
@@ -100,9 +103,6 @@ typedef struct {
 	float       top, bottom, left, right;
 	int         age;
 	int         color_direction;
-#ifdef STANDALONE
-  eraser_state *eraser;
-#endif
 } braidtype;
 
 static braidtype *braids = (braidtype *) NULL;
@@ -170,11 +170,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);
 	braid = &braids[MI_SCREEN(mi)];
 
 	braid->center_x = MI_WIDTH(mi) / 2;
@@ -184,9 +180,7 @@ 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;
@@ -199,7 +193,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] =
@@ -286,13 +280,6 @@ 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);
-      return;
-    }
-#endif
-
 	MI_IS_DRAWN(mi) = True;
 	XSetLineAttributes(display, MI_GC(mi), braid->linewidth,
 			   LineSolid,
@@ -439,27 +426,17 @@ draw_braid(ModeInfo * mi)
 	XSetLineAttributes(display, MI_GC(mi), 1, LineSolid, CapNotLast, JoinRound);
 
 	if (++braid->age > MI_CYCLES(mi)) {
-#ifdef STANDALONE
-      braid->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), braid->eraser);
-#endif
 		init_braid(mi);
 	}
 }
 
-ENTRYPOINT void
-release_braid(ModeInfo * mi)
-{
-	if (braids != NULL) {
-		(void) free((void *) braids);
-		braids = (braidtype *) NULL;
-	}
-}
-
+#ifndef STANDALONE
 ENTRYPOINT void
 refresh_braid(ModeInfo * mi)
 {
 	MI_CLEARWINDOW(mi);
 }
+#endif
 
 XSCREENSAVER_MODULE ("Braid", braid)