projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.20.tar.gz
[xscreensaver]
/
hacks
/
glx
/
jigglypuff.c
diff --git
a/hacks/glx/jigglypuff.c
b/hacks/glx/jigglypuff.c
index f2e5710c4ca6c805da1c4d3480dd584ee3ec2107..d95fea3f9b25ec5dac837e576a55190c71817278 100644
(file)
--- 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 &&
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 &&
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;
}
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));
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));