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 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