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

[xscreensaver] / hacks / glx / glknots.c

diff --git a/hacks/glx/glknots.c b/hacks/glx/glknots.c
index 6bf5ccd95df246d56f6eb9dca29dcfdbf1db0f10..15c67dee56c5acd471eb31ef14cb0e42e78bb3ac 100644 (file)
--- a/hacks/glx/glknots.c
+++ b/hacks/glx/glknots.c
@@ -1,4 +1,4 @@
-/* glknots, Copyright (c) 2003-2008 Jamie Zawinski <jwz@jwz.org>
+/* glknots, Copyright (c) 2003-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
@@ -16,6 +16,7 @@
 #define DEFAULTS       "*delay:        30000       \n" \
                        "*showFPS:      False       \n" \
                        "*wireframe:    False       \n" \
+                       "*suppressRotationAnimation: True\n" \
 
 # define refresh_knot 0
 # define release_knot 0
@@ -190,6 +191,14 @@ reshape_knot (ModeInfo *mi, int width, int height)
              0.0, 0.0, 0.0,
              0.0, 1.0, 0.0);
 
+# ifdef HAVE_MOBILE    /* Keep it the same relative size when rotated. */
+  {
+    int o = (int) current_device_rotation();
+    if (o != 0 && o != 180 && o != -180)
+      glScalef (1/h, 1/h, 1/h);
+  }
+# endif
+
   glClear(GL_COLOR_BUFFER_BIT);
 }
 
@@ -227,37 +236,13 @@ knot_handle_event (ModeInfo *mi, XEvent *event)
 {
   knot_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))
+  if (gltrackball_event_handler (event, bp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &bp->button_down_p))
+    return True;
+  else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
     {
-      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));
+      bp->last_time = 1;
       return True;
     }
 
@@ -272,14 +257,7 @@ init_knot (ModeInfo *mi)
   knot_configuration *bp;
   int wire = MI_IS_WIREFRAME(mi);
 
-  if (!bps) {
-    bps = (knot_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (knot_configuration));
-    if (!bps) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, bps, NULL);
 
   bp = &bps[MI_SCREEN(mi)];
 
@@ -339,7 +317,7 @@ init_knot (ModeInfo *mi)
                             spin_accel,
                             do_wander ? wander_speed : 0,
                             (spinx && spiny && spinz));
-    bp->trackball = gltrackball_init ();
+    bp->trackball = gltrackball_init (True);
   }
 
   bp->knot_list = glGenLists (1);
@@ -376,7 +354,7 @@ draw_knot (ModeInfo *mi)
               now - bp->last_time >= duration)
             {
               bp->mode = 1;    /* go out */
-              bp->mode_tick = 10 * speed;
+              bp->mode_tick = 10 / speed;
               bp->last_time = now;
             }
         }
@@ -386,7 +364,7 @@ draw_knot (ModeInfo *mi)
       if (--bp->mode_tick <= 0)
         {
           new_knot (mi);
-          bp->mode_tick = 10 * speed;
+          bp->mode_tick = 10 / speed;
           bp->mode = 2;  /* go in */
         }
     }
@@ -416,10 +394,7 @@ draw_knot (ModeInfo *mi)
                  (y - 0.5) * 8,
                  (z - 0.5) * 15);
 
-    /* Do it twice because we don't track the device's orientation. */
-    glRotatef( current_device_rotation(), 0, 0, 1);
     gltrackball_rotate (bp->trackball);
-    glRotatef(-current_device_rotation(), 0, 0, 1);
 
     get_rotation (bp->rot, &x, &y, &z, !bp->button_down_p);
 
@@ -443,8 +418,8 @@ draw_knot (ModeInfo *mi)
   if (bp->mode != 0)
     {
       GLfloat s = (bp->mode == 1
-                   ? bp->mode_tick / (10 * speed)
-                   : ((10 * speed) - bp->mode_tick + 1) / (10 * speed));
+                   ? bp->mode_tick / (10 / speed)
+                   : ((10 / speed) - bp->mode_tick + 1) / (10 / speed));
       glScalef (s, s, s);
     }