X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fdrift.c;h=711bc09e96991348213b0b49e5af500fcd4e42b8;hb=6f5482d73adb0165c0130bb47d852644ab0c4869;hp=38cdf7b70d8a70b809c946237a2153c852fd02aa;hpb=96a411663168b0ba5432b407a83be55f3df0c802;p=xscreensaver

diff --git a/hacks/drift.c b/hacks/drift.c
index 38cdf7b7..711bc09e 100644
--- a/hacks/drift.c
+++ b/hacks/drift.c
@@ -31,20 +31,19 @@ static const char sccsid[] = "@(#)drift.c	5.00 2000/11/01 xlockmore";
  */
 
 #ifdef STANDALONE
-#define MODE_drift
-#define PROGCLASS "Drift"
-#define HACK_INIT init_drift
-#define HACK_DRAW draw_drift
-#define drift_opts xlockmore_opts
-#define DEFAULTS "*delay: 10000 \n" \
- "*count: 30 \n" \
- "*ncolors: 200 \n"
-#define SMOOTH_COLORS
-#include "xlockmore.h"		/* in xscreensaver distribution */
-#include "erase.h"
+# define MODE_drift
+# define DEFAULTS "*delay: 10000 \n" \
+				  "*count: 30 \n" \
+				  "*ncolors: 200 \n" \
+				  "*fpsSolid: true \n" \
+
+# define SMOOTH_COLORS
+# define drift_handle_event 0
+# include "xlockmore.h"		/* in xscreensaver distribution */
+# include "erase.h"
 #else /* STANDALONE */
-#include "xlock.h"		/* in xlockmore distribution */
-
+# define ENTRYPOINT /**/
+# include "xlock.h"		/* in xlockmore distribution */
 #endif /* STANDALONE */
 
 #ifdef MODE_drift
@@ -61,23 +60,23 @@ static Bool liss;
 
 static XrmOptionDescRec opts[] =
 {
-	{(char *) "-grow", (char *) ".drift.grow", XrmoptionNoArg, (caddr_t) "on"},
-	{(char *) "+grow", (char *) ".drift.grow", XrmoptionNoArg, (caddr_t) "off"},
-	{(char *) "-liss", (char *) ".drift.trail", XrmoptionNoArg, (caddr_t) "on"},
-	{(char *) "+liss", (char *) ".drift.trail", XrmoptionNoArg, (caddr_t) "off"}
+	{"-grow", ".drift.grow", XrmoptionNoArg, "on"},
+	{"+grow", ".drift.grow", XrmoptionNoArg, "off"},
+	{"-liss", ".drift.trail", XrmoptionNoArg, "on"},
+	{"+liss", ".drift.trail", XrmoptionNoArg, "off"}
 };
 static argtype vars[] =
 {
-	{(caddr_t *) & grow, (char *) "grow", (char *) "Grow", (char *) DEF_GROW, t_Bool},
-	{(caddr_t *) & liss, (char *) "liss", (char *) "Liss", (char *) DEF_LISS, t_Bool}
+	{&grow, "grow", "Grow", DEF_GROW, t_Bool},
+	{&liss, "trail", "Trail", DEF_LISS, t_Bool}
 };
 static OptionStruct desc[] =
 {
-	{(char *) "-/+grow", (char *) "turn on/off growing fractals, else they are animated"},
-	{(char *) "-/+liss", (char *) "turn on/off using lissojous figures to get points"}
+	{"-/+grow", "turn on/off growing fractals, else they are animated"},
+	{"-/+liss", "turn on/off using lissojous figures to get points"}
 };
 
-ModeSpecOpt drift_opts =
+ENTRYPOINT ModeSpecOpt drift_opts =
 {sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc};
 
 #ifdef USE_MODULES
@@ -133,6 +132,11 @@ typedef struct {
 	short       lasthalf;
 	long        saved_random_bits;
 	int         nbits;
+
+#ifdef STANDALONE
+  int erase_countdown;
+  eraser_state *eraser;
+#endif
 } driftstruct;
 
 static driftstruct *drifts = (driftstruct *) NULL;
@@ -237,7 +241,9 @@ initmode(ModeInfo * mi, int mode)
 	}
 	dp->fractal_len = (dp->fractal_len * MI_COUNT(mi)) / 20;
 
+#ifndef STANDALONE
 	MI_CLEARWINDOW(mi);
+#endif
 }
 
 static void
@@ -337,7 +343,7 @@ initfractal(ModeInfo * mi)
 }
 
 
-void
+ENTRYPOINT void
 init_drift(ModeInfo * mi)
 {
 	driftstruct *dp;
@@ -603,7 +609,7 @@ draw_flush(ModeInfo * mi, driftstruct * dp, Drawable d)
 }
 
 
-void
+ENTRYPOINT void
 draw_drift(ModeInfo * mi)
 {
 	Window      window = MI_WINDOW(mi);
@@ -615,6 +621,17 @@ draw_drift(ModeInfo * mi)
 	if (dp->ncpoints == NULL)
 		return;
 
+    if (dp->erase_countdown) {
+      if (!--dp->erase_countdown) {
+        dp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), dp->eraser);
+      }
+      return;
+    }
+    if (dp->eraser) {
+      dp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), dp->eraser);
+      return;
+    }
+
 	MI_IS_DRAWN(mi) = True;
 	dp->timer = 3000;
 	while (dp->timer) {
@@ -624,9 +641,7 @@ draw_drift(ModeInfo * mi)
 			draw_flush(mi, dp, window);
 			if (0 == --dp->nfractals) {
 #ifdef STANDALONE
-			  XSync(MI_DISPLAY(mi), False);
-			  sleep(4); /* #### make settable */
-			  erase_full_window(MI_DISPLAY(mi), MI_WINDOW(mi));
+              dp->erase_countdown = 4 * 1000000 / MI_PAUSE(mi);
 #endif /* STANDALONE */
 				initmode(mi, frandom(dp, 2));
 			}
@@ -655,7 +670,7 @@ draw_drift(ModeInfo * mi)
 	}
 }
 
-void
+ENTRYPOINT void
 release_drift(ModeInfo * mi)
 {
 	if (drifts != NULL) {
@@ -668,10 +683,19 @@ release_drift(ModeInfo * mi)
 	}
 }
 
-void
+ENTRYPOINT void
+reshape_drift(ModeInfo * mi, int width, int height)
+{
+  MI_CLEARWINDOW(mi);
+  init_drift (mi);
+}
+
+ENTRYPOINT void
 refresh_drift(ModeInfo * mi)
 {
 	MI_CLEARWINDOW(mi);
 }
 
+XSCREENSAVER_MODULE ("Drift", drift)
+
 #endif /* MODE_drift */