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 3f85b598bba753686ba761146d19b1e5476f28f0..7df6ad8c0857dd953fc52ef6a2890719c0ff10d4 100644 (file)
--- a/hacks/glx/bouncingcow.c
+++ b/hacks/glx/bouncingcow.c
@@ -23,15 +23,13 @@ extern XtAppContext app;
 #define EVENT_MASK      PointerMotionMask
 #define sws_opts       xlockmore_opts
 
-#define DEF_SPEED       "1.0"
+#define DEF_SPEED       "0.7"
 #define DEF_TEXTURE     "(none)"
 
 #define DEFAULTS       "*delay:        30000       \n" \
                        "*count:        1           \n" \
                        "*showFPS:      False       \n" \
                        "*wireframe:    False       \n" \
-                       "*speed:      " DEF_SPEED " \n" \
-                       "*texture:    " DEF_TEXTURE   "\n" \
 
 /* #define DEBUG */
 
@@ -100,7 +98,7 @@ static const char *do_texture;
 static XrmOptionDescRec opts[] = {
   { "-speed",      ".speed",     XrmoptionSepArg, 0 },
   {"-texture",     ".texture",   XrmoptionSepArg, 0 },
-  {"+texture",     ".texture",   XrmoptionNoArg, (caddr_t) "(none)" },
+  {"+texture",     ".texture",   XrmoptionNoArg, "(none)" },
 };
 
 static argtype vars[] = {
@@ -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)
     {