X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fdrift.c;h=e88986b234fd6c2c8022130f630bb8214b5ca1de;hb=39809ded547bdbb08207d3e514950425215b4410;hp=2fab3cc80f1f1878679c96e7a65d0cf5bd39f815;hpb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;p=xscreensaver

diff --git a/hacks/drift.c b/hacks/drift.c
index 2fab3cc8..e88986b2 100644
--- a/hacks/drift.c
+++ b/hacks/drift.c
@@ -39,8 +39,10 @@ static const char sccsid[] = "@(#)drift.c	5.00 2000/11/01 xlockmore";
 				  "*ignoreRotation: True \n" \
 
 # define SMOOTH_COLORS
+# define release_drift 0
+# define reshape_drift 0
+# define drift_handle_event 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
-# include "erase.h"
 #else /* STANDALONE */
 # define ENTRYPOINT /**/
 # include "xlock.h"		/* in xlockmore distribution */
@@ -81,8 +83,8 @@ ENTRYPOINT ModeSpecOpt drift_opts =
 
 #ifdef USE_MODULES
 ModStruct   drift_description =
-{"drift", "init_drift", "draw_drift", "release_drift",
- "refresh_drift", "init_drift", (char *) NULL, &drift_opts,
+{"drift", "init_drift", "draw_drift", (char *) NULL,
+ "refresh_drift", "init_drift", "free_drift", &drift_opts,
  10000, 30, 1, 1, 64, 1.0, "",
  "Shows cosmic drifting flame fractals", 0, NULL};
 
@@ -133,10 +135,7 @@ typedef struct {
 	long        saved_random_bits;
 	int         nbits;
 
-#ifdef STANDALONE
   int erase_countdown;
-  eraser_state *eraser;
-#endif
 } driftstruct;
 
 static driftstruct *drifts = (driftstruct *) NULL;
@@ -241,9 +240,7 @@ initmode(ModeInfo * mi, int mode)
 	}
 	dp->fractal_len = (dp->fractal_len * MI_COUNT(mi)) / 20;
 
-#ifndef STANDALONE
 	MI_CLEARWINDOW(mi);
-#endif
 }
 
 static void
@@ -268,9 +265,10 @@ pick_df_coefs(ModeInfo * mi)
 	}
 }
 
-static void
-free_drift(driftstruct *dp)
+ENTRYPOINT void
+free_drift(ModeInfo * mi)
 {
+	driftstruct *dp = &drifts[MI_SCREEN(mi)];
 	if (dp->ncpoints != NULL) {
 		(void) free((void *) dp->ncpoints);
 		dp->ncpoints = (int *) NULL;
@@ -295,14 +293,14 @@ initfractal(ModeInfo * mi)
 	if (!dp->ncpoints) {
 		if ((dp->ncpoints = (int *) malloc(sizeof (int) * MI_NCOLORS(mi))) ==
 			NULL) {
-			free_drift(dp);
+			free_drift(mi);
 			return;
 		}
 	}
 	if (!dp->cpts) {
 		if ((dp->cpts = (XPoint *) malloc(MAXBATCH2 * sizeof (XPoint) *
 			 MI_NCOLORS(mi))) == NULL) {
-			free_drift(dp);
+			free_drift(mi);
 			return;
 		}
 	}
@@ -348,11 +346,7 @@ init_drift(ModeInfo * mi)
 {
 	driftstruct *dp;
 
-	if (drifts == NULL) {
-		if ((drifts = (driftstruct *) calloc(MI_NUM_SCREENS(mi),
-					      sizeof (driftstruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, drifts);
 	dp = &drifts[MI_SCREEN(mi)];
 
 	dp->width = MI_WIDTH(mi);
@@ -623,14 +617,11 @@ draw_drift(ModeInfo * mi)
 
     if (dp->erase_countdown) {
       if (!--dp->erase_countdown) {
-        dp->eraser = erase_window (MI_DISPLAY(mi), MI_WINDOW(mi), dp->eraser);
+        initmode(mi, frandom(dp, 2));
+        initfractal(mi);
       }
       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;
@@ -640,10 +631,8 @@ draw_drift(ModeInfo * mi)
 		if (dp->total_points++ > dp->fractal_len) {
 			draw_flush(mi, dp, window);
 			if (0 == --dp->nfractals) {
-#ifdef STANDALONE
               dp->erase_countdown = 4 * 1000000 / MI_PAUSE(mi);
-#endif /* STANDALONE */
-				initmode(mi, frandom(dp, 2));
+				return;
 			}
 			initfractal(mi);
 		}
@@ -670,43 +659,13 @@ draw_drift(ModeInfo * mi)
 	}
 }
 
-ENTRYPOINT void
-release_drift(ModeInfo * mi)
-{
-	if (drifts != NULL) {
-		int         screen;
-
-		for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-			free_drift(&drifts[screen]);
-		(void) free((void *) drifts);
-		drifts = (driftstruct *) NULL;
-	}
-}
-
-ENTRYPOINT void
-reshape_drift(ModeInfo * mi, int width, int height)
-{
-  MI_CLEARWINDOW(mi);
-  init_drift (mi);
-}
-
+#ifndef STANDALONE
 ENTRYPOINT void
 refresh_drift(ModeInfo * mi)
 {
 	MI_CLEARWINDOW(mi);
 }
-
-ENTRYPOINT Bool
-drift_handle_event (ModeInfo *mi, XEvent *event)
-{
-  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
-    {
-      reshape_drift (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
-      return True;
-    }
-  return False;
-}
-
+#endif
 
 XSCREENSAVER_MODULE ("Drift", drift)