Moving all the X11-specific "fgDisplay" structure fields into their substructure...

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

diff --git a/src/Common/freeglut_gamemode.c b/src/Common/freeglut_gamemode.c
index d3df2bc..f69595c 100644 (file)
--- a/src/Common/freeglut_gamemode.c
+++ b/src/Common/freeglut_gamemode.c
@@ -80,7 +80,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
             XRRFreeScreenConfigInfo(xrr_config);\r
         }\r
 \r
-        if(!(xrr_config = XRRGetScreenInfo(fgDisplay.pDisplay.Display, fgDisplay.RootWindow))) {\r
+        if(!(xrr_config = XRRGetScreenInfo(fgDisplay.pDisplay.Display, fgDisplay.pDisplay.RootWindow))) {\r
             fgWarning("XRRGetScreenInfo failed");\r
             break;\r
         }\r
@@ -622,7 +622,7 @@ int FGAPIENTRY glutEnterGameMode( void )
         Window child;\r
 \r
         /* Change to viewport to the window topleft edge: */\r
-        if( !XF86VidModeSetViewPort( fgDisplay.pDisplay.Display, fgDisplay.Screen, 0, 0 ) )\r
+        if( !XF86VidModeSetViewPort( fgDisplay.pDisplay.Display, fgDisplay.pDisplay.Screen, 0, 0 ) )\r
             fgWarning( "XF86VidModeSetViewPort failed" );\r
 \r
         /*\r

diff --git a/src/Common/freeglut_state.c b/src/Common/freeglut_state.c
index 8962df3..06681eb 100644 (file)
--- a/src/Common/freeglut_state.c
+++ b/src/Common/freeglut_state.c
@@ -155,7 +155,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
         XTranslateCoordinates(\r
             fgDisplay.pDisplay.Display,\r
             fgStructure.CurrentWindow->Window.Handle,\r
-            fgDisplay.RootWindow,\r
+            fgDisplay.pDisplay.RootWindow,\r
             0, 0, &x, &y, &w);\r
 \r
         switch ( eWhat )\r

diff --git a/src/Common/freeglut_window.c b/src/Common/freeglut_window.c
index 69aba28..9b28940 100644 (file)
--- a/src/Common/freeglut_window.c
+++ b/src/Common/freeglut_window.c
@@ -306,7 +306,7 @@ GLXFBConfig* fgChooseFBConfig( int *numcfgs )
                     ATTRIB( None );\r
 \r
                     fbconfigArray = glXChooseFBConfig( fgDisplay.pDisplay.Display,\r
-                                                       fgDisplay.Screen,\r
+                                                       fgDisplay.pDisplay.Screen,\r
                                                        attributes,\r
                                                        &fbconfigArraySize );\r
                 }\r
@@ -477,16 +477,16 @@ static int fghEwmhFullscrToggle(void)
     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
-    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.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