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

[xscreensaver] / hacks / glx / stonerview.c

diff --git a/hacks/glx/stonerview.c b/hacks/glx/stonerview.c
index 79b17fb6b5673958107de234e15a869790280ed7..6ce58bb05595c1044967fe5fcef7eb275ccc1966 100644 (file)
--- a/hacks/glx/stonerview.c
+++ b/hacks/glx/stonerview.c
@@ -25,6 +25,7 @@
                        "*wireframe:    False       \n"
 
 # define refresh_stonerview 0
+# define release_stonerview 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
 
@@ -76,27 +77,24 @@ reshape_stonerview (ModeInfo *mi, int width, int height)
 }
 
 
+static void
+free_stonerview (ModeInfo *mi);
+
+
 ENTRYPOINT void 
 init_stonerview (ModeInfo *mi)
 {
   stonerview_configuration *bp;
 
-  if (!bps) {
-    bps = (stonerview_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (stonerview_configuration));
-    if (!bps) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, bps, free_stonerview);
 
   bp = &bps[MI_SCREEN(mi)];
 
   bp->glx_context = init_GL(mi);
 
-  bp->trackball = gltrackball_init ();
-  bp->st = init_view(MI_IS_WIREFRAME(mi), transparent_p);
-  init_move(bp->st);
+  bp->trackball = gltrackball_init (False);
+  bp->st = stonerview_init_view(MI_IS_WIREFRAME(mi), transparent_p);
+  stonerview_init_move(bp->st);
 
   reshape_stonerview (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
   clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */
@@ -111,10 +109,21 @@ draw_stonerview (ModeInfo *mi)
   glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
 
   glPushMatrix ();
+  glRotatef( current_device_rotation(), 0, 0, 1);
   gltrackball_rotate (bp->trackball);
-  win_draw(bp->st);
+
+# 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 (h, h, h);
+  }
+# endif
+
+  stonerview_win_draw(bp->st);
   if (! bp->button_down_p)
-    move_increment(bp->st);
+    stonerview_move_increment(bp->st);
   glPopMatrix ();
 
   mi->polygon_count = NUM_ELS;
@@ -124,20 +133,12 @@ draw_stonerview (ModeInfo *mi)
   glXSwapBuffers(MI_DISPLAY (mi), MI_WINDOW(mi));
 }
 
-ENTRYPOINT void
-release_stonerview (ModeInfo *mi)
+static void
+free_stonerview (ModeInfo *mi)
 {
-  if (bps) {
-    int screen;
-    for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
-      stonerview_configuration *bp = &bps[screen];
-      if (bp->st)
-        win_release (bp->st);
-    }
-    free (bps);
-    bps = 0;
-  }
-  FreeAllGL(mi);
+  stonerview_configuration *bp = &bps[MI_SCREEN(mi)];
+  if (bp->st)
+    stonerview_win_release (bp->st);
 }
 
 ENTRYPOINT Bool
@@ -145,39 +146,10 @@ stonerview_handle_event (ModeInfo *mi, XEvent *event)
 {
   stonerview_configuration *bp = &bps[MI_SCREEN(mi)];
 
-  if (event->xany.type == ButtonPress &&
-      event->xbutton.button == Button1)
-    {
-      bp->button_down_p = True;
-      gltrackball_start (bp->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)
-    {
-      bp->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 (bp->trackball, event->xbutton.button, 10,
-                              !!event->xbutton.state);
-      return True;
-    }
-  else if (event->xany.type == MotionNotify &&
-           bp->button_down_p)
-    {
-      gltrackball_track (bp->trackball,
-                         event->xmotion.x, event->xmotion.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
-      return True;
-    }
+  if (gltrackball_event_handler (event, bp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &bp->button_down_p))
+    return True;
 
   return False;
 }