* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
*/\r
\r
+#define FREEGLUT_BUILDING_LIB\r
#include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
+\r
+\r
+\r
+extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg,\r
+ WPARAM wParam, LPARAM lParam );\r
\r
\r
/*\r
* A call to this function should initialize all the display stuff...\r
*/\r
-void fghInitialize( const char* displayName )\r
+void fgPlatformInitialize( const char* displayName )\r
{\r
WNDCLASS wc;\r
ATOM atom;\r
\r
/* What we need to do is to initialize the fgDisplay global structure here. */\r
- fgDisplay.Instance = GetModuleHandle( NULL );\r
- fgDisplay.DisplayName= displayName ? strdup(displayName) : 0 ;\r
- atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );\r
+ fgDisplay.pDisplay.Instance = GetModuleHandle( NULL );\r
+ fgDisplay.pDisplay.DisplayName= displayName ? strdup(displayName) : 0 ;\r
+ atom = GetClassInfo( fgDisplay.pDisplay.Instance, _T("FREEGLUT"), &wc );\r
\r
if( atom == 0 )\r
{\r
* XXX Old code had "| CS_DBCLCKS" commented out. Plans for the\r
* XXX future? Dead-end idea?\r
*/\r
- wc.lpfnWndProc = fgWindowProc;\r
+ wc.lpfnWndProc = fgPlatformWindowProc;\r
wc.cbClsExtra = 0;\r
wc.cbWndExtra = 0;\r
- wc.hInstance = fgDisplay.Instance;\r
- wc.hIcon = LoadIcon( fgDisplay.Instance, _T("GLUT_ICON") );\r
+ wc.hInstance = fgDisplay.pDisplay.Instance;\r
+ wc.hIcon = LoadIcon( fgDisplay.pDisplay.Instance, _T("GLUT_ICON") );\r
\r
#if defined(_WIN32_WCE)\r
wc.style = CS_HREDRAW | CS_VREDRAW;\r
\r
/* Register the window class */\r
atom = RegisterClass( &wc );\r
- FREEGLUT_INTERNAL_ERROR_EXIT ( atom, "Window Class Not Registered", "fghInitialize" );\r
+ FREEGLUT_INTERNAL_ERROR_EXIT ( atom, "Window Class Not Registered", "fgPlatformInitialize" );\r
}\r
\r
/* The screen dimensions can be obtained via GetSystemMetrics() calls */\r
ReleaseDC( desktop, context );\r
}\r
/* If we have a DisplayName try to use it for metrics */\r
- if( fgDisplay.DisplayName )\r
+ if( fgDisplay.pDisplay.DisplayName )\r
{\r
- HDC context = CreateDC(fgDisplay.DisplayName,0,0,0);\r
+ HDC context = CreateDC(fgDisplay.pDisplay.DisplayName,0,0,0);\r
if( context )\r
{\r
fgDisplay.ScreenWidth = GetDeviceCaps( context, HORZRES );\r
DeleteDC(context);\r
}\r
else\r
- fgWarning("fghInitialize: "\r
+ fgWarning("fgPlatformInitialize: "\r
"CreateDC failed, Screen size info may be incorrect\n"\r
"This is quite likely caused by a bad '-display' parameter");\r
\r
/* Platform-Specific Deinitialization Functions: */\r
extern void fghCloseInputDevices ( void );\r
\r
-void fghDeinitialiseInputDevices ( void )\r
+void fgPlatformDeinitialiseInputDevices ( void )\r
{\r
#if !defined(_WIN32_WCE)\r
fghCloseInputDevices ();\r
fgState.InputDevsInitialised = GL_FALSE;\r
}\r
\r
-void fghCloseDisplay ( void )\r
+void fgPlatformCloseDisplay ( void )\r
{\r
- if( fgDisplay.DisplayName )\r
+ if( fgDisplay.pDisplay.DisplayName )\r
{\r
- free( fgDisplay.DisplayName );\r
- fgDisplay.DisplayName = NULL;\r
+ free( fgDisplay.pDisplay.DisplayName );\r
+ fgDisplay.pDisplay.DisplayName = NULL;\r
}\r
\r
/* Reset the timer granularity */\r
\r
\r
\r
+/*\r
+ * Everything down to the end of the next two functions is copied from the X sources.\r
+ */\r
+\r
+/*\r
+\r
+Copyright 1985, 1986, 1987,1998 The Open Group\r
+\r
+Permission to use, copy, modify, distribute, and sell this software and its\r
+documentation for any purpose is hereby granted without fee, provided that\r
+the above copyright notice appear in all copies and that both that\r
+copyright notice and this permission notice appear in supporting\r
+documentation.\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\r
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\r
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR\r
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,\r
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\r
+OTHER DEALINGS IN THE SOFTWARE.\r
+\r
+Except as contained in this notice, the name of The Open Group shall\r
+not be used in advertising or otherwise to promote the sale, use or\r
+other dealings in this Software without prior written authorization\r
+from The Open Group.\r
+\r
+*/\r
+\r
+#define NoValue 0x0000\r
+#define XValue 0x0001\r
+#define YValue 0x0002\r
+#define WidthValue 0x0004\r
+#define HeightValue 0x0008\r
+#define AllValues 0x000F\r
+#define XNegative 0x0010\r
+#define YNegative 0x0020\r
+\r
+/*\r
+ * XParseGeometry parses strings of the form\r
+ * "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where\r
+ * width, height, xoffset, and yoffset are unsigned integers.\r
+ * Example: "=80x24+300-49"\r
+ * The equal sign is optional.\r
+ * It returns a bitmask that indicates which of the four values\r
+ * were actually found in the string. For each value found,\r
+ * the corresponding argument is updated; for each value\r
+ * not found, the corresponding argument is left unchanged.\r
+ */\r
+\r
+static int\r
+ReadInteger(char *string, char **NextString)\r
+{\r
+ register int Result = 0;\r
+ int Sign = 1;\r
+\r
+ if (*string == '+')\r
+ string++;\r
+ else if (*string == '-')\r
+ {\r
+ string++;\r
+ Sign = -1;\r
+ }\r
+ for (; (*string >= '0') && (*string <= '9'); string++)\r
+ {\r
+ Result = (Result * 10) + (*string - '0');\r
+ }\r
+ *NextString = string;\r
+ if (Sign >= 0)\r
+ return Result;\r
+ else\r
+ return -Result;\r
+}\r
\r
+int XParseGeometry (\r
+ const char *string,\r
+ int *x,\r
+ int *y,\r
+ unsigned int *width, /* RETURN */\r
+ unsigned int *height) /* RETURN */\r
+{\r
+ int mask = NoValue;\r
+ register char *strind;\r
+ unsigned int tempWidth = 0, tempHeight = 0;\r
+ int tempX = 0, tempY = 0;\r
+ char *nextCharacter;\r
+\r
+ if ( (string == NULL) || (*string == '\0'))\r
+ return mask;\r
+ if (*string == '=')\r
+ string++; /* ignore possible '=' at beg of geometry spec */\r
+\r
+ strind = (char *)string;\r
+ if (*strind != '+' && *strind != '-' && *strind != 'x') {\r
+ tempWidth = ReadInteger(strind, &nextCharacter);\r
+ if (strind == nextCharacter)\r
+ return 0;\r
+ strind = nextCharacter;\r
+ mask |= WidthValue;\r
+ }\r
+\r
+ if (*strind == 'x' || *strind == 'X') {\r
+ strind++;\r
+ tempHeight = ReadInteger(strind, &nextCharacter);\r
+ if (strind == nextCharacter)\r
+ return 0;\r
+ strind = nextCharacter;\r
+ mask |= HeightValue;\r
+ }\r
+\r
+ if ((*strind == '+') || (*strind == '-')) {\r
+ if (*strind == '-') {\r
+ strind++;\r
+ tempX = -ReadInteger(strind, &nextCharacter);\r
+ if (strind == nextCharacter)\r
+ return 0;\r
+ strind = nextCharacter;\r
+ mask |= XNegative;\r
+ }\r
+ else\r
+ {\r
+ strind++;\r
+ tempX = ReadInteger(strind, &nextCharacter);\r
+ if (strind == nextCharacter)\r
+ return 0;\r
+ strind = nextCharacter;\r
+ }\r
+ mask |= XValue;\r
+ if ((*strind == '+') || (*strind == '-')) {\r
+ if (*strind == '-') {\r
+ strind++;\r
+ tempY = -ReadInteger(strind, &nextCharacter);\r
+ if (strind == nextCharacter)\r
+ return 0;\r
+ strind = nextCharacter;\r
+ mask |= YNegative;\r
+ }\r
+ else\r
+ {\r
+ strind++;\r
+ tempY = ReadInteger(strind, &nextCharacter);\r
+ if (strind == nextCharacter)\r
+ return 0;\r
+ strind = nextCharacter;\r
+ }\r
+ mask |= YValue;\r
+ }\r
+ }\r
+\r
+ /* If strind isn't at the end of the string the it's an invalid\r
+ geometry specification. */\r
+\r
+ if (*strind != '\0') return 0;\r
+\r
+ if (mask & XValue)\r
+ *x = tempX;\r
+ if (mask & YValue)\r
+ *y = tempY;\r
+ if (mask & WidthValue)\r
+ *width = tempWidth;\r
+ if (mask & HeightValue)\r
+ *height = tempHeight;\r
+ return mask;\r
+}\r
+\r
+\r
+\r
+/* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */\r
+\r
+void (__cdecl *__glutExitFunc)( int return_value ) = NULL;\r
+\r
+void FGAPIENTRY __glutInitWithExit( int *pargc, char **argv, void (__cdecl *exit_function)(int) )\r
+{\r
+ __glutExitFunc = exit_function;\r
+ glutInit(pargc, argv);\r
+}\r
\r