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

[xscreensaver] / hacks / glx / glplanet.c

diff --git a/hacks/glx/glplanet.c b/hacks/glx/glplanet.c
index 98e13e8d38334fe36cc3846f41bbe4cf710e68d1..1c20b2b996d0dc48f2f63d6368e08a113863a535 100644 (file)
--- a/hacks/glx/glplanet.c
+++ b/hacks/glx/glplanet.c
@@ -401,39 +401,10 @@ planet_handle_event (ModeInfo *mi, XEvent *event)
 {
   planetstruct *gp = &planets[MI_SCREEN(mi)];
 
-  if (event->xany.type == ButtonPress &&
-      event->xbutton.button == Button1)
-    {
-      gp->button_down_p = True;
-      gltrackball_start (gp->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)
-    {
-      gp->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 (gp->trackball, event->xbutton.button, 10,
-                              !!event->xbutton.state);
-      return True;
-    }
-  else if (event->xany.type == MotionNotify &&
-           gp->button_down_p)
-    {
-      gltrackball_track (gp->trackball,
-                         event->xmotion.x, event->xmotion.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
-      return True;
-    }
+  if (gltrackball_event_handler (event, gp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &gp->button_down_p))
+    return True;
 
   return False;
 }
@@ -495,7 +466,7 @@ init_planet (ModeInfo * mi)
                             do_wander ? wander_speed : 0,
                             True);
     gp->z = frand (1.0);
-    gp->trackball = gltrackball_init ();
+    gp->trackball = gltrackball_init (True);
   }
 
   if (wire)
@@ -589,10 +560,7 @@ draw_planet (ModeInfo * mi)
                (y - 0.5) * 15,
                (z - 0.5) * 8);
 
-  /* Do it twice because we don't track the device's orientation. */
-  glRotatef( current_device_rotation(), 0, 0, 1);
   gltrackball_rotate (gp->trackball);
-  glRotatef(-current_device_rotation(), 0, 0, 1);
 
   glRotatef (90,1,0,0);