Moving platform-specific fields in "SFG_Display" into a substructure

[freeglut] / src / Common / freeglut_main.c

diff --git a/src/Common/freeglut_main.c b/src/Common/freeglut_main.c
index f53f8fa..980159d 100644 (file)
--- a/src/Common/freeglut_main.c
+++ b/src/Common/freeglut_main.c
@@ -98,9 +98,9 @@ extern void fgPlatformMainLoopPreliminaryWork ( void );
 #if TARGET_HOST_POSIX_X11\r
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )\r
 {\r
-    XResizeWindow( fgDisplay.Display, window->Window.Handle,\r
+    XResizeWindow( fgDisplay.pDisplay.Display, window->Window.Handle,\r
                    width, height );\r
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */\r
+    XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */\r
 }\r
 #endif\r
 \r
@@ -427,14 +427,14 @@ void fgPlatformSleepForEvents( long msec )
      * need to allow that we may have an empty socket but non-\r
      * empty event queue.\r
      */\r
-    if( ! XPending( fgDisplay.Display ) )\r
+    if( ! XPending( fgDisplay.pDisplay.Display ) )\r
     {\r
         fd_set fdset;\r
         int err;\r
         int socket;\r
         struct timeval wait;\r
 \r
-        socket = ConnectionNumber( fgDisplay.Display );\r
+        socket = ConnectionNumber( fgDisplay.pDisplay.Display );\r
         FD_ZERO( &fdset );\r
         FD_SET( socket, &fdset );\r
         wait.tv_sec = msec / 1000;\r
@@ -943,9 +943,9 @@ void fgPlatformProcessSingleEvent ( void )
 \r
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoopEvent" );\r
 \r
-    while( XPending( fgDisplay.Display ) )\r
+    while( XPending( fgDisplay.pDisplay.Display ) )\r
     {\r
-        XNextEvent( fgDisplay.Display, &event );\r
+        XNextEvent( fgDisplay.pDisplay.Display, &event );\r
 #if _DEBUG\r
         fghPrintEvent( &event );\r
 #endif\r
@@ -958,7 +958,7 @@ void fgPlatformProcessSingleEvent ( void )
                 break;\r
             }\r
             /* Destroy the window when the WM_DELETE_WINDOW message arrives */\r
-            if( (Atom) event.xclient.data.l[ 0 ] == fgDisplay.DeleteWindow )\r
+            if( (Atom) event.xclient.data.l[ 0 ] == fgDisplay.pDisplay.DeleteWindow )\r
             {\r
                 GETWINDOW( xclient );\r
 \r
@@ -1256,7 +1256,7 @@ void fgPlatformProcessSingleEvent ( void )
                      */\r
 \r
                     char keys[32];\r
-                    XQueryKeymap( fgDisplay.Display, keys ); /* Look at X11 keystate to detect repeat mode */\r
+                    XQueryKeymap( fgDisplay.pDisplay.Display, keys ); /* Look at X11 keystate to detect repeat mode */\r
 \r
                     if ( event.xkey.keycode<256 )            /* XQueryKeymap is limited to 256 keycodes    */\r
                     {\r