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

[xscreensaver] / hacks / glx / gltrackball.c

diff --git a/hacks/glx/gltrackball.c b/hacks/glx/gltrackball.c
index d02e316ae62e85a1b9f1cade3f3055bcca0b7013..93d4c54263ef97e2610616d794013e10f0acbc5d 100644 (file)
--- a/hacks/glx/gltrackball.c
+++ b/hacks/glx/gltrackball.c
@@ -1,4 +1,4 @@
-/* gltrackball, Copyright (c) 2002-2008 Jamie Zawinski <jwz@jwz.org>
+/* gltrackball, Copyright (c) 2002-2012 Jamie Zawinski <jwz@jwz.org>
  * GL-flavored wrapper for trackball.c
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -18,15 +18,19 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_COCOA
-# include <OpenGL/gl.h>
-#else
+#ifndef HAVE_COCOA
 # include <GL/gl.h>
 #endif
 
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
+
 #include "trackball.h"
 #include "gltrackball.h"
 
+extern double current_device_rotation (void);  /* Bah, it's in fps.h */
+
 struct trackball_state {
   int x, y;
   GLfloat q[4];
@@ -53,6 +57,7 @@ gltrackball_reset (trackball_state *ts)
   trackball (ts->q, 0, 0, 0, 0);
 }
 
+
 /* Begin tracking the mouse: Call this when the mouse button goes down.
    x and y are the mouse position relative to the window.
    w and h are the size of the window.