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

[xscreensaver] / hacks / braid.c

diff --git a/hacks/braid.c b/hacks/braid.c
index 1f82334cbda963575339ee04974fdad51c452ade..4f5a77c9caa4040fd670d068a874e25a7a557a9a 100644 (file)
--- a/hacks/braid.c
+++ b/hacks/braid.c
@@ -41,9 +41,11 @@ static const char sccsid[] = "@(#)braid.c    5.00 2000/11/01 xlockmore";
                                   "*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 /**/
@@ -101,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;
@@ -171,7 +170,7 @@ init_braid(ModeInfo * mi)
        int         i, count, comp, c;
        float       min_length;
 
-       MI_INIT (mi, braids, 0);
+       MI_INIT (mi, braids);
        braid = &braids[MI_SCREEN(mi)];
 
        braid->center_x = MI_WIDTH(mi) / 2;
@@ -181,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;
@@ -283,15 +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);
-      if (!braid->eraser)
-        init_braid(mi);
-      return;
-    }
-#endif
-
        MI_IS_DRAWN(mi) = True;
        XSetLineAttributes(display, MI_GC(mi), braid->linewidth,
                           LineSolid,
@@ -438,38 +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);
-#else
                init_braid(mi);
-#endif
        }
 }
 
-ENTRYPOINT void
-reshape_braid(ModeInfo * mi, int width, int height)
-{
-  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;
-}
-
+#ifndef STANDALONE
 ENTRYPOINT void
 refresh_braid(ModeInfo * mi)
 {
        MI_CLEARWINDOW(mi);
 }
+#endif
 
 XSCREENSAVER_MODULE ("Braid", braid)