X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Frubikblocks.c;h=14872367e3dbcdf7208a35aa1d9c5ea1e19dd9a1;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=ad4abd30be435bdddcb0b93c8aeaec003d1dd7a7;hpb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;p=xscreensaver

diff --git a/hacks/glx/rubikblocks.c b/hacks/glx/rubikblocks.c
index ad4abd30..14872367 100644
--- a/hacks/glx/rubikblocks.c
+++ b/hacks/glx/rubikblocks.c
@@ -128,7 +128,6 @@ static const GLfloat lmodel_ambient[] = {0.1, 0.1, 0.1, 1.0};
 static const GLfloat material_ambient[] = {0.7, 0.7, 0.7, 1.0};
 static const GLfloat material_diffuse[] = {0.7, 0.7, 0.7, 1.0};
 static const GLfloat material_specular[] = {0.2, 0.2, 0.2, 1.0};
-static const GLfloat zpos = -18.0;
 
 /*************************************************************************/
 
@@ -262,7 +261,9 @@ draw_main(ModeInfo *mi, rubikblocks_conf *cp)
   glLoadIdentity();
   get_position(cp->rot, &x, &y, &z, !cp->button_down);
   glTranslatef((x-0.5)*6, (y-0.5)*6, -20);
+
   gltrackball_rotate(cp->trackball);
+
   get_rotation(cp->rot, &x, &y, &z, !cp->button_down);
   glRotatef(x*360, 1, 0, 0);
   glRotatef(y*360, 0, 1, 0);
@@ -431,6 +432,11 @@ init_gl(ModeInfo *mi)
   int status;
 #endif
   cp->wire = MI_IS_WIREFRAME(mi);
+
+# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
+  cp->wire = 0;
+# endif
+
   if(MI_IS_MONO(mi))
     tex = False;
   if(cp->wire) {
@@ -461,7 +467,7 @@ init_gl(ModeInfo *mi)
   glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, material_diffuse);
   glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, material_specular);
   glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
-  if(!tex) return;
+  if (!tex) return;
   glEnable(GL_TEXTURE_2D);
 #ifdef MIPMAP
   clear_gl_error();
@@ -513,7 +519,7 @@ init_cp(rubikblocks_conf *cp)
 
   cp->rot = make_rotator(spin?spinspeed:0, spin?spinspeed:0, spin?spinspeed:0,
       0.1, wander?wspeed:0, True);
-  cp->trackball = gltrackball_init();
+  cp->trackball = gltrackball_init(True);
 
   if(rndstart) randomize(cp);
 }
@@ -617,32 +623,12 @@ ENTRYPOINT Bool
 rubikblocks_handle_event (ModeInfo *mi, XEvent *event)
 {
   rubikblocks_conf *cp = &rubikblocks[MI_SCREEN(mi)];
-  if(event->xany.type == ButtonPress && event->xbutton.button == Button1)
-  {
-    cp->button_down = True;
-    gltrackball_start(cp->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)
-  {
-    cp->button_down = 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(cp->trackball,
-        event->xbutton.button, 5, !!event->xbutton.state);
-    return True;
-  }
-  else if(event->xany.type == MotionNotify && cp->button_down)
-  {
-    gltrackball_track(cp->trackball, event->xmotion.x, event->xmotion.y,
-        MI_WIDTH (mi), MI_HEIGHT (mi));
+
+  if (gltrackball_event_handler (event, cp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &cp->button_down))
     return True;
-  }
+
   return False;
 }