projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.krokus.ru/pub/OpenBSD/distfiles/xscreensaver-4.21.tar.gz
[xscreensaver]
/
hacks
/
glx
/
gears.c
diff --git
a/hacks/glx/gears.c
b/hacks/glx/gears.c
index b9a8871ecdfff670609b2c1bba0a59a3a2ea82a9..2f27ba0c3fcc5e98a5201b418801313c33d6769d 100644
(file)
--- a/
hacks/glx/gears.c
+++ b/
hacks/glx/gears.c
@@
-45,7
+45,6
@@
static const char sccsid[] = "@(#)gears.c 4.07 97/11/24 xlockmore";
# define DEFAULTS "*count: 1 \n" \
"*cycles: 2 \n" \
"*delay: 20000 \n" \
# define DEFAULTS "*count: 1 \n" \
"*cycles: 2 \n" \
"*delay: 20000 \n" \
- "*planetary: False \n" \
"*showFPS: False \n" \
"*wireframe: False \n"
# include "xlockmore.h" /* from the xscreensaver distribution */
"*showFPS: False \n" \
"*wireframe: False \n"
# include "xlockmore.h" /* from the xscreensaver distribution */
@@
-919,7
+918,7
@@
gears_handle_event (ModeInfo *mi, XEvent *event)
gearsstruct *gp = &gears[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
gearsstruct *gp = &gears[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
- event->xbutton.button
&
Button1)
+ event->xbutton.button
==
Button1)
{
gp->button_down_p = True;
gltrackball_start (gp->trackball,
{
gp->button_down_p = True;
gltrackball_start (gp->trackball,
@@
-928,11
+927,19
@@
gears_handle_event (ModeInfo *mi, XEvent *event)
return True;
}
else if (event->xany.type == ButtonRelease &&
return True;
}
else if (event->xany.type == ButtonRelease &&
- event->xbutton.button
&
Button1)
+ event->xbutton.button
==
Button1)
{
gp->button_down_p = False;
return True;
}
{
gp->button_down_p = False;
return True;
}
+ else if (event->xany.type == ButtonPress &&
+ (event->xbutton.button == Button4 ||
+ event->xbutton.button == Button5))
+ {
+ gltrackball_mousewheel (gp->trackball, event->xbutton.button, 10,
+ !!event->xbutton.state);
+ return True;
+ }
else if (event->xany.type == MotionNotify &&
gp->button_down_p)
{
else if (event->xany.type == MotionNotify &&
gp->button_down_p)
{