X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fxlockmore.c;h=7624b4875c904a16b5c97a1ac554365f9959f9d4;hp=6ca7164f6c79ea73ad7689f5a2c9dae8156c00d9;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=3d9140a05b5272fed0883a0af0a71e30ef44d47f

diff --git a/hacks/xlockmore.c b/hacks/xlockmore.c
index 6ca7164f..7624b487 100644
--- a/hacks/xlockmore.c
+++ b/hacks/xlockmore.c
@@ -1,5 +1,6 @@
 /* xlockmore.c --- xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997, 1998, 2001 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1997, 1998, 2001, 2002, 2004
+ *  Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -19,13 +20,17 @@
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
+#include <time.h>
+#include <sys/time.h>
 #include "screenhack.h"
 #include "xlockmoreI.h"
+#include <X11/Intrinsic.h>
 
 #define countof(x) (sizeof((x))/sizeof(*(x)))
 
 #define MAX_COLORS (1L<<13)
 
+extern XtAppContext app;
 extern ModeSpecOpt xlockmore_opts[];
 extern const char *app_defaults;
 
@@ -211,8 +216,12 @@ xlockmore_read_resources (void)
 
 static void
 xlockmore_handle_events (ModeInfo *mi, 
-                         void (*reshape) (ModeInfo *, int, int))
+                         void (*reshape) (ModeInfo *, int, int),
+                         Bool (*hook) (ModeInfo *, XEvent *))
 {
+  if (XtAppPending (app) & (XtIMTimer|XtIMAlternateInput))
+    XtAppProcessEvent (app, XtIMTimer|XtIMAlternateInput);
+
   while (XPending (mi->dpy))
     {
       XEvent event;
@@ -222,6 +231,9 @@ xlockmore_handle_events (ModeInfo *mi,
           XGetWindowAttributes (mi->dpy, mi->window, &mi->xgwa);
           reshape (mi, mi->xgwa.width, mi->xgwa.height);
         }
+      else if (hook && hook (mi, &event))
+        {
+        }
       else
         {
           screenhack_handle_event (mi->dpy, &event);
@@ -236,9 +248,11 @@ xlockmore_screenhack (Display *dpy, Window window,
 		      Bool want_uniform_colors,
 		      Bool want_smooth_colors,
 		      Bool want_bright_colors,
+                      unsigned long event_mask,
 		      void (*hack_init) (ModeInfo *),
 		      void (*hack_draw) (ModeInfo *),
 		      void (*hack_reshape) (ModeInfo *, int, int),
+		      Bool (*hack_handle_events) (ModeInfo *, XEvent *),
 		      void (*hack_free) (ModeInfo *))
 {
   ModeInfo mi;
@@ -247,11 +261,22 @@ xlockmore_screenhack (Display *dpy, Window window,
   int i;
   time_t start, now;
   int orig_pause;
+  Bool root_p;
 
   memset(&mi, 0, sizeof(mi));
   mi.dpy = dpy;
   mi.window = window;
   XGetWindowAttributes (dpy, window, &mi.xgwa);
+  root_p = (window == RootWindowOfScreen (mi.xgwa.screen));
+
+  /* If this is the root window, don't allow ButtonPress to be selected.
+     Bad Things Happen. */
+  if (root_p)
+    event_mask &= (~(ButtonPressMask|ButtonReleaseMask));
+
+  /* If this hack wants additional events, select them. */
+  if (event_mask && ! (mi.xgwa.your_event_mask & event_mask))
+    XSelectInput (dpy, window, (mi.xgwa.your_event_mask | event_mask));
 
   color.flags = DoRed|DoGreen|DoBlue;
   color.red = color.green = color.blue = 0;
@@ -309,7 +334,6 @@ xlockmore_screenhack (Display *dpy, Window window,
 	goto MONO;
       else
 	{
-	  int i;
 	  mi.pixels = (unsigned long *)
 	    calloc (mi.npixels, sizeof (*mi.pixels));
 	  for (i = 0; i < mi.npixels; i++)
@@ -341,7 +365,7 @@ xlockmore_screenhack (Display *dpy, Window window,
 					     mi.xgwa.colormap);
 
   mi.wireframe_p = get_boolean_resource ("wireframe", "Boolean");
-  mi.root_p = (window == RootWindowOfScreen (mi.xgwa.screen));
+  mi.root_p = root_p;
   mi.fps_p = get_boolean_resource ("showFPS", "Boolean");
 #ifdef HAVE_XSHM_EXTENSION
   mi.use_shm = get_boolean_resource ("useSHM", "Boolean");
@@ -364,7 +388,7 @@ xlockmore_screenhack (Display *dpy, Window window,
   do {
     hack_draw (&mi);
     XSync(dpy, False);
-    xlockmore_handle_events (&mi, hack_reshape);
+    xlockmore_handle_events (&mi, hack_reshape, hack_handle_events);
     if (mi.pause)
       usleep(mi.pause);
     mi.pause = orig_pause;