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

[xscreensaver] / hacks / discrete.c

diff --git a/hacks/discrete.c b/hacks/discrete.c
index db3838ff5fa0be75c73a89ec3ffe20425b09d9ff..ecf4ce5c959f5a8816141410d7d6e3f3f52ac78c 100644 (file)
--- a/hacks/discrete.c
+++ b/hacks/discrete.c
@@ -33,13 +33,15 @@ static const char sccsid[] = "@(#)discrete.c        5.00 2000/11/01 xlockmore";
 
 #ifdef STANDALONE
 # define MODE_discrete
-#define DEFAULTS       "*delay: 1000 \n" \
-                                       "*count: 4096 \n" \
+#define DEFAULTS       "*delay: 20000 \n" \
+                                       "*count:  4096 \n" \
                                        "*cycles: 2500 \n" \
-                                       "*ncolors: 100 \n"
+                                       "*ncolors: 100 \n" \
+                                       "*fpsSolid: true \n" \
+                                   "*ignoreRotation: True \n" \
+
 # define SMOOTH_COLORS
-# define reshape_discrete 0
-# define discrete_handle_event 0
+# define release_discrete 0
 # include "xlockmore.h"                /* in xscreensaver distribution */
 # include "erase.h"
 #else /* STANDALONE */
@@ -53,7 +55,7 @@ ENTRYPOINT ModeSpecOpt discrete_opts =
 
 #ifdef USE_MODULES
 ModStruct   discrete_description =
-{"discrete", "init_discrete", "draw_discrete", "release_discrete",
+{"discrete", "init_discrete", "draw_discrete", (char *) NULL,
  "refresh_discrete", "init_discrete", (char *) NULL, &discrete_opts,
  1000, 4096, 2500, 1, 64, 1.0, "",
  "Shows various discrete maps", 0, NULL};
@@ -108,18 +110,15 @@ typedef struct {
 
 static discretestruct *discretes = (discretestruct *) NULL;
 
+static void free_discrete(ModeInfo * mi);
+
 ENTRYPOINT void
 init_discrete (ModeInfo * mi)
 {
        double      range;
        discretestruct *hp;
 
-       if (discretes == NULL) {
-               if ((discretes =
-                    (discretestruct *) calloc(MI_NUM_SCREENS(mi),
-                                          sizeof (discretestruct))) == NULL)
-                       return;
-       }
+       MI_INIT (mi, discretes, free_discrete);
        hp = &discretes[MI_SCREEN(mi)];
 
        hp->maxx = MI_WIDTH(mi);
@@ -260,8 +259,8 @@ init_discrete (ModeInfo * mi)
 }
 
 
-ENTRYPOINT void
-draw_discrete (ModeInfo * mi)
+static void
+draw_discrete_1 (ModeInfo * mi)
 {
        Display    *dsp = MI_DISPLAY(mi);
        Window      win = MI_WINDOW(mi);
@@ -279,11 +278,6 @@ draw_discrete (ModeInfo * mi)
        if (hp->pointBuffer == NULL)
                return;
 
-    if (hp->eraser) {
-      hp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), hp->eraser);
-      return;
-    }
-
        k = count;
        xp = hp->pointBuffer;
 
@@ -400,30 +394,50 @@ draw_discrete (ModeInfo * mi)
                xp++;
        }
        XDrawPoints(dsp, win, gc, hp->pointBuffer, count, CoordModeOrigin);
-       if (++hp->count > cycles) {
-#ifdef STANDALONE
-      hp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), hp->eraser);
-#endif /* STANDALONE */
-               init_discrete(mi);
-       }
 }
 
 ENTRYPOINT void
-release_discrete(ModeInfo * mi)
+draw_discrete (ModeInfo * mi)
 {
-       if (discretes != NULL) {
-               int         screen;
+  discretestruct *hp = &discretes[MI_SCREEN(mi)];
+  int cycles = MI_CYCLES(mi);
+  int i;
+
+  if (hp->eraser) {
+    hp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), hp->eraser);
+    if (!hp->eraser)
+      init_discrete(mi);
+    return;
+  }
+
+  for (i = 0; i < 10; i++) {
+    draw_discrete_1 (mi);
+    hp->count++;
+  }
+
+  if (hp->count > cycles) {
+    hp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), hp->eraser);
+  }
+}
 
-               for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
-                       discretestruct *hp = &discretes[screen];
 
-                       if (hp->pointBuffer != NULL) {
-                               (void) free((void *) hp->pointBuffer);
-                               /* hp->pointBuffer = NULL; */
-                       }
-               }
-               (void) free((void *) discretes);
-               discretes = (discretestruct *) NULL;
+ENTRYPOINT void
+reshape_discrete(ModeInfo * mi, int width, int height)
+{
+  discretestruct *hp = &discretes[MI_SCREEN(mi)];
+  hp->maxx = width;
+  hp->maxy = height;
+  XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
+}
+
+static void
+free_discrete(ModeInfo * mi)
+{
+       discretestruct *hp = &discretes[MI_SCREEN(mi)];
+
+       if (hp->pointBuffer != NULL) {
+               (void) free((void *) hp->pointBuffer);
+               /* hp->pointBuffer = NULL; */
        }
 }
 
@@ -433,6 +447,20 @@ refresh_discrete(ModeInfo * mi)
        MI_CLEARWINDOW(mi);
 }
 
+ENTRYPOINT Bool
+discrete_handle_event (ModeInfo *mi, XEvent *event)
+{
+  discretestruct *hp = &discretes[MI_SCREEN(mi)];
+  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      hp->count = MI_CYCLES(mi);
+      return True;
+    }
+  return False;
+}
+
+
+
 XSCREENSAVER_MODULE ("Discrete", discrete)
 
 #endif /* MODE_discrete */