X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fmoebius.c;h=d05e8c65e3149167c41c11316eff4e921f518e34;hp=9052f4bcc6c3e83ff08af3e20484ae960bd5ad5e;hb=2d04c4f22466851aedb6ed0f2919d148f726b889;hpb=bc7b7a8eb122206d239ec0e693676bcce31be1aa diff --git a/hacks/glx/moebius.c b/hacks/glx/moebius.c index 9052f4bc..d05e8c65 100644 --- a/hacks/glx/moebius.c +++ b/hacks/glx/moebius.c @@ -643,7 +643,7 @@ moebius_handle_event (ModeInfo *mi, XEvent *event) moebiusstruct *mp = &moebius[MI_SCREEN(mi)]; if (event->xany.type == ButtonPress && - event->xbutton.button & Button1) + event->xbutton.button == Button1) { mp->button_down_p = True; gltrackball_start (mp->trackball, @@ -652,11 +652,19 @@ moebius_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, 10, + !!event->xbutton.state); + return True; + } else if (event->xany.type == MotionNotify && mp->button_down_p) {