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

diff --git a/hacks/triangle.c b/hacks/triangle.c
index 3f413432..1a93de25 100644
--- a/hacks/triangle.c
+++ b/hacks/triangle.c
@@ -51,7 +51,6 @@ static const char sccsid[] = "@(#)triangle.c	4.04 97/07/28 xlockmore";
 					"*fpsSolid: true \n" \
 
 # define SMOOTH_COLORS
-# define reshape_triangle 0
 # define triangle_handle_event 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
 #else /* STANDALONE */
@@ -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 */
@@ -345,6 +344,13 @@ draw_triangle (ModeInfo * mi)
 	}
 }
 
+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)
 {