X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Ftriangle.c;h=e8400d42c2be356ceb59c70cfb9ffee84b9fd441;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=48a8b20d67c86090fe53a07d2e1509a78a7d4c9b;hpb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;p=xscreensaver

diff --git a/hacks/triangle.c b/hacks/triangle.c
index 48a8b20d..e8400d42 100644
--- a/hacks/triangle.c
+++ b/hacks/triangle.c
@@ -51,8 +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 */
 # include "xlock.h"			/* in xlockmore distribution */
@@ -299,11 +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);
                     mi->npixels = 
                       get_integer_resource (mi->dpy, "ncolors", "Integer");
-					make_smooth_colormap (mi->dpy,
+					make_smooth_colormap (mi->xgwa.screen,
 										  mi->xgwa.visual, mi->xgwa.colormap,
 										  mi->colors, &mi->npixels,
 										  True, &mi->writable_p, True);
@@ -345,6 +343,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)
 {
@@ -360,4 +365,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)