X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=3723520ec24916690ad56dcb1dea9035c6b277fa;hb=4f58e4f75c3d57437da215f4119e9991b77272e0;hp=eb1842d10fb727256bb45e9a3f6359103de8383c;hpb=0c26580b96f8e2f431489049be61077bd24dd21d;p=freeglut diff --git a/src/freeglut_window.c b/src/freeglut_window.c index eb1842d..3723520 100644 --- a/src/freeglut_window.c +++ b/src/freeglut_window.c @@ -203,7 +203,7 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, pfd.cColorBits = (BYTE) GetDeviceCaps( window->Window.Device, BITSPIXEL ); ppfd = &pfd; - + pixelformat = ChoosePixelFormat( window->Window.Device, ppfd ); if( pixelformat == 0 ) return GL_FALSE; @@ -235,8 +235,8 @@ void fgSetWindow ( SFG_Window *window ) if ( window ) { window->Window.Device = GetDC( window->Window.Handle ); - wglMakeCurrent( - window->Window.Device, + wglMakeCurrent( + window->Window.Device, window->Window.Context ); } @@ -293,7 +293,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, window->Window.VisualInfo = fgChooseVisual( ); fgState.DisplayMode &= ~GLUT_DOUBLE; } - + /* * GLUT also checks for multi-sampling, but I don't see that * anywhere else in FREEGLUT so I won't bother with it for the moment. @@ -471,13 +471,13 @@ void fgOpenWindow( SFG_Window* window, const char* title, &wmHints, NULL ); - + XSetWMProtocols( fgDisplay.Display, window->Window.Handle, &fgDisplay.DeleteWindow, 1 ); - + XMapWindow( fgDisplay.Display, window->Window.Handle ); } - + #elif TARGET_HOST_WIN32 WNDCLASS wc; @@ -486,13 +486,13 @@ void fgOpenWindow( SFG_Window* window, const char* title, ATOM atom; freeglut_assert_ready; - + /* * Grab the window class we have registered on glutInit(): */ atom = GetClassInfo( fgDisplay.Instance, "FREEGLUT", &wc ); assert( atom != 0 ); - + if( gameMode ) { assert( window->Parent == NULL ); @@ -649,7 +649,7 @@ int FGAPIENTRY glutCreateWindow( const char* title ) int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h ) { int ret = 0; - + if( GL_FALSE == fgStructure.Window->State.IsOffscreen ) { SFG_Window* window = NULL; @@ -804,18 +804,18 @@ void FGAPIENTRY glutSetWindowTitle( const char* title ) #if TARGET_HOST_UNIX_X11 XTextProperty text; - + text.value = (unsigned char *) title; text.encoding = XA_STRING; text.format = 8; text.nitems = strlen( title ); - + XSetWMName( fgDisplay.Display, fgStructure.Window->Window.Handle, &text ); - + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 @@ -840,7 +840,7 @@ void FGAPIENTRY glutSetIconTitle( const char* title ) #if TARGET_HOST_UNIX_X11 XTextProperty text; - + text.value = (unsigned char *) title; text.encoding = XA_STRING; text.format = 8; @@ -898,7 +898,7 @@ void FGAPIENTRY glutPositionWindow( int x, int y ) #elif TARGET_HOST_WIN32 RECT winRect; - + GetWindowRect( fgStructure.Window->Window.Handle, &winRect ); MoveWindow( fgStructure.Window->Window.Handle,