X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=c92fbcb8a7c3df59838003f1bb93afa9415e9148;hb=f8e9486689c8ca08cce53cf05a03826eabb1a0af;hp=34d3b90912aaed2ef685203f4a97f06d3f26267a;hpb=2e5dc871b7c1df472978af9811d0e97b6684707c;p=freeglut diff --git a/src/freeglut_window.c b/src/freeglut_window.c index 34d3b90..c92fbcb 100644 --- a/src/freeglut_window.c +++ b/src/freeglut_window.c @@ -66,7 +66,7 @@ XVisualInfo* fgChooseVisual( void ) { #define BUFFER_SIZES 6 int bufferSize[BUFFER_SIZES] = { 16, 12, 8, 4, 2, 1 }; - GLboolean wantIndexedMode = FALSE; + GLboolean wantIndexedMode = GL_FALSE; int attributes[ 32 ]; int where = 0; @@ -83,7 +83,7 @@ XVisualInfo* fgChooseVisual( void ) if( fgState.DisplayMode & GLUT_INDEX ) { ATTRIB_VAL( GLX_BUFFER_SIZE, 8 ); - wantIndexedMode = TRUE; + wantIndexedMode = GL_TRUE; } else { @@ -121,7 +121,7 @@ XVisualInfo* fgChooseVisual( void ) */ ATTRIB( None ); - if( wantIndexedMode == FALSE ) + if( ! wantIndexedMode ) return glXChooseVisual( fgDisplay.Display, fgDisplay.Screen, attributes ); else @@ -162,7 +162,9 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, if( fgState.DisplayMode & GLUT_DOUBLE ) flags |= PFD_DOUBLEBUFFER; +#if defined(_MSC_VER) #pragma message( "fgSetupPixelFormat(): there is still some work to do here!" ) +#endif /* * Specify which pixel format do we opt for... @@ -204,10 +206,10 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, pixelformat = ChoosePixelFormat( window->Window.Device, ppfd ); if( pixelformat == 0 ) - return FALSE; + return GL_FALSE; if( checkOnly ) - return TRUE; + return GL_TRUE; return SetPixelFormat( window->Window.Device, pixelformat, ppfd ); } #endif @@ -249,7 +251,7 @@ void fgSetWindow ( SFG_Window *window ) */ void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, int h, - GLboolean gameMode, int isSubWindow ) + GLboolean gameMode, GLboolean isSubWindow ) { #if TARGET_HOST_UNIX_X11 XSetWindowAttributes winAttr; @@ -265,7 +267,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, * XXX With a little thought, we should be able to greatly * XXX simplify this. */ - if ( !fgState.BuildingAMenu ) + if ( !window->IsMenu ) window->Window.VisualInfo = fgChooseVisual(); else if ( fgStructure.MenuContext ) window->Window.VisualInfo = fgChooseVisual(); @@ -327,7 +329,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, mask = CWBackPixmap | CWBorderPixel | CWColormap | CWEventMask; - if ( fgState.BuildingAMenu ) + if ( window->IsMenu ) { winAttr.override_redirect = True; mask |= CWOverrideRedirect; @@ -347,7 +349,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, * The GLX context creation, possibly trying the direct context rendering * or else use the current context if the user has so specified */ - if ( fgState.BuildingAMenu ) + if ( window->IsMenu ) { /* * If there isn't already an OpenGL rendering context for menu @@ -370,7 +372,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, NULL, fgState.ForceDirectContext | fgState.TryDirectContext ); } - else if ( fgState.UseCurrentContext == TRUE ) + else if ( fgState.UseCurrentContext ) { window->Window.Context = glXGetCurrentContext(); @@ -401,12 +403,12 @@ void fgOpenWindow( SFG_Window* window, const char* title, * XXX Assume the new window is visible by default * XXX Is this a safe assumption? */ - window->State.Visible = TRUE; + window->State.Visible = GL_TRUE; sizeHints.flags = 0; - if (fgState.Position.Use == TRUE) + if ( fgState.Position.Use ) sizeHints.flags |= USPosition; - if (fgState.Size.Use == TRUE) + if ( fgState.Size.Use ) sizeHints.flags |= USSize; /* @@ -423,8 +425,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, sizeHints.height = h; wmHints.flags = StateHint; - wmHints.initial_state = - (fgState.ForceIconic == FALSE) ? NormalState : IconicState; + wmHints.initial_state = fgState.ForceIconic ? IconicState : NormalState; /* * Prepare the window and iconified window names... @@ -460,7 +461,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, atom = GetClassInfo( fgDisplay.Instance, "FREEGLUT", &wc ); assert( atom != 0 ); - if( gameMode != FALSE ) + if( gameMode ) { assert( window->Parent == NULL ); @@ -472,7 +473,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, } else { - if ( ( !isSubWindow ) && ( ! window->IsMenu ) ) + if ( ( ! isSubWindow ) && ( ! window->IsMenu ) ) { /* * Update the window dimensions, taking account of window @@ -484,12 +485,12 @@ void fgOpenWindow( SFG_Window* window, const char* title, GetSystemMetrics( SM_CYCAPTION ); } - if( fgState.Position.Use == FALSE ) + if( ! fgState.Position.Use ) { x = CW_USEDEFAULT; y = CW_USEDEFAULT; } - if( fgState.Size.Use == FALSE ) + if( ! fgState.Size.Use ) { w = CW_USEDEFAULT; h = CW_USEDEFAULT; @@ -529,15 +530,16 @@ void fgOpenWindow( SFG_Window* window, const char* title, #endif + fgSetWindow( window ); + window->Window.DoubleBuffered = - ( fgState.DisplayMode & GLUT_DOUBLE ) ? 1 : 0 ; + ( fgState.DisplayMode & GLUT_DOUBLE ) ? 1 : 0; if ( ! window->Window.DoubleBuffered ) { - glDrawBuffer ( GL_FRONT ) ; - glReadBuffer ( GL_FRONT ) ; + glDrawBuffer ( GL_FRONT ); + glReadBuffer ( GL_FRONT ); } - fgSetWindow( window ); } /* @@ -555,13 +557,34 @@ void fgCloseWindow( SFG_Window* window ) #elif TARGET_HOST_WIN32 - SendMessage( - window->Window.Handle, - WM_CLOSE, - 0, - 0 - ); + /* + * Make sure we don't close a window with current context active + */ + if( fgStructure.Window == window ) + wglMakeCurrent( NULL, NULL ); + + /* + * Step through the list of windows. If the rendering context + * is not being used by another window, then we delete it. + */ + { + int used = FALSE ; + SFG_Window *iter ; + + for( iter = (SFG_Window *)fgStructure.Windows.First; + iter; + iter = (SFG_Window *)iter->Node.Next ) + { + if( ( iter->Window.Context == window->Window.Context ) && + ( iter != window ) ) + used = TRUE; + } + if( ! used ) + wglDeleteContext( window->Window.Context ); + } + + DestroyWindow( window->Window.Handle ); #endif } @@ -574,7 +597,8 @@ void fgCloseWindow( SFG_Window* window ) int FGAPIENTRY glutCreateWindow( const char* title ) { return fgCreateWindow( NULL, title, fgState.Position.X, fgState.Position.Y, - fgState.Size.X, fgState.Size.Y, FALSE )->ID; + fgState.Size.X, fgState.Size.Y, GL_FALSE, + GL_FALSE )->ID; } /* @@ -588,7 +612,7 @@ int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h ) freeglut_assert_ready; parent = fgWindowByID( parentID ); freeglut_return_val_if_fail( parent != NULL, 0 ); - window = fgCreateWindow( parent, "", x, y, w, h, FALSE ); + window = fgCreateWindow( parent, "", x, y, w, h, GL_FALSE, GL_FALSE ); return window->ID; } @@ -601,7 +625,7 @@ void FGAPIENTRY glutDestroyWindow( int windowID ) freeglut_return_if_fail( window != NULL ); { fgExecutionState ExecState = fgState.ExecState; - fgAddToWindowDestroyList( window, TRUE ); + fgAddToWindowDestroyList( window ); fgState.ExecState = ExecState; } } @@ -625,7 +649,7 @@ void FGAPIENTRY glutSetWindow( int ID ) return; } - fgSetWindow( window ) ; + fgSetWindow( window ); } /* @@ -658,7 +682,7 @@ void FGAPIENTRY glutShowWindow( void ) #endif - fgStructure.Window->State.Redisplay = TRUE; + fgStructure.Window->State.Redisplay = GL_TRUE; } /* @@ -684,7 +708,7 @@ void FGAPIENTRY glutHideWindow( void ) #endif - fgStructure.Window->State.Redisplay = FALSE; + fgStructure.Window->State.Redisplay = GL_FALSE; } /* @@ -707,7 +731,7 @@ void FGAPIENTRY glutIconifyWindow( void ) #endif - fgStructure.Window->State.Redisplay = FALSE; + fgStructure.Window->State.Redisplay = GL_FALSE; } /* @@ -793,56 +817,9 @@ void FGAPIENTRY glutReshapeWindow( int width, int height ) freeglut_assert_ready; freeglut_assert_window; -#if TARGET_HOST_UNIX_X11 - - XResizeWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, - width, height ); - XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ - -#elif TARGET_HOST_WIN32 - - { - RECT winRect; - int x, y; - - GetWindowRect( fgStructure.Window->Window.Handle, &winRect ); - x = winRect.left; - y = winRect.top; - - if ( fgStructure.Window->Parent == NULL ) - { - /* - * Adjust the size of the window to allow for the size of the - * frame, if we are not a menu - */ - if ( ! fgStructure.Window->IsMenu ) - { - width += GetSystemMetrics( SM_CXSIZEFRAME ) * 2; - height += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 + - GetSystemMetrics( SM_CYCAPTION ); - } - } - else - { - GetWindowRect( fgStructure.Window->Parent->Window.Handle, - &winRect ); - x -= winRect.left + GetSystemMetrics( SM_CXSIZEFRAME ); - y -= winRect.top + GetSystemMetrics( SM_CYSIZEFRAME ) + - GetSystemMetrics( SM_CYCAPTION ); - } - - MoveWindow( - fgStructure.Window->Window.Handle, - x, - y, - width, - height, - TRUE - ); - } - -#endif - + fgStructure.Window->State.NeedToResize = GL_TRUE; + fgStructure.Window->State.Width = width ; + fgStructure.Window->State.Height = height; } /* @@ -948,7 +925,8 @@ void FGAPIENTRY glutFullScreen( void ) fgDisplay.ScreenWidth, fgDisplay.ScreenHeight ); - XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ + + XFlush( fgDisplay.Display ); /* This is needed */ XTranslateCoordinates( fgDisplay.Display, @@ -968,13 +946,39 @@ void FGAPIENTRY glutFullScreen( void ) } } #elif TARGET_HOST_WIN32 - MoveWindow( - fgStructure.Window->Window.Handle, - 0, 0, - fgDisplay.ScreenWidth, - fgDisplay.ScreenHeight, - TRUE - ); + { + RECT rect; + + /* For fullscreen mode, force the top-left corner to 0,0 + * and adjust the window rectangle so that the client area + * covers the whole screen. + */ + + rect.left = 0; + rect.top = 0; + rect.right = fgDisplay.ScreenWidth; + rect.bottom = fgDisplay.ScreenHeight; + + AdjustWindowRect ( &rect, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | + WS_CLIPCHILDREN, FALSE ); + + /* + * SWP_NOACTIVATE Do not activate the window + * SWP_NOOWNERZORDER Do not change position in z-order + * SWP_NOSENDCHANGING Supress WM_WINDOWPOSCHANGING message + * SWP_NOZORDER Retains the current Z order (ignore 2nd param) + */ + + SetWindowPos( fgStructure.Window->Window.Handle, + HWND_TOP, + rect.left, + rect.top, + rect.right - rect.left, + rect.bottom - rect.top, + SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING | + SWP_NOZORDER + ); + } #endif }