Changeset 8695 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

May 8, 2008 7:41:22 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30632

Message:

X11 Additions: improved termination of VBoxClient

Location:

trunk/src/VBox/Additions/x11/xclient

Files:

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

trunk/src/VBox/Additions/x11/xclient/displaychange-x11.cpp

@@ -81 +81 @@
     {
         uint32_t cx = 0, cy = 0, cBits = 0, iDisplay = 0;
-        int rc = VbglR3DisplayChangeWaitEvent(&cx, &cy, &cBits, &iDisplay);
+        rc = VbglR3DisplayChangeWaitEvent(&cx, &cy, &cBits, &iDisplay);
         /* Ignore the request if it is stale */
         if ((cx != cx0) || (cy != cy0))
@@ -87 +87 @@
                 /* If we are not stopping, sleep for a bit to avoid using up too
                     much CPU while retrying. */
-                if (RT_FAILURE(rc) && !mThread->isStopping())
-                    mThread->yield();
+                if (RT_FAILURE(rc))
+                {
+                    if (!mThread->isStopping())
+                        mThread->yield();
+                }
                 else
                     system("VBoxRandR");

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

@@ -141 +141 @@
     /** Disable seamless mode */
     VbglR3SeamlessSetCap(false);
-    VbglR3Term();
+    printf(("VBoxClient: terminating...\n"));
+    /* don't call VbglR3Term() here otherwise the /dev/vboxadd filehandle is closed */
     /* Our pause() call will now return and exit. */
 }
@@ -290 +291 @@
     try
     {
+        /* r=frank: Why all these 2s delays? What are we waiting for? */
 #ifdef DYNAMIC_RESIZE
 # ifdef SEAMLESS_GUEST

trunk/src/VBox/Additions/x11/xclient/seamless.h

@@ -183 +183 @@
         if (isInitialised)
         {
-            mHost.stop();
+            mHost.stop(cMillies);
             mGuestThread.stop(cMillies, 0);
             mGuest.uninit();