X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fendgame.c;h=30f4e7dfff067a501050382fc7b2cddd99e685b8;hb=447db08c956099b3b183886729108bf5b364c4b8;hp=25335a7097e1a351c1e520ef3f085a7998fb357d;hpb=ffd8c0873576a9e3065696a624dce6b766b77062;p=xscreensaver

diff --git a/hacks/glx/endgame.c b/hacks/glx/endgame.c
index 25335a70..30f4e7df 100644
--- a/hacks/glx/endgame.c
+++ b/hacks/glx/endgame.c
@@ -26,11 +26,9 @@
 # define EVENT_MASK       PointerMotionMask
 # define chess_opts  xlockmore_opts
 
-#define DEFAULTS       "*delay:       20000       \n" \
-                       "*showFPS:       False       \n" \
-		       "*wireframe:	False     \n"	\
-		       "*reflections:	True     \n"	\
-		       "*shadows:	True     \n"	\
+#define DEFAULTS       "*delay:     20000 \n" \
+                       "*showFPS:   False \n" \
+		       "*wireframe: False \n" \
 
 # include "xlockmore.h"
 
@@ -206,7 +204,7 @@ double theta = 0.0;
 Bool chess_handle_event (ModeInfo *mi, XEvent *event) {
   Chesscreen *c = &qs[MI_SCREEN(mi)];
 
-  if(event->xany.type == ButtonPress && event->xbutton.button & Button1) {
+  if(event->xany.type == ButtonPress && event->xbutton.button == Button1) {
     c->button_down_p = True;
     gltrackball_start (c->trackball,
 		       event->xbutton.x, event->xbutton.y,
@@ -214,10 +212,18 @@ Bool chess_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) {
     gltrackball_track (c->trackball,
 		       event->xmotion.x, event->xmotion.y,