Splitting a little Windows-specific menu code into its own file

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

diff --git a/src/Common/freeglut_menu.c b/src/Common/freeglut_menu.c
index 2a963e2..91b2b83 100644 (file)
--- a/src/Common/freeglut_menu.c
+++ b/src/Common/freeglut_menu.c
@@ -84,6 +84,9 @@ static float menu_pen_hfore [4] = {0.0f,  0.0f,  0.0f,  1.0f};
 static float menu_pen_hback [4] = {1.0f,  1.0f,  1.0f,  1.0f};\r
 #endif\r
 \r
+\r
+extern GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );\r
+\r
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */\r
 \r
 /*\r
@@ -139,27 +142,28 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry )
 /*\r
  * Private function to get the virtual maximum screen extent\r
  */\r
-static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )\r
-{\r
-    if( fgStructure.GameModeWindow )\r
-    {\r
 #if TARGET_HOST_POSIX_X11\r
-        int wx, wy;\r
-        Window w;\r
+static GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )\r
+{\r
+    int wx, wy;\r
+    Window w;\r
 \r
-        XTranslateCoordinates(\r
-            fgDisplay.Display,\r
-            window->Window.Handle,\r
-            fgDisplay.RootWindow,\r
-            0, 0, &wx, &wy, &w);\r
+    XTranslateCoordinates(\r
+        fgDisplay.Display,\r
+        window->Window.Handle,\r
+        fgDisplay.RootWindow,\r
+        0, 0, &wx, &wy, &w);\r
 \r
-        *x = fgState.GameModeSize.X + wx;\r
-        *y = fgState.GameModeSize.Y + wy;\r
-#else\r
-        *x = glutGet ( GLUT_SCREEN_WIDTH );\r
-        *y = glutGet ( GLUT_SCREEN_HEIGHT );\r
+    *x = fgState.GameModeSize.X + wx;\r
+    *y = fgState.GameModeSize.Y + wy;\r
+}\r
 #endif\r
-    }\r
+\r
+\r
+static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )\r
+{\r
+    if( fgStructure.GameModeWindow )\r
+               fghGetGameModeVMaxExtent ( window, x, y );\r
     else\r
     {\r
         *x = fgDisplay.ScreenWidth;\r

diff --git a/src/mswin/freeglut_menu_mswin.c b/src/mswin/freeglut_menu_mswin.c
index e69de29..5d22b16 100644 (file)
--- a/src/mswin/freeglut_menu_mswin.c
+++ b/src/mswin/freeglut_menu_mswin.c
@@ -0,0 +1,36 @@
+/*\r
+ * freeglut_menu_mswin.c\r
+ *\r
+ * The Windows-specific mouse cursor related stuff.\r
+ *\r
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.\r
+ * Written by John F. Fay, <fayjf@sourceforge.net>\r
+ * Creation date: Sun Jan 22, 2012\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a\r
+ * copy of this software and associated documentation files (the "Software"),\r
+ * to deal in the Software without restriction, including without limitation\r
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,\r
+ * and/or sell copies of the Software, and to permit persons to whom the\r
+ * Software is furnished to do so, subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included\r
+ * in all copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS\r
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL\r
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ */\r
+\r
+#include <GL/freeglut.h>\r
+#include "freeglut_internal_mswin.h"\r
+\r
+\r
+GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )\r
+{\r
+    *x = glutGet ( GLUT_SCREEN_WIDTH );\r
+    *y = glutGet ( GLUT_SCREEN_HEIGHT );\r
+}\r