#include <aygshell.h>
#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);
for(i=0; i<len; i++)
wstr[i] = str[i];
wstr[len] = 0;
- return wstr;
+ return wstr;
}
-#endif //TARGET_HOST_WINCE
+#endif /* TARGET_HOST_WINCE */
/*
* TODO BEFORE THE STABLE RELEASE:
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);}
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 )
unsigned char layer_type )
{
#if TARGET_HOST_WINCE
- return GL_TRUE;
+ return GL_TRUE;
#else
PIXELFORMATDESCRIPTOR* ppfd, pfd;
int flags, pixelformat;
#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;
if( checkOnly )
return GL_TRUE;
return SetPixelFormat( window->Window.Device, pixelformat, ppfd );
-#endif //TARGET_HOST_WINCE
+#endif /* TARGET_HOST_WINCE */
}
#endif
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 )
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,
/*
* 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;
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(
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 );
h += (GetSystemMetrics( SM_CYSIZEFRAME ) )*2 +
GetSystemMetrics( SM_CYCAPTION );
}
-#endif //TARGET_HOST_WINCE
+#endif /* TARGET_HOST_WINCE */
if( ! fgState.Position.Use )
{
}
#if TARGET_HOST_WINCE
- {
- wchar_t* wstr = wstr_from_str(title);
-
- window->Window.Handle = CreateWindow(
- _T("FREEGLUT"),
- wstr,
- WS_VISIBLE | WS_POPUP,
- 0,0, 240,320,
- NULL,
- NULL,
- fgDisplay.Instance,
- (LPVOID) window
- );
-
- free(wstr);
-
- SHFullScreen(window->Window.Handle, SHFS_HIDESTARTICON);
- SHFullScreen(window->Window.Handle, SHFS_HIDESIPBUTTON);
- SHFullScreen(window->Window.Handle, SHFS_HIDETASKBAR);
- MoveWindow(window->Window.Handle, 0, 0, 240, 320, TRUE);
- ShowWindow(window->Window.Handle, SW_SHOW);
- UpdateWindow(window->Window.Handle);
- }
+ {
+ wchar_t* wstr = fghWstrFromStr(title);
+
+ window->Window.Handle = CreateWindow(
+ _T("FREEGLUT"),
+ wstr,
+ WS_VISIBLE | WS_POPUP,
+ 0,0, 240,320,
+ NULL,
+ NULL,
+ fgDisplay.Instance,
+ (LPVOID) window
+ );
+
+ free(wstr);
+
+ SHFullScreen(window->Window.Handle, SHFS_HIDESTARTICON);
+ SHFullScreen(window->Window.Handle, SHFS_HIDESIPBUTTON);
+ SHFullScreen(window->Window.Handle, SHFS_HIDETASKBAR);
+ MoveWindow(window->Window.Handle, 0, 0, 240, 320, TRUE);
+ ShowWindow(window->Window.Handle, SW_SHOW);
+ UpdateWindow(window->Window.Handle);
+ }
#else
window->Window.Handle = CreateWindowEx(
exFlags,
fgDisplay.Instance,
(LPVOID) window
);
-#endif TARGET_HOST_WINCE
+#endif /* TARGET_HOST_WINCE */
if( !( window->Window.Handle ) )
fgError( "Failed to create a window (%s)!", 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"! */
#if TARGET_HOST_UNIX_X11
glXDestroyContext( fgDisplay.Display, window->Window.Context );
- glXDestroyGLXPixmap( fgDisplay.Display, window->Window.Handle );
- XFreePixmap( fgDisplay.Display, window->Window.Pixmap );
-
+ XDestroyWindow( fgDisplay.Display, window->Window.Handle );
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
#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 );
int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h )
{
int ret = 0;
-
SFG_Window* window = NULL;
SFG_Window* parent = NULL;
window = fgWindowByID( ID );
if( window == NULL )
{
- fgWarning( "glutSetWindow(): window ID %i not found!", ID );
+ fgWarning( "glutSetWindow(): window ID %d not found!", ID );
return;
}
SetWindowText( fgStructure.Window->Window.Handle, title );
#elif TARGET_HOST_WINCE
- {
- wchar_t* wstr = wstr_from_str(title);
+ {
+ wchar_t* wstr = fghWstrFromStr(title);
- SetWindowText( fgStructure.Window->Window.Handle, wstr );
+ SetWindowText( fgStructure.Window->Window.Handle, wstr );
- free(wstr);
- }
+ free(wstr);
+ }
#endif
}
}
SetWindowText( fgStructure.Window->Window.Handle, title );
#elif TARGET_HOST_WINCE
- {
- wchar_t* wstr = wstr_from_str(title);
+ {
+ wchar_t* wstr = fghWstrFromStr(title);
- SetWindowText( fgStructure.Window->Window.Handle, wstr );
+ SetWindowText( fgStructure.Window->Window.Handle, wstr );
- free(wstr);
- }
+ free(wstr);
+ }
#endif
}
}
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
-
+
{
RECT winRect;
+ /* "GetWindowRect" returns the pixel coordinates of the outside of the window */
GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
MoveWindow(
fgStructure.Window->Window.Handle,
projects / freeglut / blobdiff