X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Ftriangle.c;h=1a93de257dd59fa4aba3d9e6cb363dec9d45e973;hb=6f5482d73adb0165c0130bb47d852644ab0c4869;hp=1fa8c62a478ffb5f6ca8279549daaa9dd98c460b;hpb=96a411663168b0ba5432b407a83be55f3df0c802;p=xscreensaver

diff --git a/hacks/triangle.c b/hacks/triangle.c
index 1fa8c62a..1a93de25 100644
--- a/hacks/triangle.c
+++ b/hacks/triangle.c
@@ -46,19 +46,18 @@ static const char sccsid[] = "@(#)triangle.c	4.04 97/07/28 xlockmore";
  */
 
 #ifdef STANDALONE
-# define PROGCLASS "Triangle"
-# define HACK_INIT init_triangle
-# define HACK_DRAW draw_triangle
-# define triangle_opts xlockmore_opts
 # define DEFAULTS	"*delay: 10000 \n"	\
-					"*ncolors: 128 \n"
+					"*ncolors: 128 \n" \
+					"*fpsSolid: true \n" \
+
 # define SMOOTH_COLORS
+# define triangle_handle_event 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
 #else /* STANDALONE */
 # include "xlock.h"			/* in xlockmore distribution */
 #endif /* STANDALONE */
 
-ModeSpecOpt triangle_opts =
+ENTRYPOINT ModeSpecOpt triangle_opts =
 {0, NULL, 0, NULL, NULL};
 
 #define MAX_STEPS 8
@@ -107,7 +106,7 @@ draw_atriangle(ModeInfo * mi, XPoint * p, int y_0, int y_1, int y_2, double dinv
 	Window      window = MI_WINDOW(mi);
 	GC          gc = MI_GC(mi);
 
-	if (MI_NPIXELS(mi) > 2) {	/* color */
+	if (MI_NCOLORS(mi) > 2) {	/* color */
 		int         dmax, dmin;
 		long        color;
 
@@ -119,11 +118,11 @@ draw_atriangle(ModeInfo * mi, XPoint * p, int y_0, int y_1, int y_2, double dinv
 		if (dmax == 0) {
 			color = BLUE;
 		} else {
-			color = MI_NPIXELS(mi) -
-				(int) ((double) MI_NPIXELS(mi) / M_PI_2 * atan(dinv * (dmax - dmin)));
+			color = MI_NCOLORS(mi) -
+				(int) ((double) MI_NCOLORS(mi) / M_PI_2 * atan(dinv * (dmax - dmin)));
 		}
 
-		XSetForeground(display, gc, MI_PIXEL(mi, color % MI_NPIXELS(mi)));
+		XSetForeground(display, gc, mi->colors[color % MI_NCOLORS(mi)].pixel);
 		XFillPolygon(display, window, gc, p, 3, Convex, CoordModeOrigin);
 	} else {
 		/* mono */
@@ -217,8 +216,8 @@ draw_mesh(ModeInfo * mi, trianglestruct * tp, int d, int count)
 	}
 }
 
-void
-init_triangle(ModeInfo * mi)
+ENTRYPOINT void
+init_triangle (ModeInfo * mi)
 {
 	trianglestruct *tp;
 	short      *tmp;
@@ -277,8 +276,8 @@ init_triangle(ModeInfo * mi)
 		}
 }
 
-void
-draw_triangle(ModeInfo * mi)
+ENTRYPOINT void
+draw_triangle (ModeInfo * mi)
 {
 	trianglestruct *tp = &triangles[MI_SCREEN(mi)];
 	int         d, d2, i, j, delta;
@@ -296,20 +295,18 @@ draw_triangle(ModeInfo * mi)
 #else
 			if (tp->stage == -1)
 			  {
-				XSync(MI_DISPLAY(mi), False);
-				usleep(2000000);
 				XClearWindow(MI_DISPLAY(mi), MI_WINDOW(mi));
-# if 1
 				if (!mono_p)
 				  {
 					free_colors(mi->dpy, mi->xgwa.colormap, mi->colors,
 								mi->npixels);
+                    mi->npixels = 
+                      get_integer_resource (mi->dpy, "ncolors", "Integer");
 					make_smooth_colormap (mi->dpy,
 										  mi->xgwa.visual, mi->xgwa.colormap,
 										  mi->colors, &mi->npixels,
 										  True, &mi->writable_p, True);
 				  }
-# endif /* 0 */
 			  }
 #endif
 		}
@@ -347,7 +344,14 @@ draw_triangle(ModeInfo * mi)
 	}
 }
 
-void
+ENTRYPOINT void
+reshape_triangle(ModeInfo * mi, int width, int height)
+{
+  XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
+  init_triangle (mi);
+}
+
+ENTRYPOINT void
 release_triangle(ModeInfo * mi)
 {
 	if (triangles != NULL) {
@@ -356,8 +360,10 @@ release_triangle(ModeInfo * mi)
 	}
 }
 
-void
-refresh_triangle(ModeInfo * mi)
+ENTRYPOINT void
+refresh_triangle (ModeInfo * mi)
 {
 	/* Do nothing, it will refresh by itself */
 }
+
+XSCREENSAVER_MODULE ("Triangle", triangle)