X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Ffadeplot.c;h=93f471969e409135bd5cb6788e6f544b748ac62b;hb=39809ded547bdbb08207d3e514950425215b4410;hp=ad48b7100f2e10892aacd52b759273c6317c9191;hpb=a94197e76a5dea5cb60542840809d6c20d0abbf3;p=xscreensaver

diff --git a/hacks/fadeplot.c b/hacks/fadeplot.c
index ad48b710..93f47196 100644
--- a/hacks/fadeplot.c
+++ b/hacks/fadeplot.c
@@ -1,9 +1,8 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* fadeplot --- a fading plot of sine squared */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)fadeplot.c	5.00 2000/11/01 xlockmore";
-
 #endif
 
 /*-
@@ -30,32 +29,32 @@ static const char sccsid[] = "@(#)fadeplot.c	5.00 2000/11/01 xlockmore";
  */
 
 #ifdef STANDALONE
-#define MODE_fadeplot
-#define PROGCLASS "Fadeplot"
-#define HACK_INIT init_fadeplot
-#define HACK_DRAW draw_fadeplot
-#define fadeplot_opts xlockmore_opts
-#define DEFAULTS "*delay: 30000 \n" \
- "*count: 10 \n" \
- "*cycles: 1500 \n" \
- "*ncolors: 64 \n"
-#define BRIGHT_COLORS
-#define UNIFORM_COLORS
-#include "xlockmore.h"		/* in xscreensaver distribution */
+# define MODE_fadeplot
+# define DEFAULTS	"*delay: 30000 \n" \
+					"*count: 10 \n" \
+					"*cycles: 1500 \n" \
+					"*ncolors: 64 \n" \
+					"*fpsSolid: true \n" \
+					"*ignoreRotation: True \n" \
+
+# define BRIGHT_COLORS
+# define UNIFORM_COLORS
+# define release_fadeplot 0
+# define fadeplot_handle_event 0
+# include "xlockmore.h"		/* in xscreensaver distribution */
 #else /* STANDALONE */
-#include "xlock.h"		/* in xlockmore distribution */
-
+# include "xlock.h"		/* in xlockmore distribution */
 #endif /* STANDALONE */
 
 #ifdef MODE_fadeplot
 
-ModeSpecOpt fadeplot_opts =
+ENTRYPOINT ModeSpecOpt fadeplot_opts =
 {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL};
 
 #ifdef USE_MODULES
 ModStruct   fadeplot_description =
-{"fadeplot", "init_fadeplot", "draw_fadeplot", "release_fadeplot",
- "refresh_fadeplot", "init_fadeplot", (char *) NULL, &fadeplot_opts,
+{"fadeplot", "init_fadeplot", "draw_fadeplot", (char *) NULL,
+ "refresh_fadeplot", "init_fadeplot", "free_fadeplot", &fadeplot_opts,
  30000, 10, 1500, 1, 64, 0.6, "",
  "Shows a fading plot of sine squared", 0, NULL};
 
@@ -76,9 +75,10 @@ typedef struct {
 
 static fadeplotstruct *fadeplots = (fadeplotstruct *) NULL;
 
-static void
-free_fadeplot(fadeplotstruct *fp)
+ENTRYPOINT void
+free_fadeplot(ModeInfo * mi)
 {
+	fadeplotstruct *fp = &fadeplots[MI_SCREEN(mi)];
 	if (fp->pts != NULL) {
 		(void) free((void *) fp->pts);
 		fp->pts = (XPoint *) NULL;
@@ -98,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++) {
@@ -108,16 +108,12 @@ initSintab(ModeInfo * mi)
 	return True;
 }
 
-void
-init_fadeplot(ModeInfo * mi)
+ENTRYPOINT void
+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);
 	fp = &fadeplots[MI_SCREEN(mi)];
 
 	fp->width = MI_WIDTH(mi);
@@ -145,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;
 		}
 	}
@@ -159,8 +155,8 @@ init_fadeplot(ModeInfo * mi)
 	MI_CLEARWINDOW(mi);
 }
 
-void
-draw_fadeplot(ModeInfo * mi)
+ENTRYPOINT void
+draw_fadeplot (ModeInfo * mi)
 {
 	Display    *display = MI_DISPLAY(mi);
 	Window      window = MI_WINDOW(mi);
@@ -198,39 +194,40 @@ draw_fadeplot(ModeInfo * mi)
 		}
 	}
 	XDrawPoints(display, window, gc, fp->pts, temp, CoordModeOrigin);
-	XFlush(display);
 	fp->st.x = (fp->st.x + fp->speed.x) % fp->angles;
 	fp->st.y = (fp->st.y + fp->speed.y) % fp->angles;
 	fp->temps++;
 	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);
 	}
 }
-void
-refresh_fadeplot(ModeInfo * mi)
+
+ENTRYPOINT void
+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);
 }
 
-void
-release_fadeplot(ModeInfo * mi)
+#ifndef STANDALONE
+ENTRYPOINT void
+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;
-	}
 }
+#endif
+
+XSCREENSAVER_MODULE ("FadePlot", fadeplot)
 
 #endif /* MODE_fadeplot */