X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fgleidescope.c;h=9ea8035306a76519803cd30377599252127d9380;hp=8abd7338532f73d75286947cf76125ba4fa70ba0;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hpb=dba664f31aa87285db4d76cf8c5e66335299703a

diff --git a/hacks/glx/gleidescope.c b/hacks/glx/gleidescope.c
index 8abd7338..9ea80353 100644
--- a/hacks/glx/gleidescope.c
+++ b/hacks/glx/gleidescope.c
@@ -471,10 +471,8 @@ gleidescope_handle_event(ModeInfo *mi, XEvent *event)
 	printf("event:%d\n", event->xany.type);
 	printf("button:%d\n", event->xbutton.button);
 	*/
-	switch(event->xany.type)
-	{
-		case ButtonPress:
-
+	if (event->xany.type == ButtonPress)
+      {
 			if (event->xbutton.button == Button1 ||
                 event->xbutton.button == Button3)
 			{
@@ -498,10 +496,8 @@ gleidescope_handle_event(ModeInfo *mi, XEvent *event)
 				return True;
 			}
 #endif
-			break;
-
-		case ButtonRelease:
-
+            } else if (event->xany.type == ButtonRelease)
+      {
 			if (event->xbutton.button == Button1 ||
                 event->xbutton.button == Button3)
 			{
@@ -509,10 +505,8 @@ gleidescope_handle_event(ModeInfo *mi, XEvent *event)
 				gp->button_down_p = False;
 				return True;
 			}
-			break;
-
-		case MotionNotify:
-
+            } else if (event->xany.type == MotionNotify)
+      {
 			if (gp->button_down_p)
 			{
 				/* update mouse position */
@@ -523,8 +517,13 @@ gleidescope_handle_event(ModeInfo *mi, XEvent *event)
 
 				return True;
 			}
-			break;
-	}
+      }
+  else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      gp->start_time = -1;
+      gp->fade = 0;
+      return True;
+    }
 
 	return False;
 }