X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcubicgrid.c;h=82a1862b258db5734a445fa4c8b8f793e22a5194;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=400af7437f27eb6a2641ae39fdc58b05847b4e35;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869;p=xscreensaver

diff --git a/hacks/glx/cubicgrid.c b/hacks/glx/cubicgrid.c
index 400af743..82a1862b 100644
--- a/hacks/glx/cubicgrid.c
+++ b/hacks/glx/cubicgrid.c
@@ -21,7 +21,8 @@
 
 #define DEFAULTS   "*delay:         20000         \n" \
                    "*showFPS:       False         \n" \
-                   "*wireframe:     False         \n"
+                   "*wireframe:     False         \n" \
+		   "*suppressRotationAnimation: True\n" \
 
 # define refresh_cubicgrid 0
 #include "xlockmore.h"
@@ -94,63 +95,46 @@ cubicgrid_handle_event (ModeInfo *mi, XEvent *event)
 {
   cubicgrid_conf *cp = &cubicgrid[MI_SCREEN(mi)];
 
-  if (event->xany.type == ButtonPress &&
-      event->xbutton.button == Button1)
-    {
-      cp->button_down_p = 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_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 (cp->trackball, event->xbutton.button, 2,
-                              !!event->xbutton.state);
-      return True;
-    }
-  else if (event->xany.type == MotionNotify &&
-           cp->button_down_p)
-    {
-      gltrackball_track (cp->trackball,
-                         event->xmotion.x, event->xmotion.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
-      return True;
-    }
+  if (gltrackball_event_handler (event, cp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &cp->button_down_p))
+    return True;
 
   return False;
 }
 
 
-static Bool draw_main(cubicgrid_conf *cp) 
+static Bool draw_main(ModeInfo *mi)
 {
+  cubicgrid_conf *cp = &cubicgrid[MI_SCREEN(mi)];
   double x, y, z;
 
   glClear(GL_COLOR_BUFFER_BIT);
   glLoadIdentity();
+
+  glRotatef (180, 1, 0, 0);  /* Make trackball track the right way */
+  glRotatef (180, 0, 1, 0);
+
   glTranslatef(0, 0, zpos);
 
   glScalef(size/ticks, size/ticks, size/ticks);
 
-  /* Do it twice because we don't track the device's orientation. */
-  glRotatef( current_device_rotation(), 0, 0, 1);
+
+# ifdef HAVE_MOBILE	/* Keep it the same relative size when rotated. */
+  {
+    GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi);
+    int o = (int) current_device_rotation();
+    if (o != 0 && o != 180 && o != -180)
+      glScalef (1/h, 1/h, 1);
+  }
+# endif
+
   gltrackball_rotate (cp->trackball);
-  glRotatef(-current_device_rotation(), 0, 0, 1);
 
   get_rotation (cp->rot, &x, &y, &z, !cp->button_down_p);
-  glRotatef (x * 360, 1.0, 0.0, 0.0);
-  glRotatef (y * 360, 0.0, 1.0, 0.0);
-  glRotatef (z * 360, 0.0, 0.0, 1.0);
+  glRotatef (-x * 360, 1.0, 0.0, 0.0);
+  glRotatef (-y * 360, 0.0, 1.0, 0.0);
+  glRotatef (-z * 360, 0.0, 0.0, 1.0);
 
   glTranslatef(-ticks/2.0, -ticks/2.0, -ticks/2.0);
   glCallList(cp->list);
@@ -255,7 +239,7 @@ ENTRYPOINT void init_cubicgrid(ModeInfo *mi)
 
     cp->rot = make_rotator (spin_speed, spin_speed, spin_speed,
                             spin_accel, 0, True);
-    cp->trackball = gltrackball_init ();
+    cp->trackball = gltrackball_init (True);
   }
 }
 
@@ -269,7 +253,7 @@ ENTRYPOINT void draw_cubicgrid(ModeInfo * mi)
   MI_IS_DRAWN(mi) = True;
   if (!cp->glx_context) return;
   glXMakeCurrent(display, window, *(cp->glx_context));
-  if (!draw_main(cp)) {
+  if (!draw_main(mi)) {
     release_cubicgrid(mi);
     return;
   }