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

[xscreensaver] / hacks / glx / lavalite.c

diff --git a/hacks/glx/lavalite.c b/hacks/glx/lavalite.c
index c31df5a43d9a2621568c2370451df9aca0b25571..f3eadc5e78688b964fdf1c2deb813991d068c4cd 100644 (file)
--- a/hacks/glx/lavalite.c
+++ b/hacks/glx/lavalite.c
@@ -1,6 +1,6 @@
 /* lavalite --- 3D Simulation a Lava Lite, written by jwz.
  *
- * This software Copyright (c) 2002-2006 Jamie Zawinski <jwz@jwz.org>
+ * This software Copyright (c) 2002-2014 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -1241,39 +1241,10 @@ lavalite_handle_event (ModeInfo *mi, XEvent *event)
 {
   lavalite_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, 5,
-                              !!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;
 }
@@ -1401,7 +1372,7 @@ init_lavalite (ModeInfo *mi)
     bp->rot2 = make_rotator (spin_speed, 0, 0,
                              1, 0.1,
                              False);
-    bp->trackball = gltrackball_init ();
+    bp->trackball = gltrackball_init (False);
 
     /* move initial camera position up by around 15 degrees:
        in other words, tilt the scene toward the viewer. */
@@ -1514,6 +1485,7 @@ draw_lavalite (ModeInfo *mi)
 #endif  /* 0 */
 
     glLoadIdentity();
+    glRotatef(current_device_rotation(), 0, 0, 1);
 
     gluLookAt ((cx - 0.5) * 8,         /* Position the camera */
                (cy - 0.5) * 8,
@@ -1523,7 +1495,6 @@ draw_lavalite (ModeInfo *mi)
 
     gltrackball_rotate (bp->trackball);        /* Apply mouse-based camera position */
 
-
     /* Place the lights relative to the object, before the object has
        been rotated or wandered within the scene. */
     glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);