http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.20.tar.gz

[xscreensaver] / hacks / glx / queens.c

diff --git a/hacks/glx/queens.c b/hacks/glx/queens.c
index 0c893af7ee452b435c0c21533334f3aa95157acb..46898dd7c31e3784da2d77ca3cc2938e1159767b 100644 (file)
--- a/hacks/glx/queens.c
+++ b/hacks/glx/queens.c
@@ -47,10 +47,10 @@
 #define countof(x) (sizeof((x))/sizeof((*x)))
 
 static XrmOptionDescRec opts[] = {
-  {"+rotate", ".queens.rotate", XrmoptionNoArg, (caddr_t) "false" },
-  {"-rotate", ".queens.rotate", XrmoptionNoArg, (caddr_t) "true" },
-  {"+flat", ".queens.flat", XrmoptionNoArg, (caddr_t) "false" },
-  {"-flat", ".queens.flat", XrmoptionNoArg, (caddr_t) "true" },
+  {"+rotate", ".queens.rotate", XrmoptionNoArg, "false" },
+  {"-rotate", ".queens.rotate", XrmoptionNoArg, "true" },
+  {"+flat", ".queens.flat", XrmoptionNoArg, "false" },
+  {"-flat", ".queens.flat", XrmoptionNoArg, "true" },
 };
 
 int rotate, wire, clearbits, flat;
@@ -115,7 +115,7 @@ queens_handle_event (ModeInfo *mi, XEvent *event)
   Queenscreen *c = &qs[MI_SCREEN(mi)];
 
   if (event->xany.type == ButtonPress &&
-      event->xbutton.button & Button1)
+      event->xbutton.button == Button1)
     {
       c->button_down_p = True;
       gltrackball_start (c->trackball,
@@ -124,11 +124,19 @@ queens_handle_event (ModeInfo *mi, XEvent *event)
       return True;
     }
   else if (event->xany.type == ButtonRelease &&
-           event->xbutton.button & Button1)
+           event->xbutton.button == Button1)
     {
       c->button_down_p = False;
       return True;
     }
+  else if (event->xany.type == ButtonPress &&
+           (event->xbutton.button == Button4 ||
+            event->xbutton.button == Button5))
+    {
+      gltrackball_mousewheel (c->trackball, event->xbutton.button, 5,
+                              !event->xbutton.state);
+      return True;
+    }
   else if (event->xany.type == MotionNotify &&
            c->button_down_p)
     {