X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fdiscrete.c;h=9b0cf597f52912bbc19a570706beafa54bbb8f0e;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=db3838ff5fa0be75c73a89ec3ffe20425b09d9ff;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/discrete.c b/hacks/discrete.c
index db3838ff..9b0cf597 100644
--- a/hacks/discrete.c
+++ b/hacks/discrete.c
@@ -33,13 +33,14 @@ 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
 # include "xlockmore.h"		/* in xscreensaver distribution */
 # include "erase.h"
 #else /* STANDALONE */
@@ -260,8 +261,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 +280,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,12 +396,39 @@ 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
+draw_discrete (ModeInfo * mi)
+{
+  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);
+    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);
+    init_discrete(mi);
+  }
+}
+
+
+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));
 }
 
 ENTRYPOINT void
@@ -433,6 +456,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 */