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

[xscreensaver] / hacks / glx / bouncingcow.c

diff --git a/hacks/glx/bouncingcow.c b/hacks/glx/bouncingcow.c
index 1c9e92bcf95bf75b37807aaa41d2cae57bd2a0ab..7df6ad8c0857dd953fc52ef6a2890719c0ff10d4 100644 (file)
--- a/hacks/glx/bouncingcow.c
+++ b/hacks/glx/bouncingcow.c
@@ -30,8 +30,6 @@ extern XtAppContext app;
                        "*count:        1           \n" \
                        "*showFPS:      False       \n" \
                        "*wireframe:    False       \n" \
-                       "*speed:      " DEF_SPEED " \n" \
-                       "*texture:    " DEF_TEXTURE   "\n" \
 
 /* #define DEBUG */
 
@@ -196,7 +194,7 @@ cow_handle_event (ModeInfo *mi, XEvent *event)
   cow_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 +203,19 @@ cow_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)
     {