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
/
glblur.c
diff --git
a/hacks/glx/glblur.c
b/hacks/glx/glblur.c
index 47edc52a07c109894236cf0bfe7a2033f34276ee..29e6f23d3cc69f4ba0bf12e3cbf66f2e5e8e6017 100644
(file)
--- a/
hacks/glx/glblur.c
+++ b/
hacks/glx/glblur.c
@@
-1,5
+1,5
@@
/* glblur --- radial blur using GL textures
/* glblur --- radial blur using GL textures
- * Copyright (c) 2002 Jamie Zawinski <jwz@jwz.org>
+ * Copyright (c) 2002
-2004
Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-42,9
+42,6
@@
extern XtAppContext app;
"*showFPS: False \n" \
"*fpsSolid: True \n" \
"*wireframe: False \n" \
"*showFPS: False \n" \
"*fpsSolid: True \n" \
"*wireframe: False \n" \
- "*spin: " DEF_SPIN "\n" \
- "*wander: " DEF_WANDER "\n" \
- "*blurSize: " DEF_BLURSIZE "\n" \
#undef countof
#undef countof
@@
-363,7
+360,7
@@
glblur_handle_event (ModeInfo *mi, XEvent *event)
glblur_configuration *bp = &bps[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
glblur_configuration *bp = &bps[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
- event->xbutton.button
&
Button1)
+ event->xbutton.button
==
Button1)
{
bp->button_down_p = True;
gltrackball_start (bp->trackball,
{
bp->button_down_p = True;
gltrackball_start (bp->trackball,
@@
-372,11
+369,19
@@
glblur_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)
{
bp->button_down_p = False;
return True;
}
{
bp->button_down_p = False;
return True;
}
+ else if (event->xany.type == ButtonPress &&
+ (event->xbutton.button == Button4 ||
+ event->xbutton.button == Button5))
+ {
+ gltrackball_mousewheel (bp->trackball, event->xbutton.button, 10,
+ !!event->xbutton.state);
+ return True;
+ }
else if (event->xany.type == MotionNotify &&
bp->button_down_p)
{
else if (event->xany.type == MotionNotify &&
bp->button_down_p)
{