X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=5ba9cc5134092602d36a5fd8731001f4647f62b0;hb=cb35752f171cdd1ee2319194c890d86bc6242259;hp=7ad95d4b4d5e8fe1f4d90206b5deb4a5748a7279;hpb=538792b90980b2d9304f1e1992c6f7bb683ff537;p=freeglut diff --git a/src/freeglut_window.c b/src/freeglut_window.c index 7ad95d4..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); @@ -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; @@ -415,6 +409,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) ); +#if !defined( __FreeBSD__ ) && !defined( __NetBSD__ ) if( !glXIsDirect( fgDisplay.Display, window->Window.Context ) ) { if( fgState.DirectContext == GLUT_FORCE_DIRECT_CONTEXT ) @@ -424,6 +419,13 @@ void fgOpenWindow( SFG_Window* window, const char* title, fgWarning( "Unable to create direct context rendering for window '%s'\nThis may hurt performance.", title ); } +#endif + + glXMakeCurrent( + fgDisplay.Display, + window->Window.Handle, + window->Window.Context + ); /* * XXX Assume the new window is visible by default @@ -439,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; @@ -459,9 +461,7 @@ void fgOpenWindow( SFG_Window* window, const char* title, 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( @@ -479,12 +479,6 @@ void fgOpenWindow( SFG_Window* window, const char* title, XSetWMProtocols( fgDisplay.Display, window->Window.Handle, &fgDisplay.DeleteWindow, 1 ); - glXMakeCurrent( - fgDisplay.Display, - window->Window.Handle, - window->Window.Context - ); - XMapWindow( fgDisplay.Display, window->Window.Handle ); #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE @@ -496,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 ); @@ -560,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"), @@ -638,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 ); @@ -688,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; @@ -730,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; } @@ -854,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 ); @@ -897,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 ); @@ -939,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,