http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.20.tar.gz

[xscreensaver] / hacks / glx / cubestorm.c

diff --git a/hacks/glx/cubestorm.c b/hacks/glx/cubestorm.c
index e6801b9a47bf1589fa57494fa1b3523de3135c60..e4c879ba7988bf3aef341d519585228956518aa2 100644 (file)
--- a/hacks/glx/cubestorm.c
+++ b/hacks/glx/cubestorm.c
@@ -196,7 +196,7 @@ cube_handle_event (ModeInfo *mi, XEvent *event)
   cube_configuration *bp = &bps[MI_SCREEN(mi)];
 
   if (event->xany.type == ButtonPress &&
-      event->xbutton.button & Button1)
+      event->xbutton.button == Button1)
     {
       bp->button_down_p = True;
       gltrackball_start (bp->trackball,
@@ -205,11 +205,19 @@ cube_handle_event (ModeInfo *mi, XEvent *event)
       return True;
     }
   else if (event->xany.type == ButtonRelease &&
-           event->xbutton.button & Button1)
+           event->xbutton.button == Button1)
     {
       bp->button_down_p = False;
       return True;
     }
+  else if (event->xany.type == ButtonPress &&
+           (event->xbutton.button == Button4 ||
+            event->xbutton.button == Button5))
+    {
+      gltrackball_mousewheel (bp->trackball, event->xbutton.button, 10,
+                              !!event->xbutton.state);
+      return True;
+    }
   else if (event->xany.type == MotionNotify &&
            bp->button_down_p)
     {