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

diff --git a/hacks/glx/rubik.c b/hacks/glx/rubik.c
index 20ced973..0cc99019 100644
--- a/hacks/glx/rubik.c
+++ b/hacks/glx/rubik.c
@@ -109,7 +109,9 @@ static const char sccsid[] = "@(#)rubik.c	5.01 2001/03/01 xlockmore";
 					"*count: -30 \n"		\
 					"*showFPS: False \n"	\
 					"*cycles: 20 \n"		\
-					"*size:  -6 \n"
+					"*size:  -6 \n"		\
+					"*suppressRotationAnimation: True\n" \
+
 # define refresh_rubik 0
 # include "xlockmore.h"				/* from the xscreensaver distribution */
 #else /* !STANDALONE */
@@ -471,6 +473,7 @@ faceSizes(rubikstruct * rp, int face, int * sizeOfRow, int * sizeOfColumn)
 			*sizeOfRow = MAXSIZEX;
 			*sizeOfColumn = MAXSIZEY;
 			break;
+                default: abort();
 	}
 }
 
@@ -1624,7 +1627,7 @@ moveRubik(rubikstruct * rp, int face, int direction, int position)
 }
 
 #ifdef DEBUG
-void
+static void
 printCube(rubikstruct * rp)
 {
 	int         face, position, sizeOfRow, sizeOfColumn;
@@ -1816,7 +1819,6 @@ reshape_rubik(ModeInfo * mi, int width, int height)
 	glLoadIdentity();
 	glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0);
 	glMatrixMode(GL_MODELVIEW);
-
 }
 
 ENTRYPOINT Bool
@@ -1824,37 +1826,13 @@ rubik_handle_event (ModeInfo *mi, XEvent *event)
 {
   rubikstruct *rp = &rubik[MI_SCREEN(mi)];
 
-  if (event->xany.type == ButtonPress &&
-      event->xbutton.button == Button1)
-    {
-      rp->button_down_p = True;
-      gltrackball_start (rp->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)
-    {
-      rp->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))
+  if (gltrackball_event_handler (event, rp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &rp->button_down_p))
+    return True;
+  else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
     {
-      gltrackball_mousewheel (rp->trackball, event->xbutton.button, 10,
-                              !!event->xbutton.state);
-      return True;
-    }
-  else if (event->xany.type == MotionNotify &&
-           rp->button_down_p)
-    {
-      gltrackball_track (rp->trackball,
-                         event->xmotion.x, event->xmotion.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
+      rp->done = 1;
       return True;
     }
 
@@ -1943,7 +1921,7 @@ init_rubik(ModeInfo * mi)
 	rp->PX = ((float) LRAND() / (float) MAXRAND) * 2.0 - 1.0;
 	rp->PY = ((float) LRAND() / (float) MAXRAND) * 2.0 - 1.0;
 
-    rp->trackball = gltrackball_init ();
+    rp->trackball = gltrackball_init (True);
 
 	if ((rp->glx_context = init_GL(mi)) != NULL) {
 
@@ -2031,10 +2009,19 @@ draw_rubik(ModeInfo * mi)
 		glScalef(Scale4Iconic * rp->WindH / rp->WindW, Scale4Iconic, Scale4Iconic);
 	}
 
-    /* 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, h, 1); /* #### not quite right */
+      h = 1.8;
+      glScalef (h, h, h);
+    }
+  }
+# endif
+
     gltrackball_rotate (rp->trackball);
-    glRotatef(-current_device_rotation(), 0, 0, 1);
 
 	glRotatef(rp->step * 100, 1, 0, 0);
 	glRotatef(rp->step * 95, 0, 1, 0);