From http://www.jwz.org/xscreensaver/xscreensaver-5.35.tar.gz

[xscreensaver] / hacks / glx / rubik.c

diff --git a/hacks/glx/rubik.c b/hacks/glx/rubik.c
index 0f40347c998cfeefaaf8eea539cf54c9ea6d0dd9..0cc99019ebc19ab8dc4970a6f2ee9e127117f28e 100644 (file)
--- a/hacks/glx/rubik.c
+++ b/hacks/glx/rubik.c
@@ -109,15 +109,18 @@ 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
-# define rubik_handle_event 0
 # include "xlockmore.h"                                /* from the xscreensaver distribution */
 #else /* !STANDALONE */
 # include "xlock.h"                                    /* from the xlockmore distribution */
 # include "vis.h"
 #endif /* !STANDALONE */
 
+#include "gltrackball.h"
+
 #ifdef MODE_rubik
 
 #define DEF_SIZEX     "0"
@@ -372,6 +375,8 @@ typedef struct {
        GLfloat     rotatestep;
        GLfloat     PX, PY, VX, VY;
        GLXContext *glx_context;
+    Bool button_down_p;
+    trackball_state *trackball;
 } rubikstruct;
 
 static const float front_shininess[] = {60.0};
@@ -468,6 +473,7 @@ faceSizes(rubikstruct * rp, int face, int * sizeOfRow, int * sizeOfColumn)
                        *sizeOfRow = MAXSIZEX;
                        *sizeOfColumn = MAXSIZEY;
                        break;
+                default: abort();
        }
 }
 
@@ -1621,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;
@@ -1813,9 +1819,27 @@ 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
+rubik_handle_event (ModeInfo *mi, XEvent *event)
+{
+  rubikstruct *rp = &rubik[MI_SCREEN(mi)];
+
+  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))
+    {
+      rp->done = 1;
+      return True;
+    }
+
+  return False;
 }
 
+
 static Bool
 pinit(ModeInfo * mi)
 {
@@ -1897,6 +1921,8 @@ 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 (True);
+
        if ((rp->glx_context = init_GL(mi)) != NULL) {
 
                reshape_rubik(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
@@ -1983,6 +2009,20 @@ draw_rubik(ModeInfo * mi)
                glScalef(Scale4Iconic * rp->WindH / rp->WindW, Scale4Iconic, Scale4Iconic);
        }
 
+# 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(rp->step * 100, 1, 0, 0);
        glRotatef(rp->step * 95, 0, 1, 0);
        glRotatef(rp->step * 90, 0, 0, 1);