X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=c92fbcb8a7c3df59838003f1bb93afa9415e9148;hb=f8e9486689c8ca08cce53cf05a03826eabb1a0af;hp=9bc2513876ae0abbafecd2f180610ee2c9c6edf7;hpb=c3346073ddffc31ca77caba5a77507b867ff5fa4;p=freeglut diff --git a/src/freeglut_window.c b/src/freeglut_window.c index 9bc2513..c92fbcb 100644 --- a/src/freeglut_window.c +++ b/src/freeglut_window.c @@ -29,8 +29,6 @@ #include "config.h" #endif -#define G_LOG_DOMAIN "freeglut-window" - #include "../include/GL/freeglut.h" #include "freeglut_internal.h" @@ -68,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; @@ -85,7 +83,7 @@ XVisualInfo* fgChooseVisual( void ) if( fgState.DisplayMode & GLUT_INDEX ) { ATTRIB_VAL( GLX_BUFFER_SIZE, 8 ); - wantIndexedMode = TRUE; + wantIndexedMode = GL_TRUE; } else { @@ -123,7 +121,7 @@ XVisualInfo* fgChooseVisual( void ) */ ATTRIB( None ); - if( wantIndexedMode == FALSE ) + if( ! wantIndexedMode ) return glXChooseVisual( fgDisplay.Display, fgDisplay.Screen, attributes ); else @@ -164,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... @@ -206,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 @@ -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; @@ -249,7 +249,9 @@ void fgSetWindow ( SFG_Window *window ) * Opens a window. Requires a SFG_Window object created and attached * to the freeglut structure. OpenGL context is created here. */ -void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, int h, GLboolean gameMode, int isSubWindow ) +void fgOpenWindow( SFG_Window* window, const char* title, + int x, int y, int w, int h, + GLboolean gameMode, GLboolean isSubWindow ) { #if TARGET_HOST_UNIX_X11 XSetWindowAttributes winAttr; @@ -261,95 +263,82 @@ void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, i freeglut_assert_ready; /* - * Here we are upon the stage. Have the visual selected. + * XXX fgChooseVisual() is a common part of all three. + * 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(); + else { - /* - * If there isn't already an OpenGL rendering context for menu windows, make one - */ - if ( !fgStructure.MenuContext ) - { unsigned int current_DisplayMode = fgState.DisplayMode ; fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH ; window->Window.VisualInfo = fgChooseVisual(); fgState.DisplayMode = current_DisplayMode ; - } - else - window->Window.VisualInfo = fgChooseVisual(); } - else - window->Window.VisualInfo = fgChooseVisual(); if ( ! window->Window.VisualInfo ) { - /* - * The "fgChooseVisual" returned a null meaning that the visual context is not available. - * Try a couple of variations to see if they will work. - */ - if ( ! ( fgState.DisplayMode & GLUT_DOUBLE ) ) - { /* - * Single buffering--try it doubled + * The "fgChooseVisual" returned a null meaning that the visual + * context is not available. + * Try a couple of variations to see if they will work. + */ + if ( ! ( fgState.DisplayMode & GLUT_DOUBLE ) ) + { + fgState.DisplayMode |= GLUT_DOUBLE ; + 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. */ - fgState.DisplayMode |= GLUT_DOUBLE ; - window->Window.VisualInfo = fgChooseVisual(); - /* OK, we got a double-buffered window, but we only wanted - * single-buffered. Clear the double-buffer flag now. - */ - 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. - */ } assert( window->Window.VisualInfo != NULL ); /* - * Have the windows attributes set - * - * HINT: the masks should be updated when adding/removing callbacks. - * This might speed up message processing. Is that true? - */ - winAttr.event_mask = StructureNotifyMask | SubstructureNotifyMask | ExposureMask | - ButtonPressMask | ButtonReleaseMask | KeyPressMask | KeyRelease | - VisibilityChangeMask | EnterWindowMask | LeaveWindowMask | - PointerMotionMask | ButtonMotionMask; + * XXX HINT: the masks should be updated when adding/removing callbacks. + * XXX This might speed up message processing. Is that true? + * XXX + * XXX A: Not appreciably, but it WILL make it easier to debug. + * XXX Try tracing old GLUT and try tracing freeglut. Old GLUT + * XXX turns off events that it doesn't need and is a whole lot + * XXX more pleasant to trace. (Hint: Think mouse-motion!) + * XXX + * XXX It may make a difference in networked environments or on + * XXX some very slow systems, but I think that that is secondary + * XXX to making debugging easier. + */ + winAttr.event_mask = StructureNotifyMask | SubstructureNotifyMask | + ExposureMask | ButtonPressMask | ButtonReleaseMask | KeyPressMask | + KeyRelease | VisibilityChangeMask | EnterWindowMask | LeaveWindowMask | + PointerMotionMask | ButtonMotionMask; winAttr.background_pixmap = None; winAttr.background_pixel = 0; winAttr.border_pixel = 0; - /* - * The color map is required, too - */ winAttr.colormap = XCreateColormap( fgDisplay.Display, fgDisplay.RootWindow, window->Window.VisualInfo->visual, AllocNone ); - /* - * This tells the XCreateWindow() what attributes are we supplying it with - */ mask = CWBackPixmap | CWBorderPixel | CWColormap | CWEventMask; - /* - * If this is a menu window we want the window manager to ignore it. - */ - if ( fgState.BuildingAMenu ) + if ( window->IsMenu ) { winAttr.override_redirect = True; - mask |= CWOverrideRedirect; + mask |= CWOverrideRedirect; } - /* - * Have the window created now - */ window->Window.Handle = XCreateWindow( fgDisplay.Display, - window->Parent == NULL ? fgDisplay.RootWindow : window->Parent->Window.Handle, + window->Parent == NULL ? fgDisplay.RootWindow : + window->Parent->Window.Handle, x, y, w, h, 0, window->Window.VisualInfo->depth, InputOutput, window->Window.VisualInfo->visual, mask, @@ -360,28 +349,30 @@ void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, i * 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 windows, make one - */ - if ( !fgStructure.MenuContext ) - { - fgStructure.MenuContext = (SFG_MenuContext *)malloc ( sizeof(SFG_MenuContext) ) ; - fgStructure.MenuContext->VisualInfo = window->Window.VisualInfo ; - fgStructure.MenuContext->Context = glXCreateContext( - fgDisplay.Display, fgStructure.MenuContext->VisualInfo, - NULL, fgState.ForceDirectContext | fgState.TryDirectContext - ); - } + /* + * If there isn't already an OpenGL rendering context for menu + * windows, make one + */ + if ( !fgStructure.MenuContext ) + { + fgStructure.MenuContext = + (SFG_MenuContext *)malloc ( sizeof(SFG_MenuContext) ); + fgStructure.MenuContext->VisualInfo = window->Window.VisualInfo; + fgStructure.MenuContext->Context = glXCreateContext( + fgDisplay.Display, fgStructure.MenuContext->VisualInfo, + NULL, fgState.ForceDirectContext | fgState.TryDirectContext + ); + } /* window->Window.Context = fgStructure.MenuContext->Context ; */ - window->Window.Context = glXCreateContext( + window->Window.Context = glXCreateContext( fgDisplay.Display, window->Window.VisualInfo, NULL, fgState.ForceDirectContext | fgState.TryDirectContext ); } - else if ( fgState.UseCurrentContext == TRUE ) + else if ( fgState.UseCurrentContext ) { window->Window.Context = glXGetCurrentContext(); @@ -392,20 +383,16 @@ void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, i ); } else - window->Window.Context = glXCreateContext( - fgDisplay.Display, window->Window.VisualInfo, - NULL, fgState.ForceDirectContext | fgState.TryDirectContext - ); + window->Window.Context = glXCreateContext( + fgDisplay.Display, window->Window.VisualInfo, + NULL, fgState.ForceDirectContext | fgState.TryDirectContext + ); - /* - * Make sure the context is direct when the user wants it forced - */ - if( fgState.ForceDirectContext && !glXIsDirect( fgDisplay.Display, window->Window.Context ) ) - fgError( "unable to force direct context rendering for window '%s'", title ); + if( fgState.ForceDirectContext && + !glXIsDirect( fgDisplay.Display, window->Window.Context ) ) + fgError( "unable to force direct context rendering for window '%s'", + title ); - /* - * Set the new context as the current one. That's all about the window creation. - */ glXMakeCurrent( fgDisplay.Display, window->Window.Handle, @@ -413,39 +400,38 @@ void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, i ); /* - * Assume the new window is visible by default + * XXX Assume the new window is visible by default + * XXX Is this a safe assumption? */ - window->State.Visible = TRUE; + window->State.Visible = GL_TRUE; - /* - * For the position and size hints -- make sure we are passing valid values - */ sizeHints.flags = 0; - - if (fgState.Position.Use == TRUE) sizeHints.flags |= USPosition; - if (fgState.Size.Use == TRUE) sizeHints.flags |= USSize; + if ( fgState.Position.Use ) + sizeHints.flags |= USPosition; + if ( fgState.Size.Use ) + sizeHints.flags |= USSize; /* * Fill in the size hints values now (the x, y, width and height * settings are obsolote, are there any more WMs that support them?) + * Unless the X servers actually stop supporting these, we should + * continue to fill them in. It is *not* our place to tell the user + * that they should replace a window manager that they like, and which + * works, just because *we* think that it's not "modern" enough. */ - sizeHints.x = x; sizeHints.y = y; - sizeHints.width = w; sizeHints.height = h; + sizeHints.x = x; + sizeHints.y = y; + sizeHints.width = w; + sizeHints.height = h; - /* - * We can have forced all new windows start in iconified state: - */ 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... */ XStringListToTextProperty( (char **) &title, 1, &textProperty ); - /* - * Set the window's properties now - */ XSetWMProperties( fgDisplay.Display, window->Window.Handle, @@ -457,124 +443,103 @@ void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, i &wmHints, NULL ); - - /* - * Make sure we are informed about the window deletion commands - */ - XSetWMProtocols( fgDisplay.Display, window->Window.Handle, &fgDisplay.DeleteWindow, 1 ); - - /* - * Finally, have the window mapped to our display - */ + XSetWMProtocols( fgDisplay.Display, window->Window.Handle, + &fgDisplay.DeleteWindow, 1 ); XMapWindow( fgDisplay.Display, window->Window.Handle ); #elif TARGET_HOST_WIN32 - WNDCLASS wc; - int flags; - ATOM atom; + WNDCLASS wc; + int flags; + 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 == FALSE ) + + /* + * Grab the window class we have registered on glutInit(): + */ + atom = GetClassInfo( fgDisplay.Instance, "FREEGLUT", &wc ); + assert( atom != 0 ); + + if( gameMode ) { - if ( ( !isSubWindow ) && ( ! window->IsMenu ) ) - { + assert( window->Parent == NULL ); + /* - * Update the window dimensions, taking account of window decorations. - * "freeglut" is to create the window with the outside of its border at (x,y) - * and with dimensions (w,h). + * Set the window creation flags appropriately to make the window + * entirely visible: */ - w += (GetSystemMetrics( SM_CXSIZEFRAME ) )*2; - h += (GetSystemMetrics( SM_CYSIZEFRAME ) )*2 + GetSystemMetrics( SM_CYCAPTION ); - } - - /* - * Check if the user wants us to use the default position/size - */ - if( fgState.Position.Use == FALSE ) { x = CW_USEDEFAULT; y = CW_USEDEFAULT; } - if( fgState.Size .Use == FALSE ) { w = CW_USEDEFAULT; h = CW_USEDEFAULT; } - - /* - * There's a small difference between creating the top, child and game mode windows - */ - flags = WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE; - - /* - * If we're a menu, set our flags to include WS_POPUP to remove decorations - */ - if ( window->IsMenu ) - flags |= WS_POPUP ; - else if( window->Parent == NULL ) - flags |= WS_OVERLAPPEDWINDOW; - else - flags |= WS_CHILD; + flags = WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE; } else { - /* - * In game mode, the story is a little bit different... - */ - assert( window->Parent == NULL ); + if ( ( ! isSubWindow ) && ( ! window->IsMenu ) ) + { + /* + * Update the window dimensions, taking account of window + * decorations. "freeglut" is to create the window with the + * outside of its border at (x,y) and with dimensions (w,h). + */ + w += (GetSystemMetrics( SM_CXSIZEFRAME ) )*2; + h += (GetSystemMetrics( SM_CYSIZEFRAME ) )*2 + + GetSystemMetrics( SM_CYCAPTION ); + } + + if( ! fgState.Position.Use ) + { + x = CW_USEDEFAULT; + y = CW_USEDEFAULT; + } + if( ! fgState.Size.Use ) + { + w = CW_USEDEFAULT; + h = CW_USEDEFAULT; + } /* - * Set the window creation flags appropriately to make the window entirely visible: + * There's a small difference between creating the top, child and + * game mode windows */ - flags = WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE; + flags = WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE; + + if ( window->IsMenu ) + flags |= WS_POPUP ; + else if( window->Parent == NULL ) + flags |= WS_OVERLAPPEDWINDOW; + else + flags |= WS_CHILD; } - /* - * Create the window now, passing the freeglut window structure as the parameter - */ - window->Window.Handle = CreateWindow( - "FREEGLUT", + window->Window.Handle = CreateWindow( + "FREEGLUT", title, - flags, + flags, x, y, w, h, - (HWND) window->Parent == NULL ? NULL : window->Parent->Window.Handle, - (HMENU) NULL, - fgDisplay.Instance, - (LPVOID) window - ); - - /* - * Make sure window was created - */ - assert( window->Window.Handle != NULL ); + (HWND) window->Parent == NULL ? NULL : window->Parent->Window.Handle, + (HMENU) NULL, + fgDisplay.Instance, + (LPVOID) window + ); + if( !( window->Window.Handle ) ) + fgError( "Failed to create a window (%s)!", title ); - /* - * Show and update the main window. Hide the mouse cursor. - */ - ShowWindow( window->Window.Handle, fgState.ForceIconic ? SW_SHOWMINIMIZED : SW_SHOW ); + ShowWindow( window->Window.Handle, + fgState.ForceIconic ? SW_SHOWMINIMIZED : SW_SHOW ); UpdateWindow( window->Window.Handle ); - ShowCursor( TRUE ); + ShowCursor( TRUE ); /* XXX Old comments say "hide cusror"! */ #endif - /* - * Save the window's single- or double-buffering state - */ - window->Window.DoubleBuffered = ( fgState.DisplayMode & GLUT_DOUBLE ) ? 1 : 0 ; + fgSetWindow( window ); + + window->Window.DoubleBuffered = + ( fgState.DisplayMode & GLUT_DOUBLE ) ? 1 : 0; - /* - * If it's not double-buffered, make sure the rendering is done to the front buffer. - */ if ( ! window->Window.DoubleBuffered ) { - glDrawBuffer ( GL_FRONT ) ; - glReadBuffer ( GL_FRONT ) ; + glDrawBuffer ( GL_FRONT ); + glReadBuffer ( GL_FRONT ); } - - /* - * Set the newly created window as the current one - */ - fgSetWindow( window ); } /* @@ -585,32 +550,41 @@ void fgCloseWindow( SFG_Window* window ) freeglut_assert_ready; #if TARGET_HOST_UNIX_X11 - /* - * As easy as kill bunnies with axes. Destroy the context first: - */ + glXDestroyContext( fgDisplay.Display, window->Window.Context ); + XDestroyWindow( fgDisplay.Display, window->Window.Handle ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ + +#elif TARGET_HOST_WIN32 /* - * Then have the window killed: + * Make sure we don't close a window with current context active */ - XDestroyWindow( fgDisplay.Display, window->Window.Handle ); + if( fgStructure.Window == window ) + wglMakeCurrent( NULL, NULL ); /* - * Finally, flush the rests down the stream + * Step through the list of windows. If the rendering context + * is not being used by another window, then we delete it. */ - XFlush( fgDisplay.Display ); + { + int used = FALSE ; + SFG_Window *iter ; -#elif TARGET_HOST_WIN32 - /* - * Send the WM_CLOSE message to the window now - */ - SendMessage( - window->Window.Handle, - WM_CLOSE, - 0, - 0 - ); + 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 } @@ -622,11 +596,9 @@ void fgCloseWindow( SFG_Window* window ) */ int FGAPIENTRY glutCreateWindow( const char* title ) { - /* - * Create a new window and return its unique ID number - */ - return( fgCreateWindow( NULL, title, fgState.Position.X, fgState.Position.Y, - fgState.Size.X, fgState.Size.Y, FALSE )->ID ); + return fgCreateWindow( NULL, title, fgState.Position.X, fgState.Position.Y, + fgState.Size.X, fgState.Size.Y, GL_FALSE, + GL_FALSE )->ID; } /* @@ -638,26 +610,10 @@ int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h ) SFG_Window* parent = NULL; freeglut_assert_ready; - - /* - * Find a parent to the newly created window... - */ parent = fgWindowByID( parentID ); - - /* - * Fail if the parent has not been found - */ freeglut_return_val_if_fail( parent != NULL, 0 ); - - /* - * Create the new window - */ - window = fgCreateWindow( parent, "", x, y, w, h, FALSE ); - - /* - * Return the new window's ID - */ - return( window->ID ); + window = fgCreateWindow( parent, "", x, y, w, h, GL_FALSE, GL_FALSE ); + return window->ID; } /* @@ -665,25 +621,13 @@ int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h ) */ void FGAPIENTRY glutDestroyWindow( int windowID ) { - fgExecutionState ExecState = fgState.ExecState ; - - /* - * Grab the freeglut window pointer from the structure - */ - SFG_Window* window = fgWindowByID( windowID ); - freeglut_return_if_fail( window != NULL ); - - /* - * There is a function that performs all needed steps - * defined in freeglut_structure.c. Let's use it: - */ - fgAddToWindowDestroyList( window, TRUE ); - - /* - * Since the "fgAddToWindowDestroyList" function could easily have set the "ExecState" - * to stop, let's set it back to what it was. - */ - fgState.ExecState = ExecState ; + SFG_Window* window = fgWindowByID( windowID ); + freeglut_return_if_fail( window != NULL ); + { + fgExecutionState ExecState = fgState.ExecState; + fgAddToWindowDestroyList( window ); + fgState.ExecState = ExecState; + } } /* @@ -693,36 +637,19 @@ void FGAPIENTRY glutSetWindow( int ID ) { SFG_Window* window = NULL; - /* - * Make sure we don't get called too early - */ freeglut_assert_ready; - - /* - * Be wise. Be wise. Be wise. Be quick. - */ if( fgStructure.Window != NULL ) if( fgStructure.Window->ID == ID ) return; - /* - * Now we are sure there is sense in looking for the window - */ window = fgWindowByID( ID ); - - /* - * In the case of an utter failure... - */ if( window == NULL ) { - /* - * ...issue a warning message and keep rolling on - */ fgWarning( "glutSetWindow(): window ID %i not found!", ID ); return; } - fgSetWindow ( window ) ; + fgSetWindow( window ); } /* @@ -731,22 +658,9 @@ void FGAPIENTRY glutSetWindow( int ID ) int FGAPIENTRY glutGetWindow( void ) { freeglut_assert_ready; - - /* - * Do we have a current window selected? - */ if( fgStructure.Window == NULL ) - { - /* - * Nope. Return zero to mark the state. - */ - return( 0 ); - } - - /* - * Otherwise, return the ID of the current window - */ - return( fgStructure.Window->ID ); + return 0; + return fgStructure.Window->ID; } /* @@ -754,28 +668,21 @@ int FGAPIENTRY glutGetWindow( void ) */ void FGAPIENTRY glutShowWindow( void ) { - freeglut_assert_ready; freeglut_assert_window; + freeglut_assert_ready; + freeglut_assert_window; #if TARGET_HOST_UNIX_X11 - /* - * Showing the window is done via mapping under X - */ + XMapWindow( fgDisplay.Display, fgStructure.Window->Window.Handle ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 - /* - * Restore the window's originial position and size - */ - ShowWindow( fgStructure.Window->Window.Handle, SW_SHOW ); -#endif + ShowWindow( fgStructure.Window->Window.Handle, SW_SHOW ); - /* - * Since the window is visible, we need to redisplay it ... - */ - fgStructure.Window->State.Redisplay = TRUE; +#endif + fgStructure.Window->State.Redisplay = GL_TRUE; } /* @@ -783,45 +690,25 @@ void FGAPIENTRY glutShowWindow( void ) */ void FGAPIENTRY glutHideWindow( void ) { - freeglut_assert_ready; freeglut_assert_window; + freeglut_assert_ready; + freeglut_assert_window; #if TARGET_HOST_UNIX_X11 - /* - * The way we hide a window depends on if we're dealing - * with a top-level or children one... - */ + if( fgStructure.Window->Parent == NULL ) - { - /* - * This is a top-level window - */ - XWithdrawWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, fgDisplay.Screen ); - } + XWithdrawWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, + fgDisplay.Screen ); else - { - /* - * Nope, it's a child window - */ XUnmapWindow( fgDisplay.Display, fgStructure.Window->Window.Handle ); - } - - /* - * Flush the X state now - */ - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 - /* - * Hide the window - */ - ShowWindow( fgStructure.Window->Window.Handle, SW_HIDE ); + + ShowWindow( fgStructure.Window->Window.Handle, SW_HIDE ); #endif - /* - * Since the window is hidden, we don't need to redisplay it ... - */ - fgStructure.Window->State.Redisplay = FALSE; + fgStructure.Window->State.Redisplay = GL_FALSE; } /* @@ -829,28 +716,22 @@ void FGAPIENTRY glutHideWindow( void ) */ void FGAPIENTRY glutIconifyWindow( void ) { - freeglut_assert_ready; freeglut_assert_window; + freeglut_assert_ready; + freeglut_assert_window; #if TARGET_HOST_UNIX_X11 - /* - * Iconify the window and flush the X state - */ - XIconifyWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, fgDisplay.Screen ); - XFlush( fgDisplay.Display ); + + XIconifyWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, + fgDisplay.Screen ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 - /* - * Minimize the current window (this should be the same as X window iconifying) - */ - ShowWindow( fgStructure.Window->Window.Handle, SW_MINIMIZE ); -#endif + ShowWindow( fgStructure.Window->Window.Handle, SW_MINIMIZE ); - /* - * Since the window is just an icon, we don't need to redisplay it ... - */ - fgStructure.Window->State.Redisplay = FALSE; +#endif + fgStructure.Window->State.Redisplay = GL_FALSE; } /* @@ -858,48 +739,36 @@ void FGAPIENTRY glutIconifyWindow( void ) */ void FGAPIENTRY glutSetWindowTitle( const char* title ) { - freeglut_assert_ready; freeglut_assert_window; - - /* - * Works only for top-level windows - */ + freeglut_assert_ready; + freeglut_assert_window; if( fgStructure.Window->Parent != NULL ) return; #if TARGET_HOST_UNIX_X11 - { - XTextProperty text; - - /* - * Prepare the text properties - */ - text.value = (unsigned char *) title; - text.encoding = XA_STRING; - text.format = 8; - text.nitems = strlen( title ); - - /* - * Set the title now - */ - XSetWMName( - fgDisplay.Display, - fgStructure.Window->Window.Handle, - &text - ); - - /* - * Have the X display state flushed - */ - XFlush( fgDisplay.Display ); - } + + { + 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 - /* - * This seems to be a bit easier under Win32 - */ - SetWindowText( fgStructure.Window->Window.Handle, title ); + + SetWindowText( fgStructure.Window->Window.Handle, title ); #endif + } /* @@ -907,48 +776,37 @@ void FGAPIENTRY glutSetWindowTitle( const char* title ) */ void FGAPIENTRY glutSetIconTitle( const char* title ) { - freeglut_assert_ready; freeglut_assert_window; + freeglut_assert_ready; + freeglut_assert_window; - /* - * Works only for top-level windows - */ if( fgStructure.Window->Parent != NULL ) return; #if TARGET_HOST_UNIX_X11 - { - XTextProperty text; - - /* - * Prepare the text properties - */ - text.value = (unsigned char *) title; - text.encoding = XA_STRING; - text.format = 8; - text.nitems = strlen( title ); - - /* - * Set the title now - */ - XSetWMIconName( - fgDisplay.Display, - fgStructure.Window->Window.Handle, - &text - ); - - /* - * Have the X display state flushed - */ - XFlush( fgDisplay.Display ); - } + + { + XTextProperty text; + + text.value = (unsigned char *) title; + text.encoding = XA_STRING; + text.format = 8; + text.nitems = strlen( title ); + + XSetWMIconName( + fgDisplay.Display, + fgStructure.Window->Window.Handle, + &text + ); + + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ + } #elif TARGET_HOST_WIN32 - /* - * This seems to be a bit easier under Win32 - */ - SetWindowText( fgStructure.Window->Window.Handle, title ); + + SetWindowText( fgStructure.Window->Window.Handle, title ); #endif + } /* @@ -956,58 +814,12 @@ void FGAPIENTRY glutSetIconTitle( const char* title ) */ void FGAPIENTRY glutReshapeWindow( int width, int height ) { - freeglut_assert_ready; freeglut_assert_window; - -#if TARGET_HOST_UNIX_X11 - /* - * Resize the window and flush the X state - */ - XResizeWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, width, height ); - XFlush( fgDisplay.Display ); - -#elif TARGET_HOST_WIN32 - { - RECT winRect; - int x, y ; - - /* - * First off, grab the current window's position - */ - GetWindowRect( fgStructure.Window->Window.Handle, &winRect ); - x = winRect.left ; - y = winRect.top ; - - if ( fgStructure.Window->Parent == NULL ) /* If this is not a subwindow ... */ - { - /* - * 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 /* This is a subwindow, get the parent window's position and subtract it off */ - { - GetWindowRect ( fgStructure.Window->Parent->Window.Handle, &winRect ) ; - x -= winRect.left + GetSystemMetrics( SM_CXSIZEFRAME ) ; - y -= winRect.top + GetSystemMetrics( SM_CYSIZEFRAME ) + GetSystemMetrics( SM_CYCAPTION ) ; - } + freeglut_assert_ready; + freeglut_assert_window; - /* - * Resize the window, forcing a redraw to happen - */ - 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; } /* @@ -1015,38 +827,32 @@ void FGAPIENTRY glutReshapeWindow( int width, int height ) */ void FGAPIENTRY glutPositionWindow( int x, int y ) { - freeglut_assert_ready; freeglut_assert_window; + freeglut_assert_ready; + freeglut_assert_window; #if TARGET_HOST_UNIX_X11 - /* - * Reposition the window and flush the X state - */ + XMoveWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, x, y ); - XFlush( fgDisplay.Display ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ #elif TARGET_HOST_WIN32 - { - RECT winRect; - /* - * First off, grab the current window's position - */ - GetWindowRect( fgStructure.Window->Window.Handle, &winRect ); - - /* - * Reposition the window, forcing a redraw to happen - */ - MoveWindow( - fgStructure.Window->Window.Handle, - x, - y, - winRect.right - winRect.left, - winRect.bottom - winRect.top, - TRUE - ); - } + { + RECT winRect; + + GetWindowRect( fgStructure.Window->Window.Handle, &winRect ); + MoveWindow( + fgStructure.Window->Window.Handle, + x, + y, + winRect.right - winRect.left, + winRect.bottom - winRect.top, + TRUE + ); + } #endif + } /* @@ -1054,26 +860,24 @@ void FGAPIENTRY glutPositionWindow( int x, int y ) */ void FGAPIENTRY glutPushWindow( void ) { - freeglut_assert_ready; freeglut_assert_window; + freeglut_assert_ready; + freeglut_assert_window; #if TARGET_HOST_UNIX_X11 - /* - * Lower the current window - */ + XLowerWindow( fgDisplay.Display, fgStructure.Window->Window.Handle ); #elif TARGET_HOST_WIN32 - /* - * Set the new window's Z position, not affecting the rest of the settings: - */ - SetWindowPos( - fgStructure.Window->Window.Handle, - HWND_BOTTOM, - 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE - ); + + SetWindowPos( + fgStructure.Window->Window.Handle, + HWND_BOTTOM, + 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE + ); #endif + } /* @@ -1081,26 +885,24 @@ void FGAPIENTRY glutPushWindow( void ) */ void FGAPIENTRY glutPopWindow( void ) { - freeglut_assert_ready; freeglut_assert_window; + freeglut_assert_ready; + freeglut_assert_window; #if TARGET_HOST_UNIX_X11 - /* - * Raise the current window - */ + XRaiseWindow( fgDisplay.Display, fgStructure.Window->Window.Handle ); #elif TARGET_HOST_WIN32 - /* - * Set the new window's Z position, not affecting the rest of the settings: - */ - SetWindowPos( - fgStructure.Window->Window.Handle, - HWND_TOP, - 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE - ); + + SetWindowPos( + fgStructure.Window->Window.Handle, + HWND_TOP, + 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE + ); #endif + } /* @@ -1108,7 +910,8 @@ void FGAPIENTRY glutPopWindow( void ) */ void FGAPIENTRY glutFullScreen( void ) { - freeglut_assert_ready; freeglut_assert_window; + freeglut_assert_ready; + freeglut_assert_window; #if TARGET_HOST_UNIX_X11 { @@ -1122,7 +925,8 @@ void FGAPIENTRY glutFullScreen( void ) fgDisplay.ScreenWidth, fgDisplay.ScreenHeight ); - XFlush( fgDisplay.Display ); + + XFlush( fgDisplay.Display ); /* This is needed */ XTranslateCoordinates( fgDisplay.Display, @@ -1138,17 +942,43 @@ 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 - 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 } @@ -1157,12 +987,12 @@ void FGAPIENTRY glutFullScreen( void ) */ void* FGAPIENTRY glutGetWindowData( void ) { - return(fgStructure.Window->UserData); + return fgStructure.Window->UserData; } void FGAPIENTRY glutSetWindowData(void* data) { - fgStructure.Window->UserData=data; + fgStructure.Window->UserData=data; } /*** END OF FILE ***/