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

[xscreensaver] / hacks / glx / dangerball.c

diff --git a/hacks/glx/dangerball.c b/hacks/glx/dangerball.c
index 32483a1dce2db772ecf470ccc30f60ca6896d85f..3d8e4eac643ee227a309122f2c35131ceec4ad46 100644 (file)
--- a/hacks/glx/dangerball.c
+++ b/hacks/glx/dangerball.c
@@ -29,10 +29,6 @@ extern XtAppContext app;
                        "*count:        30          \n" \
                        "*showFPS:      False       \n" \
                        "*wireframe:    False       \n" \
-                       "*speed:      " DEF_SPEED " \n" \
-                       "*spin:       " DEF_SPIN   "\n" \
-                       "*wander:     " DEF_WANDER "\n" \
-
 
 #define SPIKE_FACES   12  /* how densely to render spikes */
 #define SMOOTH_SPIKES True
@@ -196,7 +192,7 @@ ball_handle_event (ModeInfo *mi, XEvent *event)
   ball_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,
@@ -205,11 +201,19 @@ ball_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)
     {