Changeset 18938 in vbox for trunk/src

Timestamp:

Apr 16, 2009 1:15:52 PM (16 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: detect X server termination and remove two unused files

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• autoresize.cpp (modified) (4 diffs)
• displaychange-x11.cpp (deleted)
• displaychange.h (deleted)
• main.cpp (modified) (2 diffs)
• seamless.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/autoresize.cpp

@@ -27 +27 @@
 #include <errno.h>
 
+#include <X11/Xlib.h>
+
+#include <iprt/assert.h>
+#include <iprt/thread.h>
 #include <VBox/log.h>
 #include <VBox/VBoxGuest.h>
-#include <iprt/assert.h>
-#include <iprt/thread.h>
 
 #include "VBoxClient.h"
@@ -73 +75 @@
 {
     LogFlowFunc(("\n"));
+    /* Keep an open display so that we terminate if X11 does. */
+    Display *pDisplay = XOpenDisplay(NULL);
     uint32_t cx0 = 0, cy0 = 0, cBits0 = 0, iDisplay0 = 0;
     int rc = VbglR3GetLastDisplayChangeRequest(&cx0, &cy0, &cBits0, &iDisplay0);
@@ -79 +83 @@
         uint32_t cx = 0, cy = 0, cBits = 0, iDisplay = 0;
         rc = VbglR3DisplayChangeWaitEvent(&cx, &cy, &cBits, &iDisplay);
+        /* Make sure we are still connected to X.  If the X server has
+         * terminated then we should get a resize event above. */
+        XPending(pDisplay);
         /* Ignore the request if it is stale */
         if ((cx != cx0) || (cy != cy0))
@@ -93 +100 @@
         cy0 = 0;
     }
+    XCloseDisplay(pDisplay);
     LogFlowFunc(("returning VINF_SUCCESS\n"));
     return VINF_SUCCESS;

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -29 +29 @@
 #include <signal.h>
 
+#include <X11/Xlib.h>
+
 #include <iprt/env.h>
 #include <iprt/initterm.h>
@@ -38 +40 @@
 
 #include "VBoxClient.h"
-
-#ifdef DYNAMIC_RESIZE
-# include "displaychange.h"
-# ifdef SEAMLESS_GUEST
-#  include "seamless.h"
-# endif
-#endif
 
 #define TRACE RTPrintf("%s: %d\n", __PRETTY_FUNCTION__, __LINE__); Log(("%s: %d\n", __PRETTY_FUNCTION__, __LINE__))

trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp

@@ -45 +45 @@
         }
         mSeamless.init();
-        pause();
+        /* Stay running as long as X does... */
+        Display *pDisplay = XOpenDisplay(NULL);
+        XEvent ev;
+        while (true)
+            XNextEvent(pDisplay, &ev);
         return VERR_INTERRUPTED;
     }