X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fxlockmore.c;h=64907a7b5b9d186fd6717f83a65fa89d0926b02f;hb=6a1da724858673ac40aa13a9612340d8bed8c7b9;hp=540bc264d861321699ba0a648650bcc5be7cb974;hpb=ce3185de9d9705e259f2b60dd4b5509007fa17d4;p=xscreensaver

diff --git a/hacks/xlockmore.c b/hacks/xlockmore.c
index 540bc264..64907a7b 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 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1997, 1998, 2001, 2002
+ *  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,11 +20,15 @@
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
+#include <time.h>
+#include <sys/time.h>
 #include "screenhack.h"
 #include "xlockmoreI.h"
 
 #define countof(x) (sizeof((x))/sizeof(*(x)))
 
+#define MAX_COLORS (1L<<13)
+
 extern ModeSpecOpt xlockmore_opts[];
 extern const char *app_defaults;
 
@@ -61,7 +66,8 @@ pre_merge_options (void)
   /* Add extra args, if they're mentioned in the defaults... */
   {
     char *args[] = { "-count", "-cycles", "-delay", "-ncolors",
-		     "-size", "-wireframe", "-use3d", "-useSHM" };
+		     "-size", "-wireframe", "-use3d", "-useSHM",
+                     "-showFPS" };
     for (j = 0; j < countof(args); j++)
       if (strstr(app_defaults, args[j]+1))
 	{
@@ -101,6 +107,17 @@ pre_merge_options (void)
 	      new->argKind = XrmoptionNoArg;
 	      new->value = "False";
 	    }
+	  else if (!strcmp(new->option, "-showFPS"))
+	    {
+	      new->option = "-fps";
+	      new->argKind = XrmoptionNoArg;
+	      new->value = "True";
+	      new = &options[i++];
+	      new->option = "-no-fps";
+	      new->specifier = options[i-2].specifier;
+	      new->argKind = XrmoptionNoArg;
+	      new->value = "False";
+	    }
 	  else
 	    {
 	      new->argKind = XrmoptionSepArg;
@@ -140,8 +157,11 @@ pre_merge_options (void)
   for (j = 0; j < xlockmore_opts->numvarsdesc; j++)
     {
       const char *def = xlockmore_opts->vars[j].def;
-      if (!def) def = "False";
-      if (def == ((char*) 1)) def = "True";
+
+      if (!def) abort();
+      if (!*def) abort();
+      if (strlen(def) > 1000) abort();
+
       s = (char *) malloc (strlen (xlockmore_opts->vars[j].name) +
 			   strlen (def) + 10);
       strcpy (s, "*");
@@ -192,6 +212,30 @@ xlockmore_read_resources (void)
 }
 
 
+static void
+xlockmore_handle_events (ModeInfo *mi, 
+                         void (*reshape) (ModeInfo *, int, int),
+                         Bool (*hook) (ModeInfo *, XEvent *))
+{
+  while (XPending (mi->dpy))
+    {
+      XEvent event;
+      XNextEvent (mi->dpy, &event);
+      if (reshape && event.xany.type == ConfigureNotify)
+        {
+          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);
+        }
+    }
+}
+
 
 void 
 xlockmore_screenhack (Display *dpy, Window window,
@@ -199,8 +243,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;
@@ -209,11 +256,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;
@@ -246,8 +304,8 @@ xlockmore_screenhack (Display *dpy, Window window,
       mi.npixels = get_integer_resource ("ncolors", "Integer");
       if (mi.npixels <= 0)
 	mi.npixels = 64;
-      else if (mi.npixels > 256)
-	mi.npixels = 256;
+      else if (mi.npixels > MAX_COLORS)
+	mi.npixels = MAX_COLORS;
 
       mi.colors = (XColor *) calloc (mi.npixels, sizeof (*mi.colors));
 
@@ -271,7 +329,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++)
@@ -303,7 +360,8 @@ 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");
 #endif /* !HAVE_XSHM_EXTENSION */
@@ -325,6 +383,7 @@ xlockmore_screenhack (Display *dpy, Window window,
   do {
     hack_draw (&mi);
     XSync(dpy, False);
+    xlockmore_handle_events (&mi, hack_reshape, hack_handle_events);
     if (mi.pause)
       usleep(mi.pause);
     mi.pause = orig_pause;