X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_menu.c;h=4ea31aa5a8b7512a5a5e45553fe32b0835e34d25;hb=83a7f1444d1388983a7b756dde26b0cc74101b13;hp=91b2b832d84b0a00da312b66ba548b222ad1554a;hpb=9276442d096db4de1ba112672f80dbb822fbb3df;p=freeglut diff --git a/src/Common/freeglut_menu.c b/src/Common/freeglut_menu.c index 91b2b83..4ea31aa 100644 --- a/src/Common/freeglut_menu.c +++ b/src/Common/freeglut_menu.c @@ -85,7 +85,7 @@ static float menu_pen_hback [4] = {1.0f, 1.0f, 1.0f, 1.0f}; #endif -extern GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ); +extern GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ); /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ @@ -143,15 +143,15 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry ) * Private function to get the virtual maximum screen extent */ #if TARGET_HOST_POSIX_X11 -static GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ) +GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ) { int wx, wy; Window w; XTranslateCoordinates( - fgDisplay.Display, + fgDisplay.pDisplay.Display, window->Window.Handle, - fgDisplay.RootWindow, + fgDisplay.pDisplay.RootWindow, 0, 0, &wx, &wy, &w); *x = fgState.GameModeSize.X + wx; @@ -163,7 +163,7 @@ static GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ) static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y ) { if( fgStructure.GameModeWindow ) - fghGetGameModeVMaxExtent ( window, x, y ); + fgPlatformGetGameModeVMaxExtent ( window, x, y ); else { *x = fgDisplay.ScreenWidth;