X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fendgame.c;h=0aecae2da402d21e5d3c37ea3fe4b0c2a9f935f7;hb=refs%2Fheads%2Fmaster2;hp=e1c83eabbe157bf9215a912387dd72c3acb2e2b9;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869;p=xscreensaver

diff --git a/hacks/glx/endgame.c b/hacks/glx/endgame.c
index e1c83eab..0aecae2d 100644
--- a/hacks/glx/endgame.c
+++ b/hacks/glx/endgame.c
@@ -204,35 +204,16 @@ ENTRYPOINT Bool chess_handle_event (ModeInfo *mi, XEvent *event)
 {
   Chesscreen *cs = &qs[MI_SCREEN(mi)];
 
-  if(event->xany.type == ButtonPress && event->xbutton.button == Button1) {
-    cs->button_down_p = True;
-    gltrackball_start (cs->trackball,
-		       event->xbutton.x, event->xbutton.y,
-		       MI_WIDTH (mi), MI_HEIGHT (mi));
+  if (gltrackball_event_handler (event, cs->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &cs->button_down_p))
     return True;
-  }
-  else if(event->xany.type == ButtonRelease 
-	  && event->xbutton.button == Button1) {
-    cs->button_down_p = False;
-    return True;
-  }
-  else if (event->xany.type == ButtonPress &&
-           (event->xbutton.button == Button4 ||
-            event->xbutton.button == Button5 ||
-            event->xbutton.button == Button6 ||
-            event->xbutton.button == Button7))
+  else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
     {
-      gltrackball_mousewheel (cs->trackball, event->xbutton.button, 5,
-                              !event->xbutton.state);
+      cs->done = 1;
       return True;
     }
-  else if(event->xany.type == MotionNotify && cs->button_down_p) {
-    gltrackball_track (cs->trackball,
-		       event->xmotion.x, event->xmotion.y,
-		       MI_WIDTH (mi), MI_HEIGHT (mi));
-    return True;
-  }
-  
+ 
   return False;
 }
 
@@ -825,7 +806,7 @@ ENTRYPOINT void init_chess(ModeInfo *mi)
   cs = &qs[screen];
   cs->window = MI_WINDOW(mi);
   cs->wire = MI_IS_WIREFRAME(mi);
-  cs->trackball = gltrackball_init ();
+  cs->trackball = gltrackball_init (False);
   
   cs->oldwhite = -1;
 
@@ -881,6 +862,10 @@ ENTRYPOINT void init_chess(ModeInfo *mi)
   }
   chessmodels_gen_lists( classic, cs->poly_counts);
 
+# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
+    cs->wire = 0;
+# endif
+
   if(!cs->wire) {
     setup_lights(cs);
     glColorMaterial(GL_FRONT, GL_DIFFUSE);