X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fendgame.c;h=0aecae2da402d21e5d3c37ea3fe4b0c2a9f935f7;hp=b4811da455cae932495870203c4f10a8d4d650b8;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hpb=dba664f31aa87285db4d76cf8c5e66335299703a diff --git a/hacks/glx/endgame.c b/hacks/glx/endgame.c index b4811da4..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;