X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=cf78fa87b21c933462a64c439c9c38afdf1889c6;hb=b1e6158f2fffaf8fc807615e8478b3b45d5915a2;hp=c70990135902bedfb08cedb498c979e8184dde8f;hpb=0bc08ba43c31fd2eec2e5473e58d3eafa6877655;p=freeglut diff --git a/src/freeglut_window.c b/src/freeglut_window.c index c709901..cf78fa8 100644 --- a/src/freeglut_window.c +++ b/src/freeglut_window.c @@ -237,8 +237,8 @@ void fgSetWindow ( SFG_Window *window ) window->Window.Device = GetDC( window->Window.Handle ); wglMakeCurrent( window->Window.Device, - window->Window.Context - ); + window->Window.Context + ); } #endif fgStructure.Window = window; @@ -553,7 +553,7 @@ void fgCloseWindow( SFG_Window* window ) glXDestroyContext( fgDisplay.Display, window->Window.Context ); XDestroyWindow( fgDisplay.Display, window->Window.Handle ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 @@ -652,7 +652,7 @@ void FGAPIENTRY glutShowWindow( void ) #if TARGET_HOST_UNIX_X11 XMapWindow( fgDisplay.Display, fgStructure.Window->Window.Handle ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 @@ -678,7 +678,7 @@ void FGAPIENTRY glutHideWindow( void ) fgDisplay.Screen ); else XUnmapWindow( fgDisplay.Display, fgStructure.Window->Window.Handle ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 @@ -701,7 +701,7 @@ void FGAPIENTRY glutIconifyWindow( void ) XIconifyWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, fgDisplay.Screen ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 @@ -738,7 +738,7 @@ void FGAPIENTRY glutSetWindowTitle( const char* title ) &text ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ } #elif TARGET_HOST_WIN32 @@ -776,12 +776,12 @@ void FGAPIENTRY glutSetIconTitle( const char* title ) &text ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ } #elif TARGET_HOST_WIN32 - SetWindowText( fgStructure.Window->Window.Handle, title ); + SetWindowText( fgStructure.Window->Window.Handle, title ); #endif @@ -799,7 +799,7 @@ void FGAPIENTRY glutReshapeWindow( int width, int height ) XResizeWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, width, height ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 @@ -819,8 +819,8 @@ void FGAPIENTRY glutReshapeWindow( int width, int height ) */ if ( ! fgStructure.Window->IsMenu ) { - width += GetSystemMetrics( SM_CXSIZEFRAME ) * 2; - height += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 + + width += GetSystemMetrics( SM_CXSIZEFRAME ) * 2; + height += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 + GetSystemMetrics( SM_CYCAPTION ); } } @@ -858,7 +858,7 @@ void FGAPIENTRY glutPositionWindow( int x, int y ) #if TARGET_HOST_UNIX_X11 XMoveWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, x, y ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 @@ -950,7 +950,7 @@ void FGAPIENTRY glutFullScreen( void ) fgDisplay.ScreenWidth, fgDisplay.ScreenHeight ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ XTranslateCoordinates( fgDisplay.Display, @@ -966,7 +966,7 @@ void FGAPIENTRY glutFullScreen( void ) fgStructure.Window->Window.Handle, -x, -y ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ } } #elif TARGET_HOST_WIN32