projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing a preprocessor typo
[freeglut]
/
src
/
Common
/
freeglut_menu.c
diff --git
a/src/Common/freeglut_menu.c
b/src/Common/freeglut_menu.c
index
2a963e2
..
7ad06ba
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
static float menu_pen_hback [4] = {1.0f, 1.0f, 1.0f, 1.0f};
\r
#endif
\r
\r
+
\r
+extern GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );
\r
+
\r
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
\r
\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
/*
\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
#if TARGET_HOST_POSIX_X11
\r
- int wx, wy;
\r
- Window w;
\r
+static GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
\r
+{
\r
+ int wx, wy;
\r
+ Window w;
\r
\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
\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
#endif
\r
- }
\r
+
\r
+
\r
+static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
\r
+{
\r
+ if( fgStructure.GameModeWindow )
\r
+ fgPlatformGetGameModeVMaxExtent ( window, x, y );
\r
else
\r
{
\r
*x = fgDisplay.ScreenWidth;
\r
else
\r
{
\r
*x = fgDisplay.ScreenWidth;
\r