ftp://ftp.krokus.ru/pub/OpenBSD/distfiles/xscreensaver-4.22.tar.gz

[xscreensaver] / hacks / glx / glblur.c

diff --git a/hacks/glx/glblur.c b/hacks/glx/glblur.c
index 59b0870d31ada815b1c40a079d6c7c7545b70709..3c718106660b945122d8eb9f9d1199fdd0420701 100644 (file)
--- a/hacks/glx/glblur.c
+++ b/hacks/glx/glblur.c
@@ -38,14 +38,9 @@ extern XtAppContext app;
 #define DEF_WANDER      "True"
 #define DEF_BLURSIZE    "15"
 
-#define DEFAULTS       "*delay:        10000       \n" \
-                       "*showFPS:      False       \n" \
-                       "*fpsSolid:     True        \n" \
-                       "*wireframe:    False       \n" \
-                       "*spin:       " DEF_SPIN   "\n" \
-                       "*wander:     " DEF_WANDER "\n" \
-                       "*blurSize:   " DEF_BLURSIZE "\n" \
-
+#define DEFAULTS       "*delay:    10000 \n" \
+                       "*showFPS:  False \n" \
+                       "*fpsSolid: True  \n"
 
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -363,7 +358,7 @@ glblur_handle_event (ModeInfo *mi, XEvent *event)
   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,
@@ -372,11 +367,19 @@ glblur_handle_event (ModeInfo *mi, XEvent *event)
       return True;
     }
   else if (event->xany.type == ButtonRelease &&
-           event->xbutton.button & Button1)
+           event->xbutton.button == Button1)
     {
       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)
     {