From ae105c8b50dd565e9222125434f7706f0429cca9 Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Mon, 5 Sep 2011 03:35:35 +0000 Subject: [PATCH] Final patch on full screen fix per e-mail from Diederick Niehorster dated 10/4/11 at 10:19 PM git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@932 7f0cb862-5218-0410-a997-914c9d46530a --- progs/demos/One/one.c | 2 +- src/freeglut_window.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/progs/demos/One/one.c b/progs/demos/One/one.c index 1d1a2e4..1b35f43 100644 --- a/progs/demos/One/one.c +++ b/progs/demos/One/one.c @@ -336,4 +336,4 @@ int main( int argc, char** argv ) return EXIT_SUCCESS; } -/*** END OF FILE ***/ +/*** END OF FILE ***/ \ No newline at end of file diff --git a/src/freeglut_window.c b/src/freeglut_window.c index d287a8b..41b039e 100644 --- a/src/freeglut_window.c +++ b/src/freeglut_window.c @@ -1367,7 +1367,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, if( gameMode ) { /* if in gamemode, query the origin of specified by the -display - * parameter command line (if any) and offset the upper-left corner + * command line parameter (if any) and offset the upper-left corner * of the window so we create the window on that screen. * The -display argument doesn't do anything if not trying to enter * gamemode. @@ -2000,7 +2000,7 @@ void FGAPIENTRY glutFullScreen( void ) } { -#if(WINVER >= 0x0500) +#if(WINVER >= 0x0500) /* Windows 2000 or later */ DWORD s; RECT rect; HMONITOR hMonitor; @@ -2042,9 +2042,8 @@ void FGAPIENTRY glutFullScreen( void ) rect.left = 0; rect.top = 0; - get_display_origin(&rect.left,&rect.top); - rect.right = fgDisplay.ScreenWidth+rect.left; - rect.bottom = fgDisplay.ScreenHeight+rect.top; + rect.right = fgDisplay.ScreenWidth; + rect.bottom = fgDisplay.ScreenHeight; AdjustWindowRect ( &rect, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, FALSE ); -- 1.7.10.4