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

[xscreensaver] / hacks / glx / glknots.c

diff --git a/hacks/glx/glknots.c b/hacks/glx/glknots.c
index f12e4348dae948c7d0dabfbb49825eb8e7633f0f..6bf5ccd95df246d56f6eb9dca29dcfdbf1db0f10 100644 (file)
--- a/hacks/glx/glknots.c
+++ b/hacks/glx/glknots.c
@@ -1,4 +1,4 @@
-/* glknots, Copyright (c) 2003-2007 Jamie Zawinski <jwz@jwz.org>
+/* glknots, Copyright (c) 2003-2008 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
@@ -244,7 +244,9 @@ knot_handle_event (ModeInfo *mi, XEvent *event)
     }
   else if (event->xany.type == ButtonPress &&
            (event->xbutton.button == Button4 ||
-            event->xbutton.button == Button5))
+            event->xbutton.button == Button5 ||
+            event->xbutton.button == Button6 ||
+            event->xbutton.button == Button7))
     {
       gltrackball_mousewheel (bp->trackball, event->xbutton.button, 5,
                               !!event->xbutton.state);
@@ -277,8 +279,6 @@ init_knot (ModeInfo *mi)
       fprintf(stderr, "%s: out of memory\n", progname);
       exit(1);
     }
-
-    bp = &bps[MI_SCREEN(mi)];
   }
 
   bp = &bps[MI_SCREEN(mi)];
@@ -416,7 +416,10 @@ 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);