#include <GL/freeglut.h>
#include "freeglut_internal.h"
-#if TARGET_HOST_WINCE
-#include <aygshell.h>
-#pragma comment( lib, "Aygshell.lib" )
+#if defined(_WIN32_WCE)
+# include <Aygshell.h>
+# ifdef FREEGLUT_LIB_PRAGMAS
+# pragma comment( lib, "Aygshell.lib" )
+# endif
static wchar_t* fghWstrFromStr(const char* str)
{
return wstr;
}
-
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
/*
* TODO BEFORE THE STABLE RELEASE:
/*
* Chooses a visual basing on the current display mode settings
*/
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
XVisualInfo* fgChooseVisual( void )
{
ATTRIB_VAL( GLX_ACCUM_ALPHA_SIZE, 1 );
}
+ if( fgState.DisplayMode & GLUT_AUX1 )
+ ATTRIB_VAL( GLX_AUX_BUFFERS, 1 );
+ if( fgState.DisplayMode & GLUT_AUX2 )
+ ATTRIB_VAL( GLX_AUX_BUFFERS, 2 );
+ if( fgState.DisplayMode & GLUT_AUX3 )
+ ATTRIB_VAL( GLX_AUX_BUFFERS, 3 );
+ if( fgState.DisplayMode & GLUT_AUX4 )
+ ATTRIB_VAL( GLX_AUX_BUFFERS, 4 );
+ if ( fgState.DisplayMode & GLUT_MULTISAMPLE )
+ ATTRIB_VAL( GLX_SAMPLES_SGIS, 4 );
+
+
/* Push a null at the end of the list */
ATTRIB( None );
/*
* 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
+
+
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
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 )
+ pfd.cAuxBuffers = 1;
+ 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;
+ ATOM atom;
+
+ /* 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");
+ atom = RegisterClass( &wndCls );
+
+ hWnd=CreateWindow((LPCSTR)atom, _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++]=4;
+ 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(
fgDisplay.Display,
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;
}
* 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
XSetWindowAttributes winAttr;
XTextProperty textProperty;
XSizeHints sizeHints;
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.VisualInfo = fgChooseVisual( );
+ fgState.DisplayMode |= GLUT_MULTISAMPLE;
+ }
}
FREEGLUT_INTERNAL_ERROR_EXIT( window->Window.VisualInfo != NULL,
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 :
{
fgStructure.MenuContext =
(SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
- fgStructure.MenuContext->VisualInfo = window->Window.VisualInfo;
- fgStructure.MenuContext->Context = glXCreateContext(
- fgDisplay.Display, fgStructure.MenuContext->VisualInfo,
+ fgStructure.MenuContext->MVisualInfo = window->Window.VisualInfo;
+ fgStructure.MenuContext->MContext = glXCreateContext(
+ fgDisplay.Display, fgStructure.MenuContext->MVisualInfo,
NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
);
}
- /* window->Window.Context = fgStructure.MenuContext->Context; */
+ /* window->Window.Context = fgStructure.MenuContext->MContext; */
window->Window.Context = glXCreateContext(
fgDisplay.Display, window->Window.VisualInfo,
NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
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;
/*
&wmHints,
NULL
);
+ XFree( textProperty.value );
XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
&fgDisplay.DeleteWindow, 1 );
XMapWindow( fgDisplay.Display, window->Window.Handle );
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
WNDCLASS wc;
DWORD flags;
}
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 = fghWstrFromStr(title);
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
+#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 )
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
glXDestroyContext( fgDisplay.Display, window->Window.Context );
+ XFree( window->Window.VisualInfo );
XDestroyWindow( fgDisplay.Display, window->Window.Handle );
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 )
+ if( fgStructure.CurrentWindow == window )
wglMakeCurrent( NULL, NULL );
/*
*/
int FGAPIENTRY glutCreateWindow( const char* title )
{
+ /* 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.X, fgState.Position.Y,
- fgState.Size.X, fgState.Size.Y, GL_FALSE,
- GL_FALSE )->ID;
+ 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;
}
/*
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;
SFG_Window* window = NULL;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetWindow" );
- if( fgStructure.Window != NULL )
- if( fgStructure.Window->ID == ID )
+ if( fgStructure.CurrentWindow != NULL )
+ if( fgStructure.CurrentWindow->ID == ID )
return;
window = fgWindowByID( ID );
*/
int FGAPIENTRY glutGetWindow( void )
{
+ SFG_Window *win = fgStructure.CurrentWindow;
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetWindow" );
- if( fgStructure.Window == NULL )
- return 0;
- return fgStructure.Window->ID;
+ while ( win && win->IsMenu )
+ win = win->Parent;
+ return win ? win->ID : 0;
}
/*
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;
}
/*
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;
}
/*
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;
}
/*
{
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetWindowTitle" );
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetWindowTitle" );
- if( ! fgStructure.Window->Parent )
+ 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 = fghWstrFromStr(title);
-
- SetWindowText( fgStructure.Window->Window.Handle, wstr );
-
+ SetWindowText( fgStructure.CurrentWindow->Window.Handle, wstr );
free(wstr);
}
+# else
+ SetWindowText( fgStructure.CurrentWindow->Window.Handle, title );
+# endif
+
#endif
}
}
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 = fghWstrFromStr(title);
-
- SetWindowText( fgStructure.Window->Window.Handle, wstr );
-
+ SetWindowText( fgStructure.CurrentWindow->Window.Handle, wstr );
free(wstr);
}
+# else
+ SetWindowText( fgStructure.CurrentWindow->Window.Handle, title );
+# endif
+
#endif
}
}
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;
+ fgStructure.CurrentWindow->State.NeedToResize = GL_TRUE;
+ fgStructure.CurrentWindow->State.Width = width ;
+ fgStructure.CurrentWindow->State.Height = height;
}
/*
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutPositionWindow" );
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutPositionWindow" );
-#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" returns the pixel coordinates of the outside of the window */
- GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
+ GetWindowRect( fgStructure.CurrentWindow->Window.Handle, &winRect );
MoveWindow(
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
x,
y,
winRect.right - winRect.left,
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
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
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutFullScreen" );
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
int x, y;
Window w;
XMoveResizeWindow(
fgDisplay.Display,
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
0, 0,
fgDisplay.ScreenWidth,
fgDisplay.ScreenHeight
XTranslateCoordinates(
fgDisplay.Display,
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
fgDisplay.RootWindow,
0, 0, &x, &y, &w
);
{
XMoveWindow(
fgDisplay.Display,
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
-x, -y
);
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
}
-#elif TARGET_HOST_WIN32
+#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,
{
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetWindowData" );
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutGetWindowData" );
- return fgStructure.Window->UserData;
+ return fgStructure.CurrentWindow->UserData;
}
void FGAPIENTRY glutSetWindowData(void* data)
{
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetWindowData" );
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetWindowData" );
- fgStructure.Window->UserData = data;
+ fgStructure.CurrentWindow->UserData = data;
}
/*** END OF FILE ***/
projects / freeglut / blobdiff