X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fjigglypuff.c;h=d95fea3f9b25ec5dac837e576a55190c71817278;hp=f2e5710c4ca6c805da1c4d3480dd584ee3ec2107;hb=2d04c4f22466851aedb6ed0f2919d148f726b889;hpb=bc7b7a8eb122206d239ec0e693676bcce31be1aa

diff --git a/hacks/glx/jigglypuff.c b/hacks/glx/jigglypuff.c
index f2e5710c..d95fea3f 100644
--- a/hacks/glx/jigglypuff.c
+++ b/hacks/glx/jigglypuff.c
@@ -931,17 +931,25 @@ Bool jigglypuff_handle_event(ModeInfo *mi, XEvent *event)
     jigglystruct *js = &jss[MI_SCREEN(mi)];
     
     if(event->xany.type == ButtonPress &&
-       event->xbutton.button & Button1) {
+       event->xbutton.button == Button1) {
 	js->button_down = 1;
 	gltrackball_start(js->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) {
+	    event->xbutton.button == Button1) {
 	js->button_down = 0;
 	return True;
     }
+  else if (event->xany.type == ButtonPress &&
+           (event->xbutton.button == Button4 ||
+            event->xbutton.button == Button5))
+    {
+      gltrackball_mousewheel (js->trackball, event->xbutton.button, 10,
+                              !!event->xbutton.state);
+      return True;
+    }
     else if(event->xany.type == MotionNotify && js->button_down) {
 	gltrackball_track(js->trackball, event->xmotion.x, event->xmotion.y,
 			  MI_WIDTH(mi), MI_HEIGHT(mi));