X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fantinspect.c;h=3f3dc9ebcd5feff65b0f07b43d3a382c58e17593;hp=777ddbecfca55dfccfb14007e5f0e58aca22b568;hb=2d04c4f22466851aedb6ed0f2919d148f726b889;hpb=bc7b7a8eb122206d239ec0e693676bcce31be1aa diff --git a/hacks/glx/antinspect.c b/hacks/glx/antinspect.c index 777ddbec..3f3dc9eb 100644 --- a/hacks/glx/antinspect.c +++ b/hacks/glx/antinspect.c @@ -555,7 +555,7 @@ void release_antinspect(ModeInfo * mi) { Bool antinspect_handle_event (ModeInfo *mi, XEvent *event) { antinspectstruct *mp = &antinspect[MI_SCREEN(mi)]; - if(event->xany.type == ButtonPress && event->xbutton.button & Button1) { + if(event->xany.type == ButtonPress && event->xbutton.button == Button1) { mp->button_down_p = True; gltrackball_start(mp->trackball, event->xbutton.x, event->xbutton.y, @@ -563,10 +563,18 @@ Bool antinspect_handle_event (ModeInfo *mi, XEvent *event) { return True; } else if(event->xany.type == ButtonRelease && - event->xbutton.button & Button1) { + 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)) + { + 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,