Changeset 57344 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Aug 14, 2015 9:22:27 AM (9 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: clean up seamless code slightly and handle pausing and resuming internally to service.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• seamless-x11.cpp (modified) (7 diffs)
• seamless.cpp (modified) (9 diffs)
• seamless.h (modified) (1 diff)
• testcase/tstSeamlessX11-auto.cpp (modified) (1 diff)

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

@@ -26 +26 @@
 
 #include "seamless-x11.h"
+#include "VBoxClient.h"
 
 #include <X11/Xatom.h>
@@ -88 +89 @@
     }
     mHostCallback = pHostCallback;
+    unmonitorClientList();
     LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
@@ -107 +109 @@
 
     LogRelFlowFunc(("\n"));
+    if (mEnabled)
+        return VINF_SUCCESS;
     mSupportsShape = XShapeQueryExtension(mDisplay, &event, &error);
     mEnabled = true;
@@ -120 +124 @@
 {
     LogRelFlowFunc(("\n"));
+    if (!mEnabled)
+        return;
     mEnabled = false;
     unmonitorClientList();
@@ -135 +141 @@
 {
     LogRelFlowFunc(("called\n"));
-    XSelectInput(mDisplay, DefaultRootWindow(mDisplay), 0);
+    XSelectInput(mDisplay, DefaultRootWindow(mDisplay), PropertyChangeMask);
 }
 
@@ -270 +276 @@
     Display *pDisplay = (Display *)pvParam;
 
+    XShapeSelectInput(pDisplay, pInfo->Core.Key, 0);
     delete pInfo;
     return VINF_SUCCESS;
@@ -491 +498 @@
 {
     bool rc = false;
-
-    LogRelFlowFunc(("\n"));
+    Display *pDisplay = XOpenDisplay(NULL);
+
+    LogRelFlowFunc(("\n"));
+    if (pDisplay == NULL)
+        VBClFatalError(("Failed to open X11 display.\n"));
     /* Message contents set to zero. */
     XClientMessageEvent clientMessage = { ClientMessage, 0, 0, 0, 0, 0, 8 };
 
-    if (XSendEvent(mDisplay, DefaultRootWindow(mDisplay), false,
-                   SubstructureNotifyMask, (XEvent *)&clientMessage))
-    {
-        XFlush(mDisplay);
+    if (XSendEvent(pDisplay, DefaultRootWindow(mDisplay), false,
+                   PropertyChangeMask, (XEvent *)&clientMessage))
         rc = true;
-    }
+    XCloseDisplay(pDisplay);
     LogRelFlowFunc(("returning %RTbool\n", rc));
     return rc;

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

@@ -41 +41 @@
     mX11MonitorThreadStopping = false;
     mMode = VMMDev_Seamless_Disabled;
-    mfPaused = false;
+    mfPaused = true;
 }
 
@@ -87 +87 @@
         if (RT_FAILURE(rc))
             break;
+        rc = startX11MonitorThread();
+        if (RT_FAILURE(rc))
+            break;
     } while(0);
     if (RT_FAILURE(rc))
-        LogRel(("VBoxClient (seamless): failed to start.  Stage: \"%s\"  Error: %Rrc\n",
+        VBClFatalError(("VBoxClient (seamless): failed to start.  Stage: \"%s\"  Error: %Rrc\n",
                 pcszStage, rc));
     return rc;
@@ -170 +173 @@
     if (RT_SUCCESS(rc) || rc == VERR_TRY_AGAIN)
     {
-        if (mMode == VMMDev_Seamless_Visible_Region && !mfPaused)
-            /* This does it's own logging on failure. */
-            rc = startX11MonitorThread();
+        if (mMode == VMMDev_Seamless_Visible_Region)
+            mfPaused = false;
         else
-            /* This does it's own logging on failure. */
-            rc = stopX11MonitorThread();
+            mfPaused = true;
+        mX11Monitor.interruptEventWait();
     }
     else
@@ -183 +185 @@
     LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
-}
-
-int SeamlessMain::cancelEvent(void)
-{
-    return VbglR3InterruptEventWaits();
 }
 
@@ -199 +196 @@
 
     LogRelFlowFunc(("\n"));
-    rc = pHost->mX11Monitor.start();
-    if (RT_SUCCESS(rc))
-    {
-        while (!pHost->mX11MonitorThreadStopping)
-            pHost->mX11Monitor.nextConfigurationEvent();
-        pHost->mX11Monitor.stop();
+    while (!pHost->mX11MonitorThreadStopping)
+    {
+        if (!pHost->mfPaused)
+        {
+            rc = pHost->mX11Monitor.start();
+            if (RT_FAILURE(rc))
+                VBClFatalError(("Failed to change the X11 seamless service state, mfPaused=%RTbool, rc=%Rrc\n",
+                                pHost->mfPaused, rc));
+        }
+        pHost->mX11Monitor.nextConfigurationEvent();
+        if (pHost->mfPaused || pHost->mX11MonitorThreadStopping)
+            pHost->mX11Monitor.stop();
     }
     LogRelFlowFunc(("returning %Rrc\n", rc));
@@ -248 +251 @@
 }
 
-/** Pause the service loop. */
-int SeamlessMain::pause()
-{
-    int rc;
-    const char *pcszStage;
-
-    LogRelFlowFunc(("\n"));
-    mfPaused = true;
-    do {
-        pcszStage = "Reporting end of support for seamless capability";
-        rc = VbglR3SeamlessSetCap(false);
-        if (RT_FAILURE(rc))
-            break;
-        pcszStage = "Interrupting the event loop";
-        rc = cancelEvent();
-        if (RT_FAILURE(rc))
-            break;
-    } while (0);
-    if (RT_FAILURE(rc))
-        LogRelFunc(("Failure.  Stage: \"%s\"  Error: %Rrc (VBoxClient)\n",
-                    pcszStage, rc));
-    return rc;
-}
-
-/** Resume after pausing. */
-int SeamlessMain::resume()
-{
-    int rc;
-    const char *pcszStage;
-
-    LogRelFlowFunc(("\n"));
-    mfPaused = false;
-    do {
-        pcszStage = "Reporting support for seamless capability";
-        rc = VbglR3SeamlessSetCap(true);
-        if (RT_FAILURE(rc))
-            break;
-        pcszStage = "Interrupting the event loop";
-        rc = cancelEvent();
-        if (RT_FAILURE(rc))
-            break;
-    } while (0);
-    if (RT_FAILURE(rc))
-        LogRelFunc(("Failure.  Stage: \"%s\"  Error: %Rrc (VBoxClient)\n",
-                    pcszStage, rc));
-    return rc;
-}
-
 /** @todo Expand this? */
 int SeamlessMain::selfTest()
@@ -382 +337 @@
     if (!pSelf->mIsInitialised)
         return VERR_INTERNAL_ERROR;
-    rc = VBClStartVTMonitor();
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to start the VT monitor thread: %Rrc\n", rc));
     /* This only exits on error. */
     rc = pSelf->mSeamless.run();
@@ -391 +343 @@
 }
 
-static int pause(struct VBCLSERVICE **ppInterface)
-{
-    struct SEAMLESSSERVICE *pSelf = getClassFromInterface(ppInterface);
-
-    return pSelf->mSeamless.pause();
-}
-
-static int resume(struct VBCLSERVICE **ppInterface)
-{
-    struct SEAMLESSSERVICE *pSelf = getClassFromInterface(ppInterface);
-
-    return pSelf->mSeamless.resume();
-}
-
 static void cleanup(struct VBCLSERVICE **ppInterface)
 {
@@ -417 +355 @@
     init,
     run,
-    pause,
-    resume,
+    VBClServiceDefaultHandler, /* pause */
+    VBClServiceDefaultHandler, /* resume */
     cleanup
 };

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

@@ -59 +59 @@
     int nextStateChangeEvent(void);
 
-    /**
-     * Interrupt an event wait and cause the current or next
-     * @a nextStateChangeEvent call to return immediately.
-     */
-    int cancelEvent(void);
-
     /** Thread function to monitor X11 window configuration changes. */
     static DECLCALLBACK(int) x11MonitorThread(RTTHREAD self, void *pvUser);

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

@@ -45 +45 @@
 #define TEST_DISPLAY ((Display *)0xffff)
 #define TEST_ROOT ((Window)1)
+
+extern void vbclFatalError(char *psz)
+{
+    RTPrintf("Fatal error: %s\n", psz);
+    exit(1);
+}
 
 extern "C" Display *XOpenDisplay(const char *display_name);