Changeset 18994 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 17, 2009 2:24:31 PM (16 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: run a dummy thread in the autoresize daemon to watch for X server termination

File:

• trunk/src/VBox/Additions/x11/VBoxClient/autoresize.cpp (modified) (3 diffs)

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

@@ -65 +65 @@
 }
 
+/** This thread just runs a dummy X11 event loop to be sure that we get
+ * terminated should the X server exit. */
+static int x11ConnectionMonitor(RTTHREAD, void *)
+{
+    XEvent ev;
+    Display *pDisplay = XOpenDisplay(NULL);
+    while (true)
+        XNextEvent(pDisplay, &ev);
+}
+
 /**
  * Display change request monitor thread function.
@@ -75 +85 @@
 {
     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);
+    int rc = RTThreadCreate(NULL, x11ConnectionMonitor, NULL, 0,
+                   RTTHREADTYPE_INFREQUENT_POLLER, 0, "X11 monitor");
+    if (RT_FAILURE(rc))
+        return rc;
+    VbglR3GetLastDisplayChangeRequest(&cx0, &cy0, &cBits0, &iDisplay0);
     while (true)
     {
         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))
+        if ((cx != cx0) || (cy != cy0) || RT_FAILURE(rc))
         {
                 /* If we are not stopping, sleep for a bit to avoid using up too
@@ -100 +109 @@
         cy0 = 0;
     }
-    XCloseDisplay(pDisplay);
     LogFlowFunc(("returning VINF_SUCCESS\n"));
     return VINF_SUCCESS;