X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Ftriangle.c;h=e48c0870e6847cfd7a964962ecd0d99f16ef0cad;hb=39809ded547bdbb08207d3e514950425215b4410;hp=9915b36e14335b0b7d00cc7c50981f20785443f6;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/triangle.c b/hacks/triangle.c
index 9915b36e..e48c0870 100644
--- a/hacks/triangle.c
+++ b/hacks/triangle.c
@@ -51,6 +51,8 @@ static const char sccsid[] = "@(#)triangle.c	4.04 97/07/28 xlockmore";
 					"*fpsSolid: true \n" \
 
 # define SMOOTH_COLORS
+# define free_triangle 0
+# define release_triangle 0
 # define reshape_triangle 0
 # define triangle_handle_event 0
 # include "xlockmore.h"		/* in xscreensaver distribution */
@@ -107,7 +109,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 +121,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 */
@@ -224,11 +226,7 @@ init_triangle (ModeInfo * mi)
 	short      *tmp;
 	int         i, dim, one;
 
-	if (triangles == NULL) {
-		if ((triangles = (trianglestruct *) calloc(MI_NUM_SCREENS(mi),
-					   sizeof (trianglestruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, triangles);
 	tp = &triangles[MI_SCREEN(mi)];
 
 	tp->width = MI_WIN_WIDTH(mi);
@@ -299,9 +297,11 @@ draw_triangle (ModeInfo * mi)
 				XClearWindow(MI_DISPLAY(mi), MI_WINDOW(mi));
 				if (!mono_p)
 				  {
-					free_colors(mi->dpy, mi->xgwa.colormap, mi->colors,
+					free_colors(mi->xgwa.screen, mi->xgwa.colormap, mi->colors,
 								mi->npixels);
-					make_smooth_colormap (mi->dpy,
+                    mi->npixels = 
+                      get_integer_resource (mi->dpy, "ncolors", "Integer");
+					make_smooth_colormap (mi->xgwa.screen,
 										  mi->xgwa.visual, mi->xgwa.colormap,
 										  mi->colors, &mi->npixels,
 										  True, &mi->writable_p, True);
@@ -343,19 +343,12 @@ draw_triangle (ModeInfo * mi)
 	}
 }
 
-ENTRYPOINT void
-release_triangle(ModeInfo * mi)
-{
-	if (triangles != NULL) {
-		(void) free((void *) triangles);
-		triangles = NULL;
-	}
-}
-
+#ifndef STANDALONE
 ENTRYPOINT void
 refresh_triangle (ModeInfo * mi)
 {
 	/* Do nothing, it will refresh by itself */
 }
+#endif
 
 XSCREENSAVER_MODULE ("Triangle", triangle)