Changing a bunch of platform-specific "fgDisplay" fields to "fgDisplay.pDisplay"...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1045 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/Common/freeglut_spaceball.c b/src/Common/freeglut_spaceball.c
index 89655f4..4901e79 100644 (file)
--- a/src/Common/freeglut_spaceball.c
+++ b/src/Common/freeglut_spaceball.c
@@ -77,7 +77,7 @@ void fgInitialiseSpaceball(void)
                }\r
 \r
         w = fgStructure.CurrentWindow->Window.Handle;\r
-        if(spnav_x11_open(fgDisplay.Display, w) == -1)\r
+        if(spnav_x11_open(fgDisplay.pDisplay.Display, w) == -1)\r
                {\r
                        sball_initialized = -1;\r
             return;\r

diff --git a/src/Common/freeglut_state.c b/src/Common/freeglut_state.c
index 6630b6d..8962df3 100644 (file)
--- a/src/Common/freeglut_state.c
+++ b/src/Common/freeglut_state.c
@@ -65,7 +65,7 @@ static int fghGetConfig( int attribute )
   int result;  /*  Not checked  */\r
 \r
   if( fgStructure.CurrentWindow )\r
-      result = glXGetFBConfigAttrib( fgDisplay.Display,\r
+      result = glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,\r
                                      *(fgStructure.CurrentWindow->Window.pContext.FBConfig),\r
                                      attribute,\r
                                      &returnValue );\r
@@ -128,7 +128,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
                 fgStructure.CurrentWindow->Window.pContext.FBConfig;\r
 \r
           XVisualInfo * visualInfo =\r
-                glXGetVisualFromFBConfig( fgDisplay.Display, *fbconfig );\r
+                glXGetVisualFromFBConfig( fgDisplay.pDisplay.Display, *fbconfig );\r
 \r
           const int result = visualInfo->visual->map_entries;\r
 \r
@@ -153,7 +153,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
             return 0;\r
 \r
         XTranslateCoordinates(\r
-            fgDisplay.Display,\r
+            fgDisplay.pDisplay.Display,\r
             fgStructure.CurrentWindow->Window.Handle,\r
             fgDisplay.RootWindow,\r
             0, 0, &x, &y, &w);\r
@@ -167,7 +167,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
         if ( w == 0 )\r
             return 0;\r
         XTranslateCoordinates(\r
-            fgDisplay.Display,\r
+            fgDisplay.pDisplay.Display,\r
             fgStructure.CurrentWindow->Window.Handle,\r
             w, 0, 0, &x, &y, &w);\r
 \r
@@ -186,7 +186,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
         if( fgStructure.CurrentWindow == NULL )\r
             return 0;\r
         XGetWindowAttributes(\r
-            fgDisplay.Display,\r
+            fgDisplay.pDisplay.Display,\r
             fgStructure.CurrentWindow->Window.Handle,\r
             &winAttributes\r
         );\r
@@ -259,7 +259,7 @@ int fgPlatformGlutDeviceGet ( GLenum eWhat )
          */\r
         {\r
             unsigned char map;\r
-            int nbuttons = XGetPointerMapping(fgDisplay.Display, &map,0);\r
+            int nbuttons = XGetPointerMapping(fgDisplay.pDisplay.Display, &map,0);\r
             return nbuttons;\r
         }\r
 \r
@@ -633,8 +633,8 @@ int * FGAPIENTRY glutGetModeValues(GLenum eWhat, int * size)
           break;\r
         }\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
@@ -652,7 +652,7 @@ int * FGAPIENTRY glutGetModeValues(GLenum eWhat, int * size)
             {\r
               int value;\r
 \r
-              result = glXGetFBConfigAttrib(fgDisplay.Display,\r
+              result = glXGetFBConfigAttrib(fgDisplay.pDisplay.Display,\r
                                             fbconfigArray[i],\r
                                             attribute_name,\r
                                             &value);\r

diff --git a/src/Common/freeglut_window.c b/src/Common/freeglut_window.c
index 1052c25..69aba28 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
-        fbconfigArray = glXChooseFBConfig( fgDisplay.Display,\r
-                                           fgDisplay.Screen,\r
+        fbconfigArray = glXChooseFBConfig( fgDisplay.pDisplay.Display,\r
+                                           fgDisplay.pDisplay.Screen,\r
                                            attributes,\r
                                            &fbconfigArraySize );\r
 \r
@@ -281,13 +281,13 @@ GLXFBConfig* fgChooseFBConfig( int *numcfgs )
 \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
@@ -305,7 +305,7 @@ GLXFBConfig* fgChooseFBConfig( int *numcfgs )
                     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
@@ -319,7 +319,7 @@ GLXFBConfig* fgChooseFBConfig( int *numcfgs )
              * 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
@@ -333,8 +333,8 @@ GLXFBConfig* fgChooseFBConfig( int *numcfgs )
              * 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
@@ -397,7 +397,7 @@ static GLXContext fghCreateNewContext( SFG_Window* window )
   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
@@ -454,7 +454,7 @@ static int fghResizeFullscrToggle(void)
 \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
@@ -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
-        XMoveResizeWindow(fgDisplay.Display,\r
+        XMoveResizeWindow(fgDisplay.pDisplay.Display,\r
                 fgStructure.CurrentWindow->Window.Handle,\r
                 -attributes.x,\r
                 -attributes.y,\r
@@ -491,7 +491,7 @@ static int fghEwmhFullscrToggle(void)
     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
@@ -516,7 +516,7 @@ void fgPlatformSetWindow ( SFG_Window *window )
     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
@@ -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
-           visualInfo = glXGetVisualFromFBConfig( fgDisplay.Display,\r
+           visualInfo = glXGetVisualFromFBConfig( fgDisplay.pDisplay.Display,\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
-        fgDisplay.Display, fgDisplay.RootWindow,\r
+        fgDisplay.pDisplay.Display, fgDisplay.pDisplay.RootWindow,\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
-        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
@@ -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
-    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
@@ -707,7 +707,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
     XStringListToTextProperty( (char **) &title, 1, &textProperty );\r
 \r
     XSetWMProperties(\r
-        fgDisplay.Display,\r
+        fgDisplay.pDisplay.Display,\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
-    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
@@ -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
-       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
@@ -749,13 +749,13 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
 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
@@ -773,8 +773,8 @@ static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
  */\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
@@ -783,13 +783,13 @@ void fgPlatformGlutShowWindow( void )
 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
@@ -797,9 +797,9 @@ void fgPlatformGlutHideWindow( void )
  */\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
@@ -815,12 +815,12 @@ void fgPlatformGlutSetWindowTitle( const char* title )
     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
@@ -836,12 +836,12 @@ void fgPlatformGlutSetIconTitle( const char* title )
     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
@@ -849,9 +849,9 @@ void fgPlatformGlutSetIconTitle( const char* title )
  */\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
@@ -859,7 +859,7 @@ void fgPlatformGlutPositionWindow( int x, int y )
  */\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
@@ -867,7 +867,7 @@ void fgPlatformGlutPushWindow( void )
  */\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

diff --git a/src/x11/freeglut_xinput_x11.c b/src/x11/freeglut_xinput_x11.c
index 40677fa..54adf72 100644 (file)
--- a/src/x11/freeglut_xinput_x11.c
+++ b/src/x11/freeglut_xinput_x11.c
@@ -28,7 +28,7 @@ void fgRegisterDevices( Display* dpy, Window* win ) {
        unsigned char flags[2] = { 0, 0 };
        int event, error;
 
-       /*Display* dpy = fgDisplay.Display;
+       /*Display* dpy = fgDisplay.pDisplay.Display;
        Window* win = glutGetXWindow();*/
 
        /* get XInput extension opcode */
@@ -148,7 +148,7 @@ void fgHandleExtensionEvents( XEvent* base_ev ) {
        int i, button = 0;
        XGenericEventCookie* cookie = (XGenericEventCookie*)&(base_ev->xcookie);
 
-       if ( XGetEventData( fgDisplay.Display, cookie ) && (cookie->type == GenericEvent) && (cookie->extension == xi_opcode) ) {
+       if ( XGetEventData( fgDisplay.pDisplay.Display, cookie ) && (cookie->type == GenericEvent) && (cookie->extension == xi_opcode) ) {
 
                XIDeviceEvent* event = (XIDeviceEvent*)(cookie->data);
                /*printf("XI2 event type: %d - %d\n", cookie->evtype, event->type );*/
@@ -212,7 +212,7 @@ void fgHandleExtensionEvents( XEvent* base_ev ) {
                }
                fgState.Modifiers = INVALID_MODIFIERS;
        }
-       XFreeEventData( fgDisplay.Display, cookie );
+       XFreeEventData( fgDisplay.pDisplay.Display, cookie );
 }
 
 #endif