From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz

[xscreensaver] / hacks / triangle.c

diff --git a/hacks/triangle.c b/hacks/triangle.c
index 9915b36e14335b0b7d00cc7c50981f20785443f6..d73c1226f547bbc040b10391e5c7af967971d727 100644 (file)
--- a/hacks/triangle.c
+++ b/hacks/triangle.c
@@ -51,8 +51,7 @@ 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
+# define release_triangle 0
 # include "xlockmore.h"                /* in xscreensaver distribution */
 #else /* STANDALONE */
 # include "xlock.h"                    /* in xlockmore distribution */
@@ -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 */
@@ -224,11 +223,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, 0);
        tp = &triangles[MI_SCREEN(mi)];
 
        tp->width = MI_WIN_WIDTH(mi);
@@ -299,9 +294,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);
@@ -344,12 +341,10 @@ draw_triangle (ModeInfo * mi)
 }
 
 ENTRYPOINT void
-release_triangle(ModeInfo * mi)
+reshape_triangle(ModeInfo * mi, int width, int height)
 {
-       if (triangles != NULL) {
-               (void) free((void *) triangles);
-               triangles = NULL;
-       }
+  XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
+  init_triangle (mi);
 }
 
 ENTRYPOINT void
@@ -358,4 +353,16 @@ refresh_triangle (ModeInfo * mi)
        /* Do nothing, it will refresh by itself */
 }
 
+ENTRYPOINT Bool
+triangle_handle_event (ModeInfo *mi, XEvent *event)
+{
+  if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      reshape_triangle (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+      return True;
+    }
+  return False;
+}
+
+
 XSCREENSAVER_MODULE ("Triangle", triangle)