fgState.Initialised = GL_FALSE;\r
}\r
\r
-/*\r
- * Everything inside the following #ifndef is copied from the X sources.\r
- */\r
-\r
-#if TARGET_HOST_MS_WINDOWS\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
+#if defined TARGET_HOST_MS_WINDOWS\r
#define NoValue 0x0000\r
#define XValue 0x0001\r
#define YValue 0x0002\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
-static int XParseGeometry (\r
+extern 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
+ unsigned int *height); /* RETURN */\r
#endif\r
\r
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */\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
projects / freeglut / commitdiff