Moving the X11-specific code from "freeglut_menu.c" into its own file

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

diff --git a/src/Common/freeglut_menu.c b/src/Common/freeglut_menu.c
index 2fc528b..8444d6e 100644 (file)
--- a/src/Common/freeglut_menu.c
+++ b/src/Common/freeglut_menu.c
@@ -142,24 +142,6 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry )
 /*\r
  * Private function to get the virtual maximum screen extent\r
  */\r
-#if TARGET_HOST_POSIX_X11\r
-GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )\r
-{\r
-    int wx, wy;\r
-    Window w;\r
-\r
-    XTranslateCoordinates(\r
-        fgDisplay.pDisplay.Display,\r
-        window->Window.Handle,\r
-        fgDisplay.pDisplay.RootWindow,\r
-        0, 0, &wx, &wy, &w);\r
-\r
-    *x = fgState.GameModeSize.X + wx;\r
-    *y = fgState.GameModeSize.Y + wy;\r
-}\r
-#endif\r
-\r
-\r
 static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )\r
 {\r
     if( fgStructure.GameModeWindow )\r

diff --git a/src/x11/freeglut_menu_x11.c b/src/x11/freeglut_menu_x11.c
index e69de29..5eaf490 100644 (file)
--- a/src/x11/freeglut_menu_x11.c
+++ b/src/x11/freeglut_menu_x11.c
@@ -0,0 +1,49 @@
+/*\r
+ * freeglut_callbacks.c\r
+ *\r
+ * The callbacks setting methods.\r
+ *\r
+ * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.\r
+ * Written by Pawel W. Olszta, <olszta@sourceforge.net>\r
+ * Copied for Platform code by Evan Felix <karcaw at gmail.com>\r
+ * Creation date: Wed Feb 1, 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.h"\r
+\r
+/*\r
+ *  * Private function to get the virtual maximum screen extent\r
+ *   */\r
+GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )\r
+{\r
+    int wx, wy;\r
+    Window w;\r
+\r
+    XTranslateCoordinates(\r
+        fgDisplay.pDisplay.Display,\r
+        window->Window.Handle,\r
+        fgDisplay.pDisplay.RootWindow,\r
+        0, 0, &wx, &wy, &w);\r
+\r
+    *x = fgState.GameModeSize.X + wx;\r
+    *y = fgState.GameModeSize.Y + wy;\r
+}\r
+\r