From http://www.jwz.org/xscreensaver/xscreensaver-5.30.tar.gz

[xscreensaver] / hacks / glx / antinspect.c

diff --git a/hacks/glx/antinspect.c b/hacks/glx/antinspect.c
index 179c44f4fa856d1ac8817e84ca46f61e9a735e95..b4581e5695cfc5ea49a2f5bbd668b27fddec544f 100644 (file)
--- a/hacks/glx/antinspect.c
+++ b/hacks/glx/antinspect.c
@@ -601,34 +601,10 @@ ENTRYPOINT Bool antinspect_handle_event (ModeInfo *mi, XEvent *event)
 {
   antinspectstruct *mp = &antinspect[MI_SCREEN(mi)];
   
-  if(event->xany.type == ButtonPress && event->xbutton.button == Button1) {
-       mp->button_down_p = True;
-       gltrackball_start(mp->trackball,
-                                         event->xbutton.x, event->xbutton.y,
-                                         MI_WIDTH (mi), MI_HEIGHT (mi));
-       return True;
-  }
-  else if(event->xany.type == ButtonRelease && 
-                 event->xbutton.button == Button1) {
-       mp->button_down_p = False;
-       return True;
-  }
-  else if (event->xany.type == ButtonPress &&
-           (event->xbutton.button == Button4 ||
-            event->xbutton.button == Button5 ||
-            event->xbutton.button == Button6 ||
-            event->xbutton.button == Button7))
-    {
-      gltrackball_mousewheel (mp->trackball, event->xbutton.button, 5,
-                              !event->xbutton.state);
-      return True;
-    }
-  else if(event->xany.type == MotionNotify && mp->button_down_p) {
-       gltrackball_track (mp->trackball,
-                                          event->xmotion.x, event->xmotion.y,
-                                          MI_WIDTH (mi), MI_HEIGHT (mi));
-       return True;
-  }
+  if (gltrackball_event_handler (event, mp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &mp->button_down_p))
+    return True;
   
   return False;
 }
@@ -645,7 +621,7 @@ ENTRYPOINT void init_antinspect(ModeInfo * mi)
   mp = &antinspect[MI_SCREEN(mi)];
   mp->step = NRAND(90);
   mp->ant_position = NRAND(90);
-  mp->trackball = gltrackball_init ();
+  mp->trackball = gltrackball_init (False);
   
   if ((mp->glx_context = init_GL(mi)) != NULL) {
     reshape_antinspect(mi, MI_WIDTH(mi), MI_HEIGHT(mi));