X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=5ba9cc5134092602d36a5fd8731001f4647f62b0;hb=cb35752f171cdd1ee2319194c890d86bc6242259;hp=9ede7456d7805eb9e43b8cf54b4024ca75fe225b;hpb=c4ffff1de4b14af7f0efb231f476961c21f3f552;p=freeglut diff --git a/src/freeglut_window.c b/src/freeglut_window.c index 9ede745..5ba9cc5 100644 --- a/src/freeglut_window.c +++ b/src/freeglut_window.c @@ -36,7 +36,7 @@ #include #pragma comment( lib, "Aygshell.lib" ) -wchar_t* wstr_from_str(const char* str) +static wchar_t* fghWstrFromStr(const char* str) { int i,len=strlen(str); wchar_t* wstr = (wchar_t*)malloc(2*len+2); @@ -47,7 +47,7 @@ wchar_t* wstr_from_str(const char* str) } -#endif //TARGET_HOST_WINCE +#endif /* TARGET_HOST_WINCE */ /* * TODO BEFORE THE STABLE RELEASE: @@ -87,12 +87,10 @@ XVisualInfo* fgChooseVisual( void ) int attributes[ 32 ]; int where = 0; - /* - * First we have to process the display mode settings... - */ + /* First we have to process the display mode settings... */ /* - * Why is there a semi-colon in this #define? The code - * that uses the macro seems to always add more semicolons... + * XXX Why is there a semi-colon in this #define? The code + * XXX that uses the macro seems to always add more semicolons... */ #define ATTRIB(a) attributes[where++]=a; #define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);} @@ -133,9 +131,7 @@ XVisualInfo* fgChooseVisual( void ) ATTRIB_VAL( GLX_ACCUM_ALPHA_SIZE, 1 ); } - /* - * Push a null at the end of the list - */ + /* Push a null at the end of the list */ ATTRIB( None ); if( ! wantIndexedMode ) @@ -186,9 +182,7 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, #pragma message( "fgSetupPixelFormat(): there is still some work to do here!" ) #endif - /* - * Specify which pixel format do we opt for... - */ + /* Specify which pixel format do we opt for... */ pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR); pfd.nVersion = 1; pfd.dwFlags = flags; @@ -231,7 +225,7 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, if( checkOnly ) return GL_TRUE; return SetPixelFormat( window->Window.Device, pixelformat, ppfd ); -#endif //TARGET_HOST_WINCE +#endif /* TARGET_HOST_WINCE */ } #endif @@ -389,14 +383,14 @@ void fgOpenWindow( SFG_Window* window, const char* title, fgStructure.MenuContext->VisualInfo = window->Window.VisualInfo; fgStructure.MenuContext->Context = glXCreateContext( fgDisplay.Display, fgStructure.MenuContext->VisualInfo, - NULL, fgState.ForceDirectContext | fgState.TryDirectContext + NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) ); } /* window->Window.Context = fgStructure.MenuContext->Context; */ window->Window.Context = glXCreateContext( fgDisplay.Display, window->Window.VisualInfo, - NULL, fgState.ForceDirectContext | fgState.TryDirectContext + NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) ); } else if( fgState.UseCurrentContext ) @@ -406,19 +400,26 @@ void fgOpenWindow( SFG_Window* window, const char* title, if( ! window->Window.Context ) window->Window.Context = glXCreateContext( fgDisplay.Display, window->Window.VisualInfo, - NULL, fgState.ForceDirectContext | fgState.TryDirectContext + NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) ); } else window->Window.Context = glXCreateContext( fgDisplay.Display, window->Window.VisualInfo, - NULL, fgState.ForceDirectContext | fgState.TryDirectContext + NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) ); - if( fgState.ForceDirectContext && - !glXIsDirect( fgDisplay.Display, window->Window.Context ) ) - fgError( "unable to force direct context rendering for window '%s'", +#if !defined( __FreeBSD__ ) && !defined( __NetBSD__ ) + if( !glXIsDirect( fgDisplay.Display, window->Window.Context ) ) + { + if( fgState.DirectContext == GLUT_FORCE_DIRECT_CONTEXT ) + fgError( "Unable to force direct context rendering for window '%s'", title ); + else if( fgState.DirectContext == GLUT_TRY_DIRECT_CONTEXT ) + fgWarning( "Unable to create direct context rendering for window '%s'\nThis may hurt performance.", + title ); + } +#endif glXMakeCurrent( fgDisplay.Display, @@ -440,13 +441,13 @@ void fgOpenWindow( SFG_Window* window, const char* title, /* * Fill in the size hints values now (the x, y, width and height - * settings are obsolote, are there any more WMs that support them?) + * settings are obsolete, 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. */ -#if TARGET_HOST_WINCE +#if TARGET_HOST_WINCE /* Since this is in the X11 branch, it's pretty dumb */ sizeHints.x = 0; sizeHints.y = 0; sizeHints.width = 320; @@ -456,13 +457,11 @@ void fgOpenWindow( SFG_Window* window, const char* title, sizeHints.y = y; sizeHints.width = w; sizeHints.height = h; -#endif //TARGET_HOST_WINCE +#endif /* TARGET_HOST_WINCE */ wmHints.flags = StateHint; wmHints.initial_state = fgState.ForceIconic ? IconicState : NormalState; - /* - * Prepare the window and iconified window names... - */ + /* Prepare the window and iconified window names... */ XStringListToTextProperty( (char **) &title, 1, &textProperty ); XSetWMProperties( @@ -491,9 +490,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, freeglut_assert_ready; - /* - * Grab the window class we have registered on glutInit(): - */ + /* Grab the window class we have registered on glutInit(): */ atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc ); assert( atom != 0 ); @@ -521,7 +518,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, h += (GetSystemMetrics( SM_CYSIZEFRAME ) )*2 + GetSystemMetrics( SM_CYCAPTION ); } -#endif //TARGET_HOST_WINCE +#endif /* TARGET_HOST_WINCE */ if( ! fgState.Position.Use ) { @@ -555,7 +552,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, #if TARGET_HOST_WINCE { - wchar_t* wstr = wstr_from_str(title); + wchar_t* wstr = fghWstrFromStr(title); window->Window.Handle = CreateWindow( _T("FREEGLUT"), @@ -589,7 +586,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, fgDisplay.Instance, (LPVOID) window ); -#endif TARGET_HOST_WINCE +#endif /* TARGET_HOST_WINCE */ if( !( window->Window.Handle ) ) fgError( "Failed to create a window (%s)!", title ); @@ -599,7 +596,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, #else ShowWindow( window->Window.Handle, fgState.ForceIconic ? SW_SHOWMINIMIZED : SW_SHOW ); -#endif //TARGET_HOST_WINCE +#endif /* TARGET_HOST_WINCE */ UpdateWindow( window->Window.Handle ); ShowCursor( TRUE ); /* XXX Old comments say "hide cusror"! */ @@ -633,9 +630,7 @@ void fgCloseWindow( SFG_Window* window ) #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE - /* - * Make sure we don't close a window with current context active - */ + /* Make sure we don't close a window with current context active */ if( fgStructure.Window == window ) wglMakeCurrent( NULL, NULL ); @@ -683,7 +678,6 @@ int FGAPIENTRY glutCreateWindow( const char* title ) int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h ) { int ret = 0; - SFG_Window* window = NULL; SFG_Window* parent = NULL; @@ -725,7 +719,7 @@ void FGAPIENTRY glutSetWindow( int ID ) window = fgWindowByID( ID ); if( window == NULL ) { - fgWarning( "glutSetWindow(): window ID %i not found!", ID ); + fgWarning( "glutSetWindow(): window ID %d not found!", ID ); return; } @@ -849,7 +843,7 @@ void FGAPIENTRY glutSetWindowTitle( const char* title ) #elif TARGET_HOST_WINCE { - wchar_t* wstr = wstr_from_str(title); + wchar_t* wstr = fghWstrFromStr(title); SetWindowText( fgStructure.Window->Window.Handle, wstr ); @@ -892,7 +886,7 @@ void FGAPIENTRY glutSetIconTitle( const char* title ) #elif TARGET_HOST_WINCE { - wchar_t* wstr = wstr_from_str(title); + wchar_t* wstr = fghWstrFromStr(title); SetWindowText( fgStructure.Window->Window.Handle, wstr ); @@ -934,6 +928,7 @@ void FGAPIENTRY glutPositionWindow( int x, int y ) { RECT winRect; + /* "GetWindowRect" returns the pixel coordinates of the outside of the window */ GetWindowRect( fgStructure.Window->Window.Handle, &winRect ); MoveWindow( fgStructure.Window->Window.Handle,