timers internally now use 64bit unsigned int, if available

[freeglut] / src / Common / freeglut_spaceball.c

diff --git a/src/Common/freeglut_spaceball.c b/src/Common/freeglut_spaceball.c
index 6f8feba..231531d 100644 (file)
--- a/src/Common/freeglut_spaceball.c
+++ b/src/Common/freeglut_spaceball.c
@@ -1,76 +1,76 @@
-/* Spaceball support for Linux.\r
- * Written by John Tsiombikas <nuclear@member.fsf.org>\r
- *\r
- * This code supports 3Dconnexion's 6-dof space-whatever devices.\r
- * It can communicate with either the proprietary 3Dconnexion daemon (3dxsrv)\r
- * free spacenavd (http://spacenav.sourceforge.net), through the "standard"\r
- * magellan X-based protocol.\r
- */\r
-\r
-#include <GL/freeglut.h>\r
-#include "freeglut_internal.h"\r
-\r
-/* -- PRIVATE FUNCTIONS --------------------------------------------------- */\r
-\r
-extern void fgPlatformInitializeSpaceball(void);\r
-extern void fgPlatformSpaceballClose(void);\r
-extern int fgPlatformHasSpaceball(void);\r
-extern int fgPlatformSpaceballNumButtons(void);\r
-extern void fgPlatformSpaceballSetWindow(SFG_Window *window);\r
-\r
-\r
-int sball_initialized = 0;\r
-\r
-void fgInitialiseSpaceball(void)\r
-{\r
-    if(sball_initialized != 0) {\r
-        return;\r
-    }\r
-\r
-    fgPlatformInitializeSpaceball();\r
-\r
-    sball_initialized = 1;\r
-}\r
-\r
-void fgSpaceballClose(void)\r
-{\r
-       fgPlatformSpaceballClose();}\r
-\r
-int fgHasSpaceball(void)\r
-{\r
-    if(sball_initialized == 0) {\r
-        fgInitialiseSpaceball();\r
-        if(sball_initialized != 1) {\r
-            fgWarning("fgInitialiseSpaceball failed\n");\r
-            return 0;\r
-        }\r
-    }\r
-\r
-    return fgPlatformHasSpaceball();\r
-}\r
-\r
-int fgSpaceballNumButtons(void)\r
-{\r
-    if(sball_initialized == 0) {\r
-        fgInitialiseSpaceball();\r
-        if(sball_initialized != 1) {\r
-            fgWarning("fgInitialiseSpaceball failed\n");\r
-            return 0;\r
-        }\r
-    }\r
-\r
-    return fgPlatformSpaceballNumButtons();\r
-}\r
-\r
-void fgSpaceballSetWindow(SFG_Window *window)\r
-{\r
-    if(sball_initialized == 0) {\r
-        fgInitialiseSpaceball();\r
-        if(sball_initialized != 1) {\r
-            return;\r
-        }\r
-    }\r
-\r
-    fgPlatformSpaceballSetWindow(window);\r
-}\r
-\r
+/* Spaceball support for Linux.
+ * Written by John Tsiombikas <nuclear@member.fsf.org>
+ *
+ * This code supports 3Dconnexion's 6-dof space-whatever devices.
+ * It can communicate with either the proprietary 3Dconnexion daemon (3dxsrv)
+ * free spacenavd (http://spacenav.sourceforge.net), through the "standard"
+ * magellan X-based protocol.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal.h"
+
+/* -- PRIVATE FUNCTIONS --------------------------------------------------- */
+
+extern void fgPlatformInitializeSpaceball(void);
+extern void fgPlatformSpaceballClose(void);
+extern int fgPlatformHasSpaceball(void);
+extern int fgPlatformSpaceballNumButtons(void);
+extern void fgPlatformSpaceballSetWindow(SFG_Window *window);
+
+
+int sball_initialized = 0;
+
+void fgInitialiseSpaceball(void)
+{
+    if(sball_initialized != 0) {
+        return;
+    }
+
+    fgPlatformInitializeSpaceball();
+
+    sball_initialized = 1;
+}
+
+void fgSpaceballClose(void)
+{
+       fgPlatformSpaceballClose();}
+
+int fgHasSpaceball(void)
+{
+    if(sball_initialized == 0) {
+        fgInitialiseSpaceball();
+        if(sball_initialized != 1) {
+            fgWarning("fgInitialiseSpaceball failed\n");
+            return 0;
+        }
+    }
+
+    return fgPlatformHasSpaceball();
+}
+
+int fgSpaceballNumButtons(void)
+{
+    if(sball_initialized == 0) {
+        fgInitialiseSpaceball();
+        if(sball_initialized != 1) {
+            fgWarning("fgInitialiseSpaceball failed\n");
+            return 0;
+        }
+    }
+
+    return fgPlatformSpaceballNumButtons();
+}
+
+void fgSpaceballSetWindow(SFG_Window *window)
+{
+    if(sball_initialized == 0) {
+        fgInitialiseSpaceball();
+        if(sball_initialized != 1) {
+            return;
+        }
+    }
+
+    fgPlatformSpaceballSetWindow(window);
+}
+