projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moving all the X11-specific "fgDisplay" structure fields into their substructure...
[freeglut]
/
src
/
Common
/
freeglut_window.c
diff --git
a/src/Common/freeglut_window.c
b/src/Common/freeglut_window.c
index
1468627
..
9b28940
100644
(file)
--- a/
src/Common/freeglut_window.c
+++ b/
src/Common/freeglut_window.c
@@
-259,8
+259,8
@@
GLXFBConfig* fgChooseFBConfig( int *numcfgs )
\r
\r
/* Get all FBConfigs that match "attributes". */
\r
\r
\r
/* Get all FBConfigs that match "attributes". */
\r
- fbconfigArray = glXChooseFBConfig( fgDisplay.Display,
\r
- fgDisplay.Screen,
\r
+ fbconfigArray = glXChooseFBConfig( fgDisplay.pDisplay.Display,
\r
+ fgDisplay.pDisplay.Screen,
\r
attributes,
\r
&fbconfigArraySize );
\r
\r
attributes,
\r
&fbconfigArraySize );
\r
\r
@@
-281,13
+281,13
@@
GLXFBConfig* fgChooseFBConfig( int *numcfgs )
\r
/* Get bufferSizeMin. */
\r
result =
\r
\r
/* Get bufferSizeMin. */
\r
result =
\r
- glXGetFBConfigAttrib( fgDisplay.Display,
\r
+ glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
\r
fbconfigArray[0],
\r
GLX_BUFFER_SIZE,
\r
&bufferSizeMin );
\r
/* Get bufferSizeMax. */
\r
result =
\r
fbconfigArray[0],
\r
GLX_BUFFER_SIZE,
\r
&bufferSizeMin );
\r
/* Get bufferSizeMax. */
\r
result =
\r
- glXGetFBConfigAttrib( fgDisplay.Display,
\r
+ glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
\r
fbconfigArray[fbconfigArraySize - 1],
\r
GLX_BUFFER_SIZE,
\r
&bufferSizeMax );
\r
fbconfigArray[fbconfigArraySize - 1],
\r
GLX_BUFFER_SIZE,
\r
&bufferSizeMax );
\r
@@
-305,8
+305,8
@@
GLXFBConfig* fgChooseFBConfig( int *numcfgs )
ATTRIB_VAL( GLX_BUFFER_SIZE, bufferSizeMax );
\r
ATTRIB( None );
\r
\r
ATTRIB_VAL( GLX_BUFFER_SIZE, bufferSizeMax );
\r
ATTRIB( None );
\r
\r
- fbconfigArray = glXChooseFBConfig( fgDisplay.Display,
\r
- fgDisplay.Screen,
\r
+ fbconfigArray = glXChooseFBConfig( fgDisplay.pDisplay.Display,
\r
+ fgDisplay.pDisplay.Screen,
\r
attributes,
\r
&fbconfigArraySize );
\r
}
\r
attributes,
\r
&fbconfigArraySize );
\r
}
\r
@@
-319,7
+319,7
@@
GLXFBConfig* fgChooseFBConfig( int *numcfgs )
* int fbconfigXID;
\r
*
\r
* - pick the XID of the FBConfig we want
\r
* int fbconfigXID;
\r
*
\r
* - pick the XID of the FBConfig we want
\r
- * result = glXGetFBConfigAttrib( fgDisplay.Display,
\r
+ * result = glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
\r
* fbconfigArray[0],
\r
* GLX_FBCONFIG_ID,
\r
* &fbconfigXID );
\r
* fbconfigArray[0],
\r
* GLX_FBCONFIG_ID,
\r
* &fbconfigXID );
\r
@@
-333,8
+333,8
@@
GLXFBConfig* fgChooseFBConfig( int *numcfgs )
* ATTRIB( None );
\r
*
\r
* - get our FBConfig only
\r
* ATTRIB( None );
\r
*
\r
* - get our FBConfig only
\r
- * fbconfig = glXChooseFBConfig( fgDisplay.Display,
\r
- * fgDisplay.Screen,
\r
+ * fbconfig = glXChooseFBConfig( fgDisplay.pDisplay.Display,
\r
+ * fgDisplay.pDisplay.Screen,
\r
* attributes,
\r
* &fbconfigArraySize );
\r
*
\r
* attributes,
\r
* &fbconfigArraySize );
\r
*
\r
@@
-397,7
+397,7
@@
static GLXContext fghCreateNewContext( SFG_Window* window )
int index_mode = ( fgState.DisplayMode & GLUT_INDEX );
\r
\r
/* "classic" context creation */
\r
int index_mode = ( fgState.DisplayMode & GLUT_INDEX );
\r
\r
/* "classic" context creation */
\r
- Display *dpy = fgDisplay.Display;
\r
+ Display *dpy = fgDisplay.pDisplay.Display;
\r
GLXFBConfig config = *(window->Window.pContext.FBConfig);
\r
int render_type = ( !menu && index_mode ) ? GLX_COLOR_INDEX_TYPE : GLX_RGBA_TYPE;
\r
GLXContext share_list = NULL;
\r
GLXFBConfig config = *(window->Window.pContext.FBConfig);
\r
int render_type = ( !menu && index_mode ) ? GLX_COLOR_INDEX_TYPE : GLX_RGBA_TYPE;
\r
GLXContext share_list = NULL;
\r
@@
-449,12
+449,12
@@
static int fghResizeFullscrToggle(void)
/* restore original window size */
\r
SFG_Window *win = fgStructure.CurrentWindow;
\r
fgStructure.CurrentWindow->State.NeedToResize = GL_TRUE;
\r
/* restore original window size */
\r
SFG_Window *win = fgStructure.CurrentWindow;
\r
fgStructure.CurrentWindow->State.NeedToResize = GL_TRUE;
\r
- fgStructure.CurrentWindow->State.Width = win->State.OldWidth;
\r
- fgStructure.CurrentWindow->State.Height = win->State.OldHeight;
\r
+ fgStructure.CurrentWindow->State.Width = win->State.pWState.OldWidth;
\r
+ fgStructure.CurrentWindow->State.Height = win->State.pWState.OldHeight;
\r
\r
} else {
\r
/* resize the window to cover the entire screen */
\r
\r
} else {
\r
/* resize the window to cover the entire screen */
\r
- XGetWindowAttributes(fgDisplay.Display,
\r
+ XGetWindowAttributes(fgDisplay.pDisplay.Display,
\r
fgStructure.CurrentWindow->Window.Handle,
\r
&attributes);
\r
\r
fgStructure.CurrentWindow->Window.Handle,
\r
&attributes);
\r
\r
@@
-462,7
+462,7
@@
static int fghResizeFullscrToggle(void)
* The "x" and "y" members of "attributes" are the window's coordinates
\r
* relative to its parent, i.e. to the decoration window.
\r
*/
\r
* The "x" and "y" members of "attributes" are the window's coordinates
\r
* relative to its parent, i.e. to the decoration window.
\r
*/
\r
- XMoveResizeWindow(fgDisplay.Display,
\r
+ XMoveResizeWindow(fgDisplay.pDisplay.Display,
\r
fgStructure.CurrentWindow->Window.Handle,
\r
-attributes.x,
\r
-attributes.y,
\r
fgStructure.CurrentWindow->Window.Handle,
\r
-attributes.x,
\r
-attributes.y,
\r
@@
-477,21
+477,21
@@
static int fghEwmhFullscrToggle(void)
XEvent xev;
\r
long evmask = SubstructureRedirectMask | SubstructureNotifyMask;
\r
\r
XEvent xev;
\r
long evmask = SubstructureRedirectMask | SubstructureNotifyMask;
\r
\r
- if(!fgDisplay.State || !fgDisplay.StateFullScreen) {
\r
+ if(!fgDisplay.pDisplay.State || !fgDisplay.pDisplay.StateFullScreen) {
\r
return -1;
\r
}
\r
\r
xev.type = ClientMessage;
\r
xev.xclient.window = fgStructure.CurrentWindow->Window.Handle;
\r
return -1;
\r
}
\r
\r
xev.type = ClientMessage;
\r
xev.xclient.window = fgStructure.CurrentWindow->Window.Handle;
\r
- xev.xclient.message_type = fgDisplay.State;
\r
+ xev.xclient.message_type = fgDisplay.pDisplay.State;
\r
xev.xclient.format = 32;
\r
xev.xclient.data.l[0] = _NET_WM_STATE_TOGGLE;
\r
xev.xclient.format = 32;
\r
xev.xclient.data.l[0] = _NET_WM_STATE_TOGGLE;
\r
- xev.xclient.data.l[1] = fgDisplay.StateFullScreen;
\r
+ xev.xclient.data.l[1] = fgDisplay.pDisplay.StateFullScreen;
\r
xev.xclient.data.l[2] = 0; /* no second property to toggle */
\r
xev.xclient.data.l[3] = 1; /* source indication: application */
\r
xev.xclient.data.l[4] = 0; /* unused */
\r
\r
xev.xclient.data.l[2] = 0; /* no second property to toggle */
\r
xev.xclient.data.l[3] = 1; /* source indication: application */
\r
xev.xclient.data.l[4] = 0; /* unused */
\r
\r
- if(!XSendEvent(fgDisplay.Display, fgDisplay.RootWindow, 0, evmask, &xev)) {
\r
+ if(!XSendEvent(fgDisplay.pDisplay.Display, fgDisplay.pDisplay.RootWindow, 0, evmask, &xev)) {
\r
return -1;
\r
}
\r
return 0;
\r
return -1;
\r
}
\r
return 0;
\r
@@
-516,7
+516,7
@@
void fgPlatformSetWindow ( SFG_Window *window )
if ( window )
\r
{
\r
glXMakeContextCurrent(
\r
if ( window )
\r
{
\r
glXMakeContextCurrent(
\r
- fgDisplay.Display,
\r
+ fgDisplay.pDisplay.Display,
\r
window->Window.Handle,
\r
window->Window.Handle,
\r
window->Window.Context
\r
window->Window.Handle,
\r
window->Window.Handle,
\r
window->Window.Context
\r
@@
-580,7
+580,7
@@
void fgPlatformOpenWindow( SFG_Window* window, const char* title,
\r
/* Get the X visual. */
\r
for (i = 0; i < num_FBConfigs; i++) {
\r
\r
/* Get the X visual. */
\r
for (i = 0; i < num_FBConfigs; i++) {
\r
- visualInfo = glXGetVisualFromFBConfig( fgDisplay.Display,
\r
+ visualInfo = glXGetVisualFromFBConfig( fgDisplay.pDisplay.Display,
\r
window->Window.pContext.FBConfig[i] );
\r
if (visualInfo)
\r
break;
\r
window->Window.pContext.FBConfig[i] );
\r
if (visualInfo)
\r
break;
\r
@@
-609,7
+609,7
@@
void fgPlatformOpenWindow( SFG_Window* window, const char* title,
winAttr.border_pixel = 0;
\r
\r
winAttr.colormap = XCreateColormap(
\r
winAttr.border_pixel = 0;
\r
\r
winAttr.colormap = XCreateColormap(
\r
- fgDisplay.Display, fgDisplay.RootWindow,
\r
+ fgDisplay.pDisplay.Display, fgDisplay.pDisplay.RootWindow,
\r
visualInfo->visual, AllocNone
\r
);
\r
\r
visualInfo->visual, AllocNone
\r
);
\r
\r
@@
-627,8
+627,8
@@
void fgPlatformOpenWindow( SFG_Window* window, const char* title,
w = h = 300; /* default window size */
\r
\r
window->Window.Handle = XCreateWindow(
\r
w = h = 300; /* default window size */
\r
\r
window->Window.Handle = XCreateWindow(
\r
- fgDisplay.Display,
\r
- window->Parent == NULL ? fgDisplay.RootWindow :
\r
+ fgDisplay.pDisplay.Display,
\r
+ window->Parent == NULL ? fgDisplay.pDisplay.RootWindow :
\r
window->Parent->Window.Handle,
\r
x, y, w, h, 0,
\r
visualInfo->depth, InputOutput,
\r
window->Parent->Window.Handle,
\r
x, y, w, h, 0,
\r
visualInfo->depth, InputOutput,
\r
@@
-668,7
+668,7
@@
void fgPlatformOpenWindow( SFG_Window* window, const char* title,
window->Window.Context = fghCreateNewContext( window );
\r
\r
#if !defined( __FreeBSD__ ) && !defined( __NetBSD__ )
\r
window->Window.Context = fghCreateNewContext( window );
\r
\r
#if !defined( __FreeBSD__ ) && !defined( __NetBSD__ )
\r
- if( !glXIsDirect( fgDisplay.Display, window->Window.Context ) )
\r
+ if( !glXIsDirect( fgDisplay.pDisplay.Display, window->Window.Context ) )
\r
{
\r
if( fgState.DirectContext == GLUT_FORCE_DIRECT_CONTEXT )
\r
fgError( "Unable to force direct context rendering for window '%s'",
\r
{
\r
if( fgState.DirectContext == GLUT_FORCE_DIRECT_CONTEXT )
\r
fgError( "Unable to force direct context rendering for window '%s'",
\r
@@
-707,7
+707,7
@@
void fgPlatformOpenWindow( SFG_Window* window, const char* title,
XStringListToTextProperty( (char **) &title, 1, &textProperty );
\r
\r
XSetWMProperties(
\r
XStringListToTextProperty( (char **) &title, 1, &textProperty );
\r
\r
XSetWMProperties(
\r
- fgDisplay.Display,
\r
+ fgDisplay.pDisplay.Display,
\r
window->Window.Handle,
\r
&textProperty,
\r
&textProperty,
\r
window->Window.Handle,
\r
&textProperty,
\r
&textProperty,
\r
@@
-719,11
+719,11
@@
void fgPlatformOpenWindow( SFG_Window* window, const char* title,
);
\r
XFree( textProperty.value );
\r
\r
);
\r
XFree( textProperty.value );
\r
\r
- XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
\r
- &fgDisplay.DeleteWindow, 1 );
\r
+ XSetWMProtocols( fgDisplay.pDisplay.Display, window->Window.Handle,
\r
+ &fgDisplay.pDisplay.DeleteWindow, 1 );
\r
\r
glXMakeContextCurrent(
\r
\r
glXMakeContextCurrent(
\r
- fgDisplay.Display,
\r
+ fgDisplay.pDisplay.Display,
\r
window->Window.Handle,
\r
window->Window.Handle,
\r
window->Window.Context
\r
window->Window.Handle,
\r
window->Window.Handle,
\r
window->Window.Context
\r
@@
-731,15
+731,15
@@
void fgPlatformOpenWindow( SFG_Window* window, const char* title,
\r
/* register extension events _before_ window is mapped */
\r
#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
\r
\r
/* register extension events _before_ window is mapped */
\r
#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
\r
- fgRegisterDevices( fgDisplay.Display, &(window->Window.Handle) );
\r
+ fgRegisterDevices( fgDisplay.pDisplay.Display, &(window->Window.Handle) );
\r
#endif
\r
\r
#endif
\r
\r
- XMapWindow( fgDisplay.Display, window->Window.Handle );
\r
+ XMapWindow( fgDisplay.pDisplay.Display, window->Window.Handle );
\r
\r
XFree(visualInfo);
\r
\r
if( !isSubWindow)
\r
\r
XFree(visualInfo);
\r
\r
if( !isSubWindow)
\r
- XPeekIfEvent( fgDisplay.Display, &eventReturnBuffer, &fghWindowIsVisible, (XPointer)(window->Window.Handle) );
\r
+ XPeekIfEvent( fgDisplay.pDisplay.Display, &eventReturnBuffer, &fghWindowIsVisible, (XPointer)(window->Window.Handle) );
\r
}
\r
\r
\r
}
\r
\r
\r
@@
-749,13
+749,13
@@
void fgPlatformOpenWindow( SFG_Window* window, const char* title,
void fgPlatformCloseWindow( SFG_Window* window )
\r
{
\r
if( window->Window.Context )
\r
void fgPlatformCloseWindow( SFG_Window* window )
\r
{
\r
if( window->Window.Context )
\r
- glXDestroyContext( fgDisplay.Display, window->Window.Context );
\r
+ glXDestroyContext( fgDisplay.pDisplay.Display, window->Window.Context );
\r
XFree( window->Window.pContext.FBConfig );
\r
\r
if( window->Window.Handle ) {
\r
XFree( window->Window.pContext.FBConfig );
\r
\r
if( window->Window.Handle ) {
\r
- XDestroyWindow( fgDisplay.Display, window->Window.Handle );
\r
+ XDestroyWindow( fgDisplay.pDisplay.Display, window->Window.Handle );
\r
}
\r
}
\r
- /* XFlush( fgDisplay.Display ); */ /* XXX Shouldn't need this */
\r
+ /* XFlush( fgDisplay.pDisplay.Display ); */ /* XXX Shouldn't need this */
\r
}
\r
\r
\r
}
\r
\r
\r
@@
-773,8
+773,8
@@
static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
*/
\r
void fgPlatformGlutShowWindow( void )
\r
{
\r
*/
\r
void fgPlatformGlutShowWindow( void )
\r
{
\r
- XMapWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
\r
- XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
\r
+ XMapWindow( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
\r
+ XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
\r
}
\r
\r
/*
\r
}
\r
\r
/*
\r
@@
-783,13
+783,13
@@
void fgPlatformGlutShowWindow( void )
void fgPlatformGlutHideWindow( void )
\r
{
\r
if( fgStructure.CurrentWindow->Parent == NULL )
\r
void fgPlatformGlutHideWindow( void )
\r
{
\r
if( fgStructure.CurrentWindow->Parent == NULL )
\r
- XWithdrawWindow( fgDisplay.Display,
\r
+ XWithdrawWindow( fgDisplay.pDisplay.Display,
\r
fgStructure.CurrentWindow->Window.Handle,
\r
fgStructure.CurrentWindow->Window.Handle,
\r
- fgDisplay.Screen );
\r
+ fgDisplay.pDisplay.Screen );
\r
else
\r
else
\r
- XUnmapWindow( fgDisplay.Display,
\r
+ XUnmapWindow( fgDisplay.pDisplay.Display,
\r
fgStructure.CurrentWindow->Window.Handle );
\r
fgStructure.CurrentWindow->Window.Handle );
\r
- XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
\r
+ XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
\r
}
\r
\r
/*
\r
}
\r
\r
/*
\r
@@
-797,9
+797,9
@@
void fgPlatformGlutHideWindow( void )
*/
\r
void fgPlatformGlutIconifyWindow( void )
\r
{
\r
*/
\r
void fgPlatformGlutIconifyWindow( void )
\r
{
\r
- XIconifyWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
\r
- fgDisplay.Screen );
\r
- XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
\r
+ XIconifyWindow( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
\r
+ fgDisplay.pDisplay.Screen );
\r
+ XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
\r
}
\r
\r
/*
\r
}
\r
\r
/*
\r
@@
-815,12
+815,12
@@
void fgPlatformGlutSetWindowTitle( const char* title )
text.nitems = strlen( title );
\r
\r
XSetWMName(
\r
text.nitems = strlen( title );
\r
\r
XSetWMName(
\r
- fgDisplay.Display,
\r
+ fgDisplay.pDisplay.Display,
\r
fgStructure.CurrentWindow->Window.Handle,
\r
&text
\r
);
\r
\r
fgStructure.CurrentWindow->Window.Handle,
\r
&text
\r
);
\r
\r
- XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
\r
+ XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
\r
}
\r
\r
/*
\r
}
\r
\r
/*
\r
@@
-836,12
+836,12
@@
void fgPlatformGlutSetIconTitle( const char* title )
text.nitems = strlen( title );
\r
\r
XSetWMIconName(
\r
text.nitems = strlen( title );
\r
\r
XSetWMIconName(
\r
- fgDisplay.Display,
\r
+ fgDisplay.pDisplay.Display,
\r
fgStructure.CurrentWindow->Window.Handle,
\r
&text
\r
);
\r
\r
fgStructure.CurrentWindow->Window.Handle,
\r
&text
\r
);
\r
\r
- XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
\r
+ XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
\r
}
\r
\r
/*
\r
}
\r
\r
/*
\r
@@
-849,9
+849,9
@@
void fgPlatformGlutSetIconTitle( const char* title )
*/
\r
void fgPlatformGlutPositionWindow( int x, int y )
\r
{
\r
*/
\r
void fgPlatformGlutPositionWindow( int x, int y )
\r
{
\r
- XMoveWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
\r
+ XMoveWindow( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
\r
x, y );
\r
x, y );
\r
- XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
\r
+ XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
\r
}
\r
\r
/*
\r
}
\r
\r
/*
\r
@@
-859,7
+859,7
@@
void fgPlatformGlutPositionWindow( int x, int y )
*/
\r
void fgPlatformGlutPushWindow( void )
\r
{
\r
*/
\r
void fgPlatformGlutPushWindow( void )
\r
{
\r
- XLowerWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
\r
+ XLowerWindow( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
\r
}
\r
\r
/*
\r
}
\r
\r
/*
\r
@@
-867,7
+867,7
@@
void fgPlatformGlutPushWindow( void )
*/
\r
void fgPlatformGlutPopWindow( void )
\r
{
\r
*/
\r
void fgPlatformGlutPopWindow( void )
\r
{
\r
- XRaiseWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
\r
+ XRaiseWindow( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
\r
}
\r
\r
/*
\r
}
\r
\r
/*
\r
@@
-986,14
+986,6
@@
int FGAPIENTRY glutCreateWindow( const char* title )
GL_FALSE, GL_FALSE )->ID;
\r
}
\r
\r
GL_FALSE, GL_FALSE )->ID;
\r
}
\r
\r
-#if TARGET_HOST_MS_WINDOWS
\r
-int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) )
\r
-{
\r
- __glutExitFunc = exit_function;
\r
- return glutCreateWindow( title );
\r
-}
\r
-#endif
\r
-
\r
/*
\r
* This function creates a sub window.
\r
*/
\r
/*
\r
* This function creates a sub window.
\r
*/
\r