X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fmoebius.c;h=feb1a488233c2be68ecf5b40925db43589119329;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=a9dddf50c026f86de8487cddc9a4a0a88745cc8c;hpb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;p=xscreensaver diff --git a/hacks/glx/moebius.c b/hacks/glx/moebius.c index a9dddf50..feb1a488 100644 --- a/hacks/glx/moebius.c +++ b/hacks/glx/moebius.c @@ -440,8 +440,8 @@ draw_moebius_strip(ModeInfo * mi) float Cx, Cy, Cz; -#ifdef HAVE_JWZGLES - solidmoebius = True; /* no LINE PolygonMode */ +#ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */ + solidmoebius = True; #endif if (solidmoebius) { @@ -668,39 +668,10 @@ moebius_handle_event (ModeInfo *mi, XEvent *event) { moebiusstruct *mp = &moebius[MI_SCREEN(mi)]; - if (event->xany.type == ButtonPress && - event->xbutton.button == Button1) - { - mp->button_down_p = True; - gltrackball_start (mp->trackball, - event->xbutton.x, event->xbutton.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } - else if (event->xany.type == ButtonRelease && - event->xbutton.button == Button1) - { - mp->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)) - { - gltrackball_mousewheel (mp->trackball, event->xbutton.button, 10, - !!event->xbutton.state); - return True; - } - else if (event->xany.type == MotionNotify && - mp->button_down_p) - { - gltrackball_track (mp->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } + if (gltrackball_event_handler (event, mp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &mp->button_down_p)) + return True; return False; } @@ -723,7 +694,7 @@ init_moebius (ModeInfo * mi) { double rot_speed = 0.3; mp->rot = make_rotator (rot_speed, rot_speed, rot_speed, 1, 0, True); - mp->trackball = gltrackball_init (); + mp->trackball = gltrackball_init (True); } if ((mp->glx_context = init_GL(mi)) != NULL) {