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.22.tar.gz
[xscreensaver]
/
hacks
/
glx
/
sierpinski3d.c
diff --git
a/hacks/glx/sierpinski3d.c
b/hacks/glx/sierpinski3d.c
index 92781504720ccf82ba622a7ec85233fa625ff11c..720948aacd202b831a0367e3295a19266307e555 100644
(file)
--- a/
hacks/glx/sierpinski3d.c
+++ b/
hacks/glx/sierpinski3d.c
@@
-44,10
+44,6
@@
static const char sccsid[] = "@(#)sierpinski3D.c 00.01 99/11/04 xlockmore";
# define DEFAULTS "*delay: 20000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
# define DEFAULTS "*delay: 20000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
- "*maxDepth: " DEF_MAXDEPTH "\n" \
- "*speed: " DEF_SPEED "\n" \
- "*spin: " DEF_SPIN "\n" \
- "*wander: " DEF_WANDER "\n" \
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
@@
-458,7
+454,7
@@
gasket_handle_event (ModeInfo *mi, XEvent *event)
gasketstruct *gp = &gasket[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
gasketstruct *gp = &gasket[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,
@@
-467,11
+463,19
@@
gasket_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)
{