X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Ffadeplot.c;h=093941efd55faf61b10309eb0254757ddbae1287;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=a44bdb3b60d2fa320b334e30b07fccc514add44a;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/fadeplot.c b/hacks/fadeplot.c
index a44bdb3b..093941ef 100644
--- a/hacks/fadeplot.c
+++ b/hacks/fadeplot.c
@@ -35,10 +35,11 @@ static const char sccsid[] = "@(#)fadeplot.c	5.00 2000/11/01 xlockmore";
 					"*cycles: 1500 \n" \
 					"*ncolors: 64 \n" \
 					"*fpsSolid: true \n" \
+					"*ignoreRotation: True \n" \
 
 # define BRIGHT_COLORS
 # define UNIFORM_COLORS
-# define reshape_fadeplot 0
+# define release_fadeplot 0
 # define fadeplot_handle_event 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
 #else /* STANDALONE */
@@ -52,7 +53,7 @@ ENTRYPOINT ModeSpecOpt fadeplot_opts =
 
 #ifdef USE_MODULES
 ModStruct   fadeplot_description =
-{"fadeplot", "init_fadeplot", "draw_fadeplot", "release_fadeplot",
+{"fadeplot", "init_fadeplot", "draw_fadeplot", (char *) NULL,
  "refresh_fadeplot", "init_fadeplot", (char *) NULL, &fadeplot_opts,
  30000, 10, 1500, 1, 64, 0.6, "",
  "Shows a fading plot of sine squared", 0, NULL};
@@ -75,8 +76,9 @@ typedef struct {
 static fadeplotstruct *fadeplots = (fadeplotstruct *) NULL;
 
 static void
-free_fadeplot(fadeplotstruct *fp)
+free_fadeplot(ModeInfo * mi)
 {
+	fadeplotstruct *fp = &fadeplots[MI_SCREEN(mi)];
 	if (fp->pts != NULL) {
 		(void) free((void *) fp->pts);
 		fp->pts = (XPoint *) NULL;
@@ -96,7 +98,7 @@ initSintab(ModeInfo * mi)
 
 	fp->angles = NRAND(950) + 250;
 	if ((fp->stab = (int *) malloc(fp->angles * sizeof (int))) == NULL) {
-		free_fadeplot(fp);
+		free_fadeplot(mi);
 		return False;
 	}
 	for (i = 0; i < fp->angles; i++) {
@@ -111,11 +113,7 @@ init_fadeplot (ModeInfo * mi)
 {
 	fadeplotstruct *fp;
 
-	if (fadeplots == NULL) {
-		if ((fadeplots = (fadeplotstruct *) calloc(MI_NUM_SCREENS(mi),
-					   sizeof (fadeplotstruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, fadeplots, free_fadeplot);
 	fp = &fadeplots[MI_SCREEN(mi)];
 
 	fp->width = MI_WIDTH(mi);
@@ -143,7 +141,7 @@ init_fadeplot (ModeInfo * mi)
 	if (fp->pts == NULL) {
 		if ((fp->pts = (XPoint *) calloc(fp->maxpts, sizeof (XPoint))) ==
 				 NULL) {
-			free_fadeplot(fp);
+			free_fadeplot(mi);
 			return;
 		}
 	}
@@ -202,33 +200,30 @@ draw_fadeplot (ModeInfo * mi)
 	if ((fp->temps % (fp->angles / 2)) == 0) {
 		fp->temps = fp->temps % fp->angles * 5;
 		if ((fp->temps % (fp->angles)) == 0)
-			fp->speed.y = (fp->speed.y++) % 30 + 1;
+			fp->speed.y = (fp->speed.y + 1) % 30 + 1;
 		if ((fp->temps % (fp->angles * 2)) == 0)
 			fp->speed.x = (fp->speed.x) % 20;
 		if ((fp->temps % (fp->angles * 3)) == 0)
-			fp->step.y = (fp->step.y++) % 2 + 1;
+			fp->step.y = (fp->step.y + 1) % 2 + 1;
 
 		MI_CLEARWINDOW(mi);
 	}
 }
 
 ENTRYPOINT void
-refresh_fadeplot (ModeInfo * mi)
+reshape_fadeplot(ModeInfo * mi, int width, int height)
 {
-	MI_CLEARWINDOW(mi);
+	fadeplotstruct *fp = &fadeplots[MI_SCREEN(mi)];
+    fp->width  = width;
+    fp->height = height;
+	fp->min = MAX(MIN(fp->width, fp->height) / 2, 1);
+	fp->factor.x = MAX(fp->width / (2 * fp->min), 1);
+	fp->factor.y = MAX(fp->height / (2 * fp->min), 1);
 }
 
 ENTRYPOINT void
-release_fadeplot (ModeInfo * mi)
+refresh_fadeplot (ModeInfo * mi)
 {
-	if (fadeplots != NULL) {
-		int         screen;
-
-		for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-			free_fadeplot(&fadeplots[screen]);
-		(void) free((void *) fadeplots);
-		fadeplots = (fadeplotstruct *) NULL;
-	}
 }
 
 XSCREENSAVER_MODULE ("FadePlot", fadeplot)