\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
\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
- glXGetFBConfigAttrib( fgDisplay.Display,\r
+ glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,\r
fbconfigArray[fbconfigArraySize - 1],\r
GLX_BUFFER_SIZE,\r
&bufferSizeMax );\r
ATTRIB_VAL( GLX_BUFFER_SIZE, bufferSizeMax );\r
ATTRIB( None );\r
\r
- fbconfigArray = glXChooseFBConfig( fgDisplay.Display,\r
+ fbconfigArray = glXChooseFBConfig( fgDisplay.pDisplay.Display,\r
fgDisplay.Screen,\r
attributes,\r
&fbconfigArraySize );\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
* 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
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
\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
* 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
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
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
\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
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
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->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
XStringListToTextProperty( (char **) &title, 1, &textProperty );\r
\r
XSetWMProperties(\r
- fgDisplay.Display,\r
+ fgDisplay.pDisplay.Display,\r
window->Window.Handle,\r
&textProperty,\r
&textProperty,\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
- fgDisplay.Display,\r
+ fgDisplay.pDisplay.Display,\r
window->Window.Handle,\r
window->Window.Handle,\r
window->Window.Context\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
- XMapWindow( fgDisplay.Display, window->Window.Handle );\r
+ XMapWindow( fgDisplay.pDisplay.Display, window->Window.Handle );\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
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
- XDestroyWindow( fgDisplay.Display, window->Window.Handle );\r
+ XDestroyWindow( fgDisplay.pDisplay.Display, window->Window.Handle );\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
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
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
- fgDisplay.Screen );\r
+ fgDisplay.pDisplay.Screen );\r
else\r
- XUnmapWindow( fgDisplay.Display,\r
+ XUnmapWindow( fgDisplay.pDisplay.Display,\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
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
text.nitems = strlen( title );\r
\r
XSetWMName(\r
- fgDisplay.Display,\r
+ fgDisplay.pDisplay.Display,\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
text.nitems = strlen( title );\r
\r
XSetWMIconName(\r
- fgDisplay.Display,\r
+ fgDisplay.pDisplay.Display,\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
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
- XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */\r
+ XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */\r
}\r
\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
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