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 1fa8c62a478ffb5f6ca8279549daaa9dd98c460b..d73c1226f547bbc040b10391e5c7af967971d727 100644 (file)
--- 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 release_triangle 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,18 +216,14 @@ 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;
        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);
@@ -277,8 +272,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 +291,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,
+                                       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);
                                  }
-# endif /* 0 */
                          }
 #endif
                }
@@ -347,17 +340,29 @@ draw_triangle(ModeInfo * mi)
        }
 }
 
-void
-release_triangle(ModeInfo * mi)
+ENTRYPOINT void
+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);
 }
 
-void
-refresh_triangle(ModeInfo * mi)
+ENTRYPOINT void
+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)