Splitting the other "glutGet" Windows-specific code into its own function

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@998 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/Common/freeglut_state.c b/src/Common/freeglut_state.c
index bf7300a..20221bb 100644 (file)
--- a/src/Common/freeglut_state.c
+++ b/src/Common/freeglut_state.c
@@ -42,6 +42,8 @@
  */\r
 \r
 extern int fgPlatformGlutGet ( GLenum eWhat );\r
+extern int fgPlatformGlutDeviceGet ( GLenum eWhat );\r
+extern int fgPlatformGlutLayerGet ( GLenum eWhat );\r
 \r
 /* -- LOCAL DEFINITIONS ---------------------------------------------------- */\r
 \r
@@ -223,6 +225,92 @@ static int fgPlatformGlutGet ( GLenum eWhat )
         break;\r
     }\r
 }\r
+\r
+\r
+static int fgPlatformGlutDeviceGet ( GLenum eWhat )\r
+{\r
+    switch( eWhat )\r
+    {\r
+    case GLUT_HAS_KEYBOARD:\r
+        /*\r
+         * X11 has a core keyboard by definition, although it can\r
+         * be present as a virtual/dummy keyboard. For now, there\r
+         * is no reliable way to tell if a real keyboard is present.\r
+         */\r
+        return 1;\r
+\r
+    /* X11 has a mouse by definition */\r
+    case GLUT_HAS_MOUSE:\r
+        return 1 ;\r
+\r
+    case GLUT_NUM_MOUSE_BUTTONS:\r
+        /* We should be able to pass NULL when the last argument is zero,\r
+         * but at least one X server has a bug where this causes a segfault.\r
+         *\r
+         * In XFree86/Xorg servers, a mouse wheel is seen as two buttons\r
+         * rather than an Axis; "freeglut_main.c" expects this when\r
+         * checking for a wheel event.\r
+         */\r
+        {\r
+            unsigned char map;\r
+            int nbuttons = XGetPointerMapping(fgDisplay.Display, &map,0);\r
+            return nbuttons;\r
+        }\r
+\r
+    default:\r
+        fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );\r
+        break;\r
+    }\r
+\r
+    /* And now -- the failure. */\r
+    return -1;\r
+}\r
+\r
+int fgPlatformGlutLayerGet( GLenum eWhat )\r
+{\r
+    /*\r
+     * This is easy as layers are not implemented ;-)\r
+     *\r
+     * XXX Can we merge the UNIX/X11 and WIN32 sections?  Or\r
+     * XXX is overlay support planned?\r
+     */\r
+    switch( eWhat )\r
+    {\r
+    case GLUT_OVERLAY_POSSIBLE:\r
+        return 0;\r
+\r
+    case GLUT_LAYER_IN_USE:\r
+        return GLUT_NORMAL;\r
+\r
+    case GLUT_HAS_OVERLAY:\r
+        return 0;\r
+\r
+    case GLUT_TRANSPARENT_INDEX:\r
+        /*\r
+         * Return just anything, which is always defined as zero\r
+         *\r
+         * XXX HUH?\r
+         */\r
+        return 0;\r
+\r
+    case GLUT_NORMAL_DAMAGED:\r
+        /* XXX Actually I do not know. Maybe. */\r
+        return 0;\r
+\r
+    case GLUT_OVERLAY_DAMAGED:\r
+        return -1;\r
+\r
+    default:\r
+        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );\r
+        break;\r
+    }\r
+\r
+    /* And fail. That's good. Programs do love failing. */\r
+    return -1;\r
+}\r
+\r
+\r
+\r
 #endif\r
 \r
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */\r
@@ -389,61 +477,6 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat )
     /* XXX WARNING: we are mostly lying in this function. */\r
     switch( eWhat )\r
     {\r
-    case GLUT_HAS_KEYBOARD:\r
-        /*\r
-         * Win32 is assumed a keyboard, and this cannot be queried,\r
-         * except for WindowsCE.\r
-         *\r
-         * X11 has a core keyboard by definition, although it can\r
-         * be present as a virtual/dummy keyboard. For now, there\r
-         * is no reliable way to tell if a real keyboard is present.\r
-         */\r
-#if defined(_WIN32_CE)\r
-        return ( GetKeyboardStatus() & KBDI_KEYBOARD_PRESENT ) ? 1 : 0;\r
-#   if FREEGLUT_LIB_PRAGMAS\r
-#       pragma comment (lib,"Kbdui.lib")\r
-#   endif\r
-\r
-#else\r
-        return 1;\r
-#endif\r
-\r
-#if TARGET_HOST_POSIX_X11\r
-\r
-    /* X11 has a mouse by definition */\r
-    case GLUT_HAS_MOUSE:\r
-        return 1 ;\r
-\r
-    case GLUT_NUM_MOUSE_BUTTONS:\r
-        /* We should be able to pass NULL when the last argument is zero,\r
-         * but at least one X server has a bug where this causes a segfault.\r
-         *\r
-         * In XFree86/Xorg servers, a mouse wheel is seen as two buttons\r
-         * rather than an Axis; "freeglut_main.c" expects this when\r
-         * checking for a wheel event.\r
-         */\r
-        {\r
-            unsigned char map;\r
-            int nbuttons = XGetPointerMapping(fgDisplay.Display, &map,0);\r
-            return nbuttons;\r
-        }\r
-\r
-#elif TARGET_HOST_MS_WINDOWS\r
-\r
-    case GLUT_HAS_MOUSE:\r
-        /*\r
-         * MS Windows can be booted without a mouse.\r
-         */\r
-        return GetSystemMetrics( SM_MOUSEPRESENT );\r
-\r
-    case GLUT_NUM_MOUSE_BUTTONS:\r
-#  if defined(_WIN32_WCE)\r
-        return 1;\r
-#  else\r
-        return GetSystemMetrics( SM_CMOUSEBUTTONS );\r
-#  endif\r
-#endif\r
-\r
     case GLUT_HAS_JOYSTICK:\r
         return fgJoystickDetect ();\r
 \r
@@ -489,8 +522,7 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat )
         return fgState.KeyRepeat;\r
 \r
     default:\r
-        fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );\r
-        break;\r
+               return fgPlatformGlutDeviceGet ( eWhat );\r
     }\r
 \r
     /* And now -- the failure. */\r
@@ -528,64 +560,8 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat )
     switch( eWhat )\r
     {\r
 \r
-#if TARGET_HOST_POSIX_X11\r
-\r
-    case GLUT_OVERLAY_POSSIBLE:\r
-        return 0;\r
-\r
-    case GLUT_LAYER_IN_USE:\r
-        return GLUT_NORMAL;\r
-\r
-    case GLUT_HAS_OVERLAY:\r
-        return 0;\r
-\r
-    case GLUT_TRANSPARENT_INDEX:\r
-        /*\r
-         * Return just anything, which is always defined as zero\r
-         *\r
-         * XXX HUH?\r
-         */\r
-        return 0;\r
-\r
-    case GLUT_NORMAL_DAMAGED:\r
-        /* XXX Actually I do not know. Maybe. */\r
-        return 0;\r
-\r
-    case GLUT_OVERLAY_DAMAGED:\r
-        return -1;\r
-\r
-#elif TARGET_HOST_MS_WINDOWS\r
-\r
-    case GLUT_OVERLAY_POSSIBLE:\r
-/*      return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE,\r
-                                   PFD_OVERLAY_PLANE ); */\r
-      return 0 ;\r
-\r
-    case GLUT_LAYER_IN_USE:\r
-        return GLUT_NORMAL;\r
-\r
-    case GLUT_HAS_OVERLAY:\r
-        return 0;\r
-\r
-    case GLUT_TRANSPARENT_INDEX:\r
-        /*\r
-         * Return just anything, which is always defined as zero\r
-         *\r
-         * XXX HUH?\r
-         */\r
-        return 0;\r
-\r
-    case GLUT_NORMAL_DAMAGED:\r
-        /* XXX Actually I do not know. Maybe. */\r
-        return 0;\r
-\r
-    case GLUT_OVERLAY_DAMAGED:\r
-        return -1;\r
-#endif\r
-\r
     default:\r
-        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );\r
-        break;\r
+        return fgPlatformGlutLayerGet( eWhat );\r
     }\r
 \r
     /* And fail. That's good. Programs do love failing. */\r

diff --git a/src/mswin/freeglut_state_mswin.c b/src/mswin/freeglut_state_mswin.c
index d3ba24d..764259c 100644 (file)
--- a/src/mswin/freeglut_state_mswin.c
+++ b/src/mswin/freeglut_state_mswin.c
@@ -229,3 +229,99 @@ int fgPlatformGlutGet ( GLenum eWhat )
 \r
        return -1;\r
 }\r
+\r
+\r
+int fgPlatformGlutDeviceGet ( GLenum eWhat )\r
+{\r
+    switch( eWhat )\r
+    {\r
+    case GLUT_HAS_KEYBOARD:\r
+        /*\r
+         * Win32 is assumed a keyboard, and this cannot be queried,\r
+         * except for WindowsCE.\r
+         *\r
+         * X11 has a core keyboard by definition, although it can\r
+         * be present as a virtual/dummy keyboard. For now, there\r
+         * is no reliable way to tell if a real keyboard is present.\r
+         */\r
+#if defined(_WIN32_CE)\r
+        return ( GetKeyboardStatus() & KBDI_KEYBOARD_PRESENT ) ? 1 : 0;\r
+#   if FREEGLUT_LIB_PRAGMAS\r
+#       pragma comment (lib,"Kbdui.lib")\r
+#   endif\r
+\r
+#else\r
+        return 1;\r
+#endif\r
+\r
+    case GLUT_HAS_MOUSE:\r
+        /*\r
+         * MS Windows can be booted without a mouse.\r
+         */\r
+        return GetSystemMetrics( SM_MOUSEPRESENT );\r
+\r
+    case GLUT_NUM_MOUSE_BUTTONS:\r
+#  if defined(_WIN32_WCE)\r
+        return 1;\r
+#  else\r
+        return GetSystemMetrics( SM_CMOUSEBUTTONS );\r
+#  endif\r
+\r
+    default:\r
+        fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );\r
+        break;\r
+    }\r
+\r
+    /* And now -- the failure. */\r
+    return -1;\r
+}\r
+\r
+\r
+int fgPlatformGlutLayerGet( GLenum eWhat )\r
+{\r
+    /*\r
+     * This is easy as layers are not implemented ;-)\r
+     *\r
+     * XXX Can we merge the UNIX/X11 and WIN32 sections?  Or\r
+     * XXX is overlay support planned?\r
+     */\r
+    switch( eWhat )\r
+    {\r
+\r
+    case GLUT_OVERLAY_POSSIBLE:\r
+/*      return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE,\r
+                                   PFD_OVERLAY_PLANE ); */\r
+      return 0 ;\r
+\r
+    case GLUT_LAYER_IN_USE:\r
+        return GLUT_NORMAL;\r
+\r
+    case GLUT_HAS_OVERLAY:\r
+        return 0;\r
+\r
+    case GLUT_TRANSPARENT_INDEX:\r
+        /*\r
+         * Return just anything, which is always defined as zero\r
+         *\r
+         * XXX HUH?\r
+         */\r
+        return 0;\r
+\r
+    case GLUT_NORMAL_DAMAGED:\r
+        /* XXX Actually I do not know. Maybe. */\r
+        return 0;\r
+\r
+    case GLUT_OVERLAY_DAMAGED:\r
+        return -1;\r
+\r
+    default:\r
+        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );\r
+        break;\r
+    }\r
+\r
+    /* And fail. That's good. Programs do love failing. */\r
+    return -1;\r
+}\r
+\r
+\r
+\r