* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#define FREEGLUT_BUILDING_LIB
#include <GL/freeglut.h>
#include "freeglut_internal.h"
-#if TARGET_HOST_WINCE
-#include <aygshell.h>
-#pragma comment( lib, "Aygshell.lib" )
+#if TARGET_HOST_POSIX_X11
+#include <limits.h> /* LONG_MAX */
+#endif
+
+#if defined(_WIN32_WCE)
+# include <Aygshell.h>
+# ifdef FREEGLUT_LIB_PRAGMAS
+# pragma comment( lib, "Aygshell.lib" )
+# endif
-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);
return wstr;
}
-
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
/*
* TODO BEFORE THE STABLE RELEASE:
*
- * fgChooseVisual() -- OK, but what about glutInitDisplayString()?
+ * fgChooseFBConfig() -- OK, but what about glutInitDisplayString()?
* fgSetupPixelFormat -- ignores the display mode settings
* fgOpenWindow() -- check the Win32 version, -iconic handling!
* fgCloseWindow() -- check the Win32 version
/*
* Chooses a visual basing on the current display mode settings
*/
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
-XVisualInfo* fgChooseVisual( void )
+GLXFBConfig* fgChooseFBConfig( void )
{
-#define BUFFER_SIZES 6
- int bufferSize[BUFFER_SIZES] = { 16, 12, 8, 4, 2, 1 };
GLboolean wantIndexedMode = GL_FALSE;
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);}
if( fgState.DisplayMode & GLUT_INDEX )
{
ATTRIB_VAL( GLX_BUFFER_SIZE, 8 );
+ /* Buffer size is selected later. */
+
+ ATTRIB_VAL( GLX_RENDER_TYPE, GLX_COLOR_INDEX_BIT );
wantIndexedMode = GL_TRUE;
}
else
{
- ATTRIB( GLX_RGBA );
ATTRIB_VAL( GLX_RED_SIZE, 1 );
ATTRIB_VAL( GLX_GREEN_SIZE, 1 );
ATTRIB_VAL( GLX_BLUE_SIZE, 1 );
}
if( fgState.DisplayMode & GLUT_DOUBLE )
- ATTRIB( GLX_DOUBLEBUFFER );
+ ATTRIB_VAL( GLX_DOUBLEBUFFER, True );
if( fgState.DisplayMode & GLUT_STEREO )
- ATTRIB( GLX_STEREO );
+ ATTRIB_VAL( GLX_STEREO, True );
if( fgState.DisplayMode & GLUT_DEPTH )
ATTRIB_VAL( GLX_DEPTH_SIZE, 1 );
ATTRIB_VAL( GLX_ACCUM_ALPHA_SIZE, 1 );
}
- /*
- * Push a null at the end of the list
- */
+ if( fgState.DisplayMode & GLUT_AUX4 )
+ {
+ ATTRIB_VAL(GLX_AUX_BUFFERS, 4);
+ }
+ else if( fgState.DisplayMode & GLUT_AUX3 )
+ {
+ ATTRIB_VAL(GLX_AUX_BUFFERS, 3);
+ }
+ else if( fgState.DisplayMode & GLUT_AUX2 )
+ {
+ ATTRIB_VAL(GLX_AUX_BUFFERS, 2);
+ }
+ else if( fgState.DisplayMode & GLUT_AUX1 ) /* NOTE: Same as GLUT_AUX! */
+ {
+ ATTRIB_VAL(GLX_AUX_BUFFERS, fgState.AuxiliaryBufferNumber);
+ }
+
+ if (fgState.DisplayMode & GLUT_MULTISAMPLE)
+ {
+ ATTRIB_VAL(GLX_SAMPLE_BUFFERS, 1)
+ ATTRIB_VAL(GLX_SAMPLES, fgState.SampleNumber)
+ }
+
+ /* Push a null at the end of the list */
ATTRIB( None );
- if( ! wantIndexedMode )
- return glXChooseVisual( fgDisplay.Display, fgDisplay.Screen,
- attributes );
- else
{
- XVisualInfo* visualInfo;
- int i;
+ GLXFBConfig * fbconfigArray; /* Array of FBConfigs */
+ GLXFBConfig * fbconfig; /* The FBConfig we want */
+ int fbconfigArraySize; /* Number of FBConfigs in the array */
- /*
- * In indexed mode, we need to check how many bits of depth can we
- * achieve. We do this by trying each possibility from the list
- * given in the {bufferSize} array. If we match, we return to caller.
- */
- for( i=0; i<BUFFER_SIZES; i++ )
+
+ /* Get all FBConfigs that match "attributes". */
+ fbconfigArray = glXChooseFBConfig( fgDisplay.Display,
+ fgDisplay.Screen,
+ attributes,
+ &fbconfigArraySize );
+
+ if (fbconfigArray != NULL)
+ {
+ int result; /* Returned by glXGetFBConfigAttrib, not checked. */
+
+
+ if( wantIndexedMode )
+ {
+ /*
+ * In index mode, we want the largest buffer size, i.e. visual
+ * depth. Here, FBConfigs are sorted by increasing buffer size
+ * first, so FBConfigs with the largest size come last.
+ */
+
+ int bufferSizeMin, bufferSizeMax;
+
+ /* Get bufferSizeMin. */
+ result =
+ glXGetFBConfigAttrib( fgDisplay.Display,
+ fbconfigArray[0],
+ GLX_BUFFER_SIZE,
+ &bufferSizeMin );
+ /* Get bufferSizeMax. */
+ result =
+ glXGetFBConfigAttrib( fgDisplay.Display,
+ fbconfigArray[fbconfigArraySize - 1],
+ GLX_BUFFER_SIZE,
+ &bufferSizeMax );
+
+ if (bufferSizeMax > bufferSizeMin)
+ {
+ /*
+ * Free and reallocate fbconfigArray, keeping only FBConfigs
+ * with the largest buffer size.
+ */
+ XFree(fbconfigArray);
+
+ /* Add buffer size token at the end of the list. */
+ where--;
+ ATTRIB_VAL( GLX_BUFFER_SIZE, bufferSizeMax );
+ ATTRIB( None );
+
+ fbconfigArray = glXChooseFBConfig( fgDisplay.Display,
+ fgDisplay.Screen,
+ attributes,
+ &fbconfigArraySize );
+ }
+ }
+
+ /*
+ * We now have an array of FBConfigs, the first one being the "best"
+ * one. So we should return only this FBConfig:
+ *
+ * int fbconfigXID;
+ *
+ * - pick the XID of the FBConfig we want
+ * result = glXGetFBConfigAttrib( fgDisplay.Display,
+ * fbconfigArray[0],
+ * GLX_FBCONFIG_ID,
+ * &fbconfigXID );
+ *
+ * - free the array
+ * XFree(fbconfigArray);
+ *
+ * - reset "attributes" with the XID
+ * where = 0;
+ * ATTRIB_VAL( GLX_FBCONFIG_ID, fbconfigXID );
+ * ATTRIB( None );
+ *
+ * - get our FBConfig only
+ * fbconfig = glXChooseFBConfig( fgDisplay.Display,
+ * fgDisplay.Screen,
+ * attributes,
+ * &fbconfigArraySize );
+ *
+ * However, for some configurations (for instance multisampling with
+ * Mesa 6.5.2 and ATI drivers), this does not work:
+ * glXChooseFBConfig returns NULL, whereas fbconfigXID is a valid
+ * XID. Further investigation is needed.
+ *
+ * So, for now, we return the whole array of FBConfigs. This should
+ * not produce any side effects elsewhere.
+ */
+ fbconfig = fbconfigArray;
+ }
+ else
{
- attributes[ 1 ] = bufferSize[ i ];
- visualInfo = glXChooseVisual( fgDisplay.Display, fgDisplay.Screen,
- attributes );
- if( visualInfo != NULL )
- return visualInfo;
+ fbconfig = NULL;
}
- return NULL;
+
+ return fbconfig;
}
}
-#endif
+#endif /* TARGET_HOST_POSIX_X11 */
/*
* Setup the pixel format for a Win32 window
*/
-#if TARGET_HOST_WIN32
+#if TARGET_HOST_MS_WINDOWS
+/* The following include file is available from SGI but is not standard:
+ * #include <GL/wglext.h>
+ * So we copy the necessary parts out of it.
+ * XXX: should local definitions for extensions be put in a separate include file?
+ */
+typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
+
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+
+#define WGL_DRAW_TO_WINDOW_ARB 0x2001
+#define WGL_ACCELERATION_ARB 0x2003
+#define WGL_SUPPORT_OPENGL_ARB 0x2010
+#define WGL_DOUBLE_BUFFER_ARB 0x2011
+#define WGL_COLOR_BITS_ARB 0x2014
+#define WGL_ALPHA_BITS_ARB 0x201B
+#define WGL_DEPTH_BITS_ARB 0x2022
+#define WGL_STENCIL_BITS_ARB 0x2023
+#define WGL_FULL_ACCELERATION_ARB 0x2027
+
+#define WGL_SAMPLE_BUFFERS_ARB 0x2041
+#define WGL_SAMPLES_ARB 0x2042
+
+
+#ifndef WGL_ARB_create_context
+#define WGL_ARB_create_context 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HGLRC WINAPI wglCreateContextAttribsARB (HDC, HGLRC, const int *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList);
+
+#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
+#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
+#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
+#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
+#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
+#define WGL_CONTEXT_FLAGS_ARB 0x2094
+#define ERROR_INVALID_VERSION_ARB 0x2095
+#endif
+
+
+void fgNewWGLCreateContext( SFG_Window* window )
+{
+ PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetEntensionsStringARB;
+ HGLRC context;
+ int attribs[7];
+ PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
+ const char * pWglExtString;
+
+ /* If nothing fancy has been required, leave the context as it is */
+ if ( fgState.MajorVersion == 1 && fgState.MinorVersion == 0 && fgState.ContextFlags == 0 )
+ {
+ return;
+ }
+
+ wglMakeCurrent( window->Window.Device,
+ window->Window.Context );
+
+ wglGetEntensionsStringARB=(PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB");
+ if ( wglGetEntensionsStringARB == NULL )
+ {
+ return;
+ }
+
+ pWglExtString=wglGetEntensionsStringARB(window->Window.Device);
+ if (( pWglExtString == NULL ) || ( strstr(pWglExtString, "WGL_ARB_create_context") == NULL ))
+ {
+ return;
+ }
+
+ /* new context creation */
+ attribs[0] = WGL_CONTEXT_MAJOR_VERSION_ARB;
+ attribs[1] = fgState.MajorVersion;
+ attribs[2] = WGL_CONTEXT_MINOR_VERSION_ARB;
+ attribs[3] = fgState.MinorVersion;
+ attribs[4] = WGL_CONTEXT_FLAGS_ARB;
+ attribs[5] = ((fgState.ContextFlags & GLUT_DEBUG) ? WGL_CONTEXT_DEBUG_BIT_ARB : 0) |
+ ((fgState.ContextFlags & GLUT_FORWARD_COMPATIBLE) ? WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB : 0);
+ attribs[6] = 0;
+
+ wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) wglGetProcAddress( "wglCreateContextAttribsARB" );
+ if ( wglCreateContextAttribsARB == NULL )
+ {
+ fgError( "wglCreateContextAttribsARB not found" );
+ }
+
+ context = wglCreateContextAttribsARB( window->Window.Device, 0, attribs );
+ if ( context == NULL )
+ {
+ fgError( "Unable to create OpenGL %d.%d context (flags %x)",
+ fgState.MajorVersion, fgState.MinorVersion, fgState.ContextFlags );
+ }
+
+ wglMakeCurrent( NULL, NULL );
+ wglDeleteContext( window->Window.Context );
+ window->Window.Context = context;
+}
+
+
GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
unsigned char layer_type )
{
-#if TARGET_HOST_WINCE
+#if defined(_WIN32_WCE)
return GL_TRUE;
#else
PIXELFORMATDESCRIPTOR* ppfd, pfd;
if( fgState.DisplayMode & GLUT_DOUBLE )
flags |= PFD_DOUBLEBUFFER;
+ if( fgState.DisplayMode & GLUT_STEREO )
+ flags |= PFD_STEREO;
+
#if defined(_MSC_VER)
#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;
- pfd.iPixelType = PFD_TYPE_RGBA;
+
+ if( fgState.DisplayMode & GLUT_INDEX )
+ {
+ pfd.iPixelType = PFD_TYPE_COLORINDEX;
+ pfd.cRedBits = 0;
+ pfd.cGreenBits = 0;
+ pfd.cBlueBits = 0;
+ pfd.cAlphaBits = 0;
+ }
+ else
+ {
+ pfd.iPixelType = PFD_TYPE_RGBA;
+ pfd.cRedBits = 8;
+ pfd.cGreenBits = 8;
+ pfd.cBlueBits = 8;
+ if ( fgState.DisplayMode & GLUT_ALPHA )
+ pfd.cAlphaBits = 8;
+ else
+ pfd.cAlphaBits = 0;
+ }
+
pfd.cColorBits = 24;
- pfd.cRedBits = 0;
pfd.cRedShift = 0;
- pfd.cGreenBits = 0;
pfd.cGreenShift = 0;
- pfd.cBlueBits = 0;
pfd.cBlueShift = 0;
- pfd.cAlphaBits = 0;
pfd.cAlphaShift = 0;
pfd.cAccumBits = 0;
pfd.cAccumRedBits = 0;
pfd.cDepthBits = 24;
pfd.cStencilBits = 8;
#endif
- pfd.cAuxBuffers = 0;
+ if( fgState.DisplayMode & GLUT_AUX4 )
+ pfd.cAuxBuffers = 4;
+ else if( fgState.DisplayMode & GLUT_AUX3 )
+ pfd.cAuxBuffers = 3;
+ else if( fgState.DisplayMode & GLUT_AUX2 )
+ pfd.cAuxBuffers = 2;
+ else if( fgState.DisplayMode & GLUT_AUX1 ) /* NOTE: Same as GLUT_AUX! */
+ pfd.cAuxBuffers = fgState.AuxiliaryBufferNumber;
+ else
+ pfd.cAuxBuffers = 0;
+
pfd.iLayerType = layer_type;
pfd.bReserved = 0;
pfd.dwLayerMask = 0;
ppfd = &pfd;
pixelformat = ChoosePixelFormat( window->Window.Device, ppfd );
+
+ /* windows hack for multismapling */
+ if (fgState.DisplayMode&GLUT_MULTISAMPLE)
+ {
+ PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetEntensionsStringARB=NULL;
+ HGLRC rc, rc_before=wglGetCurrentContext();
+ HWND hWnd;
+ HDC hDC, hDC_before=wglGetCurrentDC();
+ WNDCLASS wndCls;
+
+ /* create a dummy window */
+ ZeroMemory(&wndCls, sizeof(wndCls));
+ wndCls.lpfnWndProc = DefWindowProc;
+ wndCls.hInstance = fgDisplay.Instance;
+ wndCls.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW;
+ wndCls.lpszClassName = _T("FREEGLUT_dummy");
+ RegisterClass( &wndCls );
+
+ hWnd=CreateWindow(_T("FREEGLUT_dummy"), _T(""), WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW , 0,0,0,0, 0, 0, fgDisplay.Instance, 0 );
+ hDC=GetDC(hWnd);
+ SetPixelFormat( hDC, pixelformat, ppfd );
+
+ rc = wglCreateContext( hDC );
+ wglMakeCurrent(hDC, rc);
+
+ wglGetEntensionsStringARB=(PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB");
+ if (wglGetEntensionsStringARB)
+ {
+ const char * pWglExtString=wglGetEntensionsStringARB(hDC);
+ if (pWglExtString)
+ {
+ if (strstr(pWglExtString, "WGL_ARB_multisample"))
+ {
+ int pAttributes[100];
+ int iCounter=0;
+ int iPixelFormat;
+ BOOL bValid;
+ float fAttributes[] = {0,0};
+ UINT numFormats;
+ PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARBProc=NULL;
+
+ wglChoosePixelFormatARBProc=(PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB");
+ if ( wglChoosePixelFormatARBProc )
+ {
+ pAttributes[iCounter++]=WGL_DRAW_TO_WINDOW_ARB; pAttributes[iCounter++]=GL_TRUE;
+ pAttributes[iCounter++]=WGL_SUPPORT_OPENGL_ARB; pAttributes[iCounter++]=GL_TRUE;
+ pAttributes[iCounter++]=WGL_ACCELERATION_ARB; pAttributes[iCounter++]=WGL_FULL_ACCELERATION_ARB;
+
+ pAttributes[iCounter++]=WGL_COLOR_BITS_ARB; pAttributes[iCounter++]=pfd.cColorBits ;
+ pAttributes[iCounter++]=WGL_ALPHA_BITS_ARB; pAttributes[iCounter++]=pfd.cAlphaBits;
+ pAttributes[iCounter++]=WGL_DEPTH_BITS_ARB; pAttributes[iCounter++]=pfd.cDepthBits;
+ pAttributes[iCounter++]=WGL_STENCIL_BITS_ARB; pAttributes[iCounter++]=pfd.cStencilBits;
+
+ pAttributes[iCounter++]=WGL_DOUBLE_BUFFER_ARB; pAttributes[iCounter++]=(fgState.DisplayMode & GLUT_DOUBLE)!=0;
+ pAttributes[iCounter++]=WGL_SAMPLE_BUFFERS_ARB; pAttributes[iCounter++]=GL_TRUE;
+ pAttributes[iCounter++]=WGL_SAMPLES_ARB; pAttributes[iCounter++]=fgState.SampleNumber;
+ pAttributes[iCounter++]=0; pAttributes[iCounter++]=0; /* terminator */
+
+ bValid = wglChoosePixelFormatARBProc(window->Window.Device,pAttributes,fAttributes,1,&iPixelFormat,&numFormats);
+
+ if (bValid && numFormats>0)
+ pixelformat=iPixelFormat;
+ }
+ }
+ wglMakeCurrent( hDC_before, rc_before);
+ wglDeleteContext(rc);
+ ReleaseDC(hWnd, hDC);
+ DestroyWindow(hWnd);
+ UnregisterClass(_T("FREEGLUT_dummy"), fgDisplay.Instance);
+ }
+ }
+ }
+
if( pixelformat == 0 )
return GL_FALSE;
if( checkOnly )
return GL_TRUE;
return SetPixelFormat( window->Window.Device, pixelformat, ppfd );
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
}
-#endif
+#endif /* TARGET_HOST_MS_WINDOWS */
/*
* Sets the OpenGL context and the fgStructure "Current Window" pointer to
*/
void fgSetWindow ( SFG_Window *window )
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
if ( window )
- glXMakeCurrent(
+ glXMakeContextCurrent(
fgDisplay.Display,
window->Window.Handle,
+ window->Window.Handle,
window->Window.Context
);
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
- if( fgStructure.Window )
- ReleaseDC( fgStructure.Window->Window.Handle,
- fgStructure.Window->Window.Device );
+#elif TARGET_HOST_MS_WINDOWS
+ if( fgStructure.CurrentWindow )
+ ReleaseDC( fgStructure.CurrentWindow->Window.Handle,
+ fgStructure.CurrentWindow->Window.Device );
if ( window )
{
);
}
#endif
- fgStructure.Window = window;
+ fgStructure.CurrentWindow = window;
}
+
+#if TARGET_HOST_POSIX_X11
+
+#ifndef GLX_CONTEXT_MAJOR_VERSION_ARB
+#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
+#endif
+
+#ifndef GLX_CONTEXT_MINOR_VERSION_ARB
+#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
+#endif
+
+#ifndef GLX_CONTEXT_FLAGS_ARB
+#define GLX_CONTEXT_FLAGS_ARB 0x2094
+#endif
+
+#ifndef GLX_CONTEXT_DEBUG_BIT_ARB
+#define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001
+#endif
+
+#ifndef GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB
+#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
+#endif
+
+typedef GLXContext (*CreateContextAttribsProc)(Display *dpy, GLXFBConfig config,
+ GLXContext share_list, Bool direct,
+ const int *attrib_list);
+
+static GLXContext fghCreateNewContext( SFG_Window* window )
+{
+ /* for color model calculation */
+ int menu = ( window->IsMenu && !fgStructure.MenuContext );
+ int index_mode = ( fgState.DisplayMode & GLUT_INDEX );
+
+ /* "classic" context creation */
+ Display *dpy = fgDisplay.Display;
+ GLXFBConfig config = *(window->Window.FBConfig);
+ int render_type = ( !menu && index_mode ) ? GLX_COLOR_INDEX_TYPE : GLX_RGBA_TYPE;
+ GLXContext share_list = NULL;
+ Bool direct = ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT );
+ GLXContext context;
+
+ /* new context creation */
+ int attribs[7];
+ CreateContextAttribsProc createContextAttribs;
+
+ /* If nothing fancy has been required, simply use the old context creation GLX API entry */
+ if ( fgState.MajorVersion == 1 && fgState.MinorVersion == 0 && fgState.ContextFlags == 0)
+ {
+ context = glXCreateNewContext( dpy, config, render_type, share_list, direct );
+ if ( context == NULL ) {
+ fgError( "could not create new OpenGL context" );
+ }
+ return context;
+ }
+
+ /* color index mode is not available anymore with OpenGL 3.0 */
+ if ( render_type == GLX_COLOR_INDEX_TYPE ) {
+ fgWarning( "color index mode is deprecated, using RGBA mode" );
+ }
+
+ attribs[0] = GLX_CONTEXT_MAJOR_VERSION_ARB;
+ attribs[1] = fgState.MajorVersion;
+ attribs[2] = GLX_CONTEXT_MINOR_VERSION_ARB;
+ attribs[3] = fgState.MinorVersion;
+ attribs[4] = GLX_CONTEXT_FLAGS_ARB;
+ attribs[5] = ((fgState.ContextFlags & GLUT_DEBUG) ? GLX_CONTEXT_DEBUG_BIT_ARB : 0) |
+ ((fgState.ContextFlags & GLUT_FORWARD_COMPATIBLE) ? GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB : 0);
+ attribs[6] = 0;
+
+ createContextAttribs = (CreateContextAttribsProc) fghGetProcAddress( "glXCreateContextAttribsARB" );
+ if ( createContextAttribs == NULL ) {
+ fgError( "glXCreateContextAttribsARB not found" );
+ }
+
+ context = createContextAttribs( dpy, config, share_list, direct, attribs );
+ if ( context == NULL ) {
+ fgError( "could not create new OpenGL %d.%d context (flags %x)",
+ fgState.MajorVersion, fgState.MinorVersion, fgState.ContextFlags );
+ }
+ return context;
+}
+#endif
+
+
/*
* 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 positionUse, int x, int y,
+ GLboolean sizeUse, int w, int h,
GLboolean gameMode, GLboolean isSubWindow )
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
+ XVisualInfo * visualInfo;
XSetWindowAttributes winAttr;
XTextProperty textProperty;
XSizeHints sizeHints;
XWMHints wmHints;
unsigned long mask;
+ unsigned int current_DisplayMode = fgState.DisplayMode ;
- freeglut_assert_ready;
+ /* Save the display mode if we are creating a menu window */
+ if( window->IsMenu && ( ! fgStructure.MenuContext ) )
+ fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB ;
- /*
- * XXX fgChooseVisual() is a common part of all three.
- * XXX With a little thought, we should be able to greatly
- * XXX simplify this.
- */
- if( !window->IsMenu )
- window->Window.VisualInfo = fgChooseVisual( );
- else if( fgStructure.MenuContext )
- window->Window.VisualInfo = fgChooseVisual( );
- else
- {
- /* XXX Why are menus double- and depth-buffered? */
- unsigned int current_DisplayMode = fgState.DisplayMode ;
- fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH ;
- window->Window.VisualInfo = fgChooseVisual( );
+ window->Window.FBConfig = fgChooseFBConfig( );
+
+ if( window->IsMenu && ( ! fgStructure.MenuContext ) )
fgState.DisplayMode = current_DisplayMode ;
- }
- if( ! window->Window.VisualInfo )
+ if( ! window->Window.FBConfig )
{
/*
- * The "fgChooseVisual" returned a null meaning that the visual
+ * The "fgChooseFBConfig" 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( );
+ window->Window.FBConfig = fgChooseFBConfig( );
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.
- */
+ if( fgState.DisplayMode & GLUT_MULTISAMPLE )
+ {
+ fgState.DisplayMode &= ~GLUT_MULTISAMPLE ;
+ window->Window.FBConfig = fgChooseFBConfig( );
+ fgState.DisplayMode |= GLUT_MULTISAMPLE;
+ }
}
- /*
- * XXX This seems to be abusing an assert() for error-checking.
- * XXX It is possible that the visual simply can't be found,
- * XXX in which case we should print an error and return a 0
- * XXX for the window id, I think.
- */
- assert( window->Window.VisualInfo != NULL );
+ FREEGLUT_INTERNAL_ERROR_EXIT( window->Window.FBConfig != NULL,
+ "FBConfig with necessary capabilities not found", "fgOpenWindow" );
+ /* Get the X visual. */
+ visualInfo = glXGetVisualFromFBConfig( fgDisplay.Display,
+ *(window->Window.FBConfig) );
/*
* XXX HINT: the masks should be updated when adding/removing callbacks.
*/
winAttr.event_mask =
StructureNotifyMask | SubstructureNotifyMask | ExposureMask |
- ButtonPressMask | ButtonReleaseMask | KeyPressMask | KeyRelease |
+ ButtonPressMask | ButtonReleaseMask | KeyPressMask | KeyReleaseMask |
VisibilityChangeMask | EnterWindowMask | LeaveWindowMask |
PointerMotionMask | ButtonMotionMask;
winAttr.background_pixmap = None;
winAttr.colormap = XCreateColormap(
fgDisplay.Display, fgDisplay.RootWindow,
- window->Window.VisualInfo->visual, AllocNone
+ visualInfo->visual, AllocNone
);
mask = CWBackPixmap | CWBorderPixel | CWColormap | CWEventMask;
- if( window->IsMenu )
+ if( window->IsMenu || ( gameMode == GL_TRUE ) )
{
winAttr.override_redirect = True;
mask |= CWOverrideRedirect;
}
+ if( ! positionUse )
+ x = y = -1; /* default window position */
+ if( ! sizeUse )
+ w = h = 300; /* default window size */
+
window->Window.Handle = XCreateWindow(
fgDisplay.Display,
window->Parent == NULL ? fgDisplay.RootWindow :
window->Parent->Window.Handle,
x, y, w, h, 0,
- window->Window.VisualInfo->depth, InputOutput,
- window->Window.VisualInfo->visual, mask,
+ visualInfo->depth, InputOutput,
+ visualInfo->visual, mask,
&winAttr
);
* The GLX context creation, possibly trying the direct context rendering
* or else use the current context if the user has so specified
*/
+
if( window->IsMenu )
{
/*
{
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.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
- );
+ fgStructure.MenuContext->MContext = fghCreateNewContext( window );
}
- /* window->Window.Context = fgStructure.MenuContext->Context; */
- window->Window.Context = glXCreateContext(
- fgDisplay.Display, window->Window.VisualInfo,
- NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
- );
+ /* window->Window.Context = fgStructure.MenuContext->MContext; */
+ window->Window.Context = fghCreateNewContext( window );
}
else if( fgState.UseCurrentContext )
{
window->Window.Context = glXGetCurrentContext( );
if( ! window->Window.Context )
- window->Window.Context = glXCreateContext(
- fgDisplay.Display, window->Window.VisualInfo,
- NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
- );
+ window->Window.Context = fghCreateNewContext( window );
}
else
- window->Window.Context = glXCreateContext(
- fgDisplay.Display, window->Window.VisualInfo,
- NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
- );
+ window->Window.Context = fghCreateNewContext( window );
+#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 );
}
-
- glXMakeCurrent(
- fgDisplay.Display,
- window->Window.Handle,
- window->Window.Context
- );
+#endif
/*
* XXX Assume the new window is visible by default
window->State.Visible = GL_TRUE;
sizeHints.flags = 0;
- if ( fgState.Position.Use )
+ if ( positionUse )
sizeHints.flags |= USPosition;
- if ( fgState.Size.Use )
+ if ( sizeUse )
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?)
+ * 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
- sizeHints.x = 0;
- sizeHints.y = 0;
- sizeHints.width = 320;
- sizeHints.height = 240;
-#else
sizeHints.x = x;
sizeHints.y = y;
sizeHints.width = w;
sizeHints.height = h;
-#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(
&wmHints,
NULL
);
+ XFree( textProperty.value );
XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
&fgDisplay.DeleteWindow, 1 );
+ glXMakeContextCurrent(
+ fgDisplay.Display,
+ window->Window.Handle,
+ window->Window.Handle,
+ window->Window.Context
+ );
+
XMapWindow( fgDisplay.Display, window->Window.Handle );
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+ XFree(visualInfo);
+
+#elif TARGET_HOST_MS_WINDOWS
WNDCLASS wc;
DWORD flags;
DWORD exFlags = 0;
ATOM atom;
+ int WindowStyle = 0;
- 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 );
+ FREEGLUT_INTERNAL_ERROR_EXIT ( atom, "Window Class Info Not Found",
+ "fgOpenWindow" );
if( gameMode )
{
- assert( window->Parent == NULL );
+ FREEGLUT_INTERNAL_ERROR_EXIT ( window->Parent == NULL,
+ "Game mode being invoked on a subwindow",
+ "fgOpenWindow" );
/*
* Set the window creation flags appropriately to make the window
}
else
{
-#if !TARGET_HOST_WINCE
+ int worig = w, horig = h;
+
+#if !defined(_WIN32_WCE)
if ( ( ! isSubWindow ) && ( ! window->IsMenu ) )
{
/*
h += (GetSystemMetrics( SM_CYSIZEFRAME ) )*2 +
GetSystemMetrics( SM_CYCAPTION );
}
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
- if( ! fgState.Position.Use )
+ if( ! positionUse )
{
x = CW_USEDEFAULT;
y = CW_USEDEFAULT;
}
- if( ! fgState.Size.Use )
+ /* setting State.Width/Height to call resize callback later */
+ if( ! sizeUse )
+ {
+ if( ! window->IsMenu )
+ {
+ w = CW_USEDEFAULT;
+ h = CW_USEDEFAULT;
+ }
+ else /* fail safe - Windows can make a window of size (0, 0) */
+ w = h = 300; /* default window size */
+ window->State.Width = window->State.Height = -1;
+ }
+ else
{
- w = CW_USEDEFAULT;
- h = CW_USEDEFAULT;
+ window->State.Width = worig;
+ window->State.Height = horig;
}
/*
flags |= WS_POPUP;
exFlags |= WS_EX_TOOLWINDOW;
}
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
else if( window->Parent == NULL )
flags |= WS_OVERLAPPEDWINDOW;
#endif
flags |= WS_CHILD;
}
-#if TARGET_HOST_WINCE
+#if defined(_WIN32_WCE)
{
- wchar_t* wstr = wstr_from_str(title);
+ wchar_t* wstr = fghWstrFromStr(title);
window->Window.Handle = CreateWindow(
_T("FREEGLUT"),
#else
window->Window.Handle = CreateWindowEx(
exFlags,
- "FREEGLUT",
+ _T("FREEGLUT"),
title,
flags,
x, y, w, h,
fgDisplay.Instance,
(LPVOID) window
);
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
if( !( window->Window.Handle ) )
fgError( "Failed to create a window (%s)!", title );
-#if TARGET_HOST_WINCE
+ /* Make a menu window always on top - fix Feature Request 947118 */
+ if( window->IsMenu || gameMode )
+ SetWindowPos(
+ window->Window.Handle,
+ HWND_TOPMOST,
+ 0, 0, 0, 0,
+ SWP_NOMOVE | SWP_NOSIZE
+ );
+
+ /* Hack to remove the caption (title bar) and/or border
+ * and all the system menu controls.
+ */
+ WindowStyle = GetWindowLong(window->Window.Handle, GWL_STYLE);
+ if ( fgState.DisplayMode & GLUT_CAPTIONLESS )
+ {
+ SetWindowLong ( window->Window.Handle, GWL_STYLE,
+ WindowStyle & ~(WS_DLGFRAME | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX));
+ }
+ else if ( fgState.DisplayMode & GLUT_BORDERLESS )
+ {
+ SetWindowLong ( window->Window.Handle, GWL_STYLE,
+ WindowStyle & ~(WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX));
+ }
+/* SetWindowPos(window->Window.Handle, NULL, 0, 0, 0, 0,
+ SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED); */
+
+
+#if defined(_WIN32_WCE)
ShowWindow( window->Window.Handle, SW_SHOW );
#else
ShowWindow( window->Window.Handle,
fgState.ForceIconic ? SW_SHOWMINIMIZED : SW_SHOW );
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
UpdateWindow( window->Window.Handle );
- ShowCursor( TRUE ); /* XXX Old comments say "hide cusror"! */
+ ShowCursor( TRUE ); /* XXX Old comments say "hide cursor"! */
#endif
*/
void fgCloseWindow( SFG_Window* window )
{
- freeglut_assert_ready;
+#if TARGET_HOST_POSIX_X11
-#if TARGET_HOST_UNIX_X11
-
- glXDestroyContext( fgDisplay.Display, window->Window.Context );
+ if( window->Window.Context )
+ glXDestroyContext( fgDisplay.Display, window->Window.Context );
+ XFree( window->Window.FBConfig );
XDestroyWindow( fgDisplay.Display, window->Window.Handle );
- XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+ /* XFlush( fgDisplay.Display ); */ /* XXX Shouldn't need this */
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
- /*
- * Make sure we don't close a window with current context active
- */
- if( fgStructure.Window == window )
+ /* Make sure we don't close a window with current context active */
+ if( fgStructure.CurrentWindow == window )
wglMakeCurrent( NULL, NULL );
/*
*/
int FGAPIENTRY glutCreateWindow( const char* title )
{
- return fgCreateWindow( NULL, title, fgState.Position.X, fgState.Position.Y,
- fgState.Size.X, fgState.Size.Y, GL_FALSE,
- GL_FALSE )->ID;
+ /* XXX GLUT does not exit; it simply calls "glutInit" quietly if the
+ * XXX application has not already done so. The "freeglut" community
+ * XXX decided not to go this route (freeglut-developer e-mail from
+ * XXX Steve Baker, 12/16/04, 4:22 PM CST, "Re: [Freeglut-developer]
+ * XXX Desired 'freeglut' behaviour when there is no current window"
+ */
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateWindow" );
+
+ return fgCreateWindow( NULL, title, fgState.Position.Use,
+ fgState.Position.X, fgState.Position.Y,
+ fgState.Size.Use, fgState.Size.X, fgState.Size.Y,
+ GL_FALSE, GL_FALSE )->ID;
+}
+
+#if TARGET_HOST_MS_WINDOWS
+int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) )
+{
+ __glutExitFunc = exit_function;
+ return glutCreateWindow( title );
}
+#endif
/*
* This function creates a sub window.
int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h )
{
int ret = 0;
-
SFG_Window* window = NULL;
SFG_Window* parent = NULL;
- freeglut_assert_ready;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateSubWindow" );
parent = fgWindowByID( parentID );
freeglut_return_val_if_fail( parent != NULL, 0 );
- window = fgCreateWindow( parent, "", x, y, w, h, GL_FALSE, GL_FALSE );
+ if ( x < 0 )
+ {
+ x = parent->State.Width + x ;
+ if ( w >= 0 ) x -= w ;
+ }
+
+ if ( w < 0 ) w = parent->State.Width - x + w ;
+ if ( w < 0 )
+ {
+ x += w ;
+ w = -w ;
+ }
+
+ if ( y < 0 )
+ {
+ y = parent->State.Height + y ;
+ if ( h >= 0 ) y -= h ;
+ }
+
+ if ( h < 0 ) h = parent->State.Height - y + h ;
+ if ( h < 0 )
+ {
+ y += h ;
+ h = -h ;
+ }
+
+ window = fgCreateWindow( parent, "", GL_TRUE, x, y, GL_TRUE, w, h, GL_FALSE, GL_FALSE );
ret = window->ID;
return ret;
*/
void FGAPIENTRY glutDestroyWindow( int windowID )
{
- SFG_Window* window = fgWindowByID( windowID );
+ SFG_Window* window;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutDestroyWindow" );
+ window = fgWindowByID( windowID );
freeglut_return_if_fail( window != NULL );
{
fgExecutionState ExecState = fgState.ExecState;
{
SFG_Window* window = NULL;
- freeglut_assert_ready;
- if( fgStructure.Window != NULL )
- if( fgStructure.Window->ID == ID )
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetWindow" );
+ if( fgStructure.CurrentWindow != NULL )
+ if( fgStructure.CurrentWindow->ID == ID )
return;
window = fgWindowByID( ID );
if( window == NULL )
{
- fgWarning( "glutSetWindow(): window ID %i not found!", ID );
+ fgWarning( "glutSetWindow(): window ID %d not found!", ID );
return;
}
*/
int FGAPIENTRY glutGetWindow( void )
{
- freeglut_assert_ready;
- if( fgStructure.Window == NULL )
+ SFG_Window *win = fgStructure.CurrentWindow;
+ /*
+ * Since GLUT did not throw an error if this function was called without a prior call to
+ * "glutInit", this function shouldn't do so here. Instead let us return a zero.
+ * See Feature Request "[ 1307049 ] glutInit check".
+ */
+ if ( ! fgState.Initialised )
return 0;
- return fgStructure.Window->ID;
+
+ while ( win && win->IsMenu )
+ win = win->Parent;
+ return win ? win->ID : 0;
}
/*
*/
void FGAPIENTRY glutShowWindow( void )
{
- freeglut_assert_ready;
- freeglut_assert_window;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutShowWindow" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutShowWindow" );
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
- XMapWindow( fgDisplay.Display, fgStructure.Window->Window.Handle );
+ XMapWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
- ShowWindow( fgStructure.Window->Window.Handle, SW_SHOW );
+ ShowWindow( fgStructure.CurrentWindow->Window.Handle, SW_SHOW );
#endif
- fgStructure.Window->State.Redisplay = GL_TRUE;
+ fgStructure.CurrentWindow->State.Redisplay = GL_TRUE;
}
/*
*/
void FGAPIENTRY glutHideWindow( void )
{
- freeglut_assert_ready;
- freeglut_assert_window;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutHideWindow" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutHideWindow" );
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
- if( fgStructure.Window->Parent == NULL )
+ if( fgStructure.CurrentWindow->Parent == NULL )
XWithdrawWindow( fgDisplay.Display,
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
fgDisplay.Screen );
else
XUnmapWindow( fgDisplay.Display,
- fgStructure.Window->Window.Handle );
+ fgStructure.CurrentWindow->Window.Handle );
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
- ShowWindow( fgStructure.Window->Window.Handle, SW_HIDE );
+ ShowWindow( fgStructure.CurrentWindow->Window.Handle, SW_HIDE );
#endif
- fgStructure.Window->State.Redisplay = GL_FALSE;
+ fgStructure.CurrentWindow->State.Redisplay = GL_FALSE;
}
/*
*/
void FGAPIENTRY glutIconifyWindow( void )
{
- freeglut_assert_ready;
- freeglut_assert_window;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutIconifyWindow" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutIconifyWindow" );
- fgStructure.Window->State.Visible = GL_FALSE;
-#if TARGET_HOST_UNIX_X11
+ fgStructure.CurrentWindow->State.Visible = GL_FALSE;
+#if TARGET_HOST_POSIX_X11
- XIconifyWindow( fgDisplay.Display, fgStructure.Window->Window.Handle,
+ XIconifyWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
fgDisplay.Screen );
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
- ShowWindow( fgStructure.Window->Window.Handle, SW_MINIMIZE );
+ ShowWindow( fgStructure.CurrentWindow->Window.Handle, SW_MINIMIZE );
#endif
- fgStructure.Window->State.Redisplay = GL_FALSE;
+ fgStructure.CurrentWindow->State.Redisplay = GL_FALSE;
}
/*
*/
void FGAPIENTRY glutSetWindowTitle( const char* title )
{
- freeglut_assert_ready;
- freeglut_assert_window;
- if( ! fgStructure.Window->Parent )
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetWindowTitle" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetWindowTitle" );
+ if( ! fgStructure.CurrentWindow->Parent )
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
XTextProperty text;
XSetWMName(
fgDisplay.Display,
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
&text
);
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-#elif TARGET_HOST_WIN32
-
- SetWindowText( fgStructure.Window->Window.Handle, title );
-
-#elif TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
+# ifdef _WIN32_WCE
{
- wchar_t* wstr = wstr_from_str(title);
-
- SetWindowText( fgStructure.Window->Window.Handle, wstr );
-
+ wchar_t* wstr = fghWstrFromStr(title);
+ SetWindowText( fgStructure.CurrentWindow->Window.Handle, wstr );
free(wstr);
}
+# else
+ SetWindowText( fgStructure.CurrentWindow->Window.Handle, title );
+# endif
+
#endif
}
}
*/
void FGAPIENTRY glutSetIconTitle( const char* title )
{
- freeglut_assert_ready;
- freeglut_assert_window;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetIconTitle" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetIconTitle" );
- if( ! fgStructure.Window->Parent )
+ if( ! fgStructure.CurrentWindow->Parent )
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
XTextProperty text;
XSetWMIconName(
fgDisplay.Display,
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
&text
);
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-#elif TARGET_HOST_WIN32
-
- SetWindowText( fgStructure.Window->Window.Handle, title );
-
-#elif TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
+# ifdef _WIN32_WCE
{
- wchar_t* wstr = wstr_from_str(title);
-
- SetWindowText( fgStructure.Window->Window.Handle, wstr );
-
+ wchar_t* wstr = fghWstrFromStr(title);
+ SetWindowText( fgStructure.CurrentWindow->Window.Handle, wstr );
free(wstr);
}
+# else
+ SetWindowText( fgStructure.CurrentWindow->Window.Handle, title );
+# endif
+
#endif
}
}
*/
void FGAPIENTRY glutReshapeWindow( int width, int height )
{
- freeglut_assert_ready;
- freeglut_assert_window;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutReshapeWindow" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutReshapeWindow" );
- fgStructure.Window->State.NeedToResize = GL_TRUE;
- fgStructure.Window->State.Width = width ;
- fgStructure.Window->State.Height = height;
+ if (glutGet(GLUT_FULL_SCREEN))
+ {
+ /* Leave full screen state before resizing. */
+ glutFullScreenToggle();
+ }
+
+ fgStructure.CurrentWindow->State.NeedToResize = GL_TRUE;
+ fgStructure.CurrentWindow->State.Width = width ;
+ fgStructure.CurrentWindow->State.Height = height;
}
/*
*/
void FGAPIENTRY glutPositionWindow( int x, int y )
{
- freeglut_assert_ready;
- freeglut_assert_window;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutPositionWindow" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutPositionWindow" );
+
+ if (glutGet(GLUT_FULL_SCREEN))
+ {
+ /* Leave full screen state before moving. */
+ glutFullScreenToggle();
+ }
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
- XMoveWindow( fgDisplay.Display, fgStructure.Window->Window.Handle,
+ XMoveWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
x, y );
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
{
RECT winRect;
- GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
+ /* "GetWindowRect" returns the pixel coordinates of the outside of the window */
+ GetWindowRect( fgStructure.CurrentWindow->Window.Handle, &winRect );
MoveWindow(
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
x,
y,
winRect.right - winRect.left,
*/
void FGAPIENTRY glutPushWindow( void )
{
- freeglut_assert_ready;
- freeglut_assert_window;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutPushWindow" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutPushWindow" );
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
- XLowerWindow( fgDisplay.Display, fgStructure.Window->Window.Handle );
+ XLowerWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
SetWindowPos(
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
HWND_BOTTOM,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOMOVE
*/
void FGAPIENTRY glutPopWindow( void )
{
- freeglut_assert_ready;
- freeglut_assert_window;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutPopWindow" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutPopWindow" );
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
- XRaiseWindow( fgDisplay.Display, fgStructure.Window->Window.Handle );
+ XRaiseWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
SetWindowPos(
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
HWND_TOP,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOMOVE
*/
void FGAPIENTRY glutFullScreen( void )
{
- freeglut_assert_ready;
- freeglut_assert_window;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutFullScreen" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutFullScreen" );
+ if (glutGet(GLUT_FULL_SCREEN))
{
-#if TARGET_HOST_UNIX_X11
- int x, y;
- Window w;
-
- XMoveResizeWindow(
- fgDisplay.Display,
- fgStructure.Window->Window.Handle,
- 0, 0,
- fgDisplay.ScreenWidth,
- fgDisplay.ScreenHeight
- );
+ /* Leave full screen state before resizing. */
+ glutFullScreenToggle();
+ }
- XFlush( fgDisplay.Display ); /* This is needed */
+ {
+#if TARGET_HOST_POSIX_X11
- XTranslateCoordinates(
- fgDisplay.Display,
- fgStructure.Window->Window.Handle,
- fgDisplay.RootWindow,
- 0, 0, &x, &y, &w
- );
+ Status status; /* Returned by XGetWindowAttributes(), not checked. */
+ XWindowAttributes attributes;
- if (x || y)
- {
- XMoveWindow(
- fgDisplay.Display,
- fgStructure.Window->Window.Handle,
- -x, -y
- );
- XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
- }
-#elif TARGET_HOST_WIN32
+ status = XGetWindowAttributes(fgDisplay.Display,
+ fgStructure.CurrentWindow->Window.Handle,
+ &attributes);
+ /*
+ * The "x" and "y" members of "attributes" are the window's coordinates
+ * relative to its parent, i.e. to the decoration window.
+ */
+ XMoveResizeWindow(fgDisplay.Display,
+ fgStructure.CurrentWindow->Window.Handle,
+ -attributes.x,
+ -attributes.y,
+ fgDisplay.ScreenWidth,
+ fgDisplay.ScreenHeight);
+
+#elif TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) /* FIXME: what about WinCE */
RECT rect;
/* For fullscreen mode, force the top-left corner to 0,0
* SWP_NOZORDER Retains the current Z order (ignore 2nd param)
*/
- SetWindowPos( fgStructure.Window->Window.Handle,
+ SetWindowPos( fgStructure.CurrentWindow->Window.Handle,
HWND_TOP,
rect.left,
rect.top,
}
/*
+ * Toggle the window's full screen state.
+ */
+void FGAPIENTRY glutFullScreenToggle( void )
+{
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutFullScreenToggle" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutFullScreenToggle" );
+
+ {
+#if TARGET_HOST_POSIX_X11
+
+ if (fgDisplay.StateFullScreen != None)
+ {
+ XEvent xevent;
+ long event_mask;
+ int status;
+
+ xevent.type = ClientMessage;
+ xevent.xclient.type = ClientMessage;
+ xevent.xclient.serial = 0;
+ xevent.xclient.send_event = True;
+ xevent.xclient.display = fgDisplay.Display;
+ xevent.xclient.window = fgStructure.CurrentWindow->Window.Handle;
+ xevent.xclient.message_type = fgDisplay.State;
+ xevent.xclient.format = 32;
+ xevent.xclient.data.l[0] = 2; /* _NET_WM_STATE_TOGGLE */
+ xevent.xclient.data.l[1] = fgDisplay.StateFullScreen;
+ xevent.xclient.data.l[2] = 0;
+ xevent.xclient.data.l[3] = 0;
+ xevent.xclient.data.l[4] = 0;
+
+ /*** Don't really understand how event masks work... ***/
+ event_mask = SubstructureRedirectMask | SubstructureNotifyMask;
+
+ status = XSendEvent(fgDisplay.Display,
+ fgDisplay.RootWindow,
+ False,
+ event_mask,
+ &xevent);
+ FREEGLUT_INTERNAL_ERROR_EXIT(status != 0,
+ "XSendEvent failed",
+ "glutFullScreenToggle");
+ }
+ else
+#endif
+ {
+ /*
+ * If the window manager is not Net WM compliant, fall back to legacy
+ * behaviour.
+ */
+ glutFullScreen();
+ }
+ }
+}
+
+/*
* A.Donev: Set and retrieve the window's user data
*/
void* FGAPIENTRY glutGetWindowData( void )
{
- return fgStructure.Window->UserData;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetWindowData" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutGetWindowData" );
+ return fgStructure.CurrentWindow->UserData;
}
void FGAPIENTRY glutSetWindowData(void* data)
{
- fgStructure.Window->UserData = data;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetWindowData" );
+ FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetWindowData" );
+ fgStructure.CurrentWindow->UserData = data;
}
/*** END OF FILE ***/
projects / freeglut / blobdiff