Changeset 57264 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

Timestamp:

Aug 10, 2015 6:33:20 PM (9 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: reverted r101999: Additions/x11/VBoxClient: fix problems with invisible seamless windows in OpenBox.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp (modified) (4 diffs)

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

@@ -173 +173 @@
     phChildren = phChildrenRaw;
     for (unsigned i = 0; i < cChildren; ++i)
-        if (!mGuestWindows.find(phChildren[i]))
-        {
-            addClientWindow(phChildren[i]);
-            mChanged = true;
-        }
+        addClientWindow(phChildren[i]);
     XFree(phChildrenRaw);
     LogRelFlowFunc(("returning\n"));
@@ -188 +184 @@
     XWindowAttributes winAttrib;
     bool fAddWin = true;
-    Window hClient = 0;
-
+    Window hClient = XmuClientWindow(mDisplay, hWin);
+
+    if (isVirtualRoot(hClient))
+        fAddWin = false;
     if (fAddWin && !XGetWindowAttributes(mDisplay, hWin, &winAttrib))
     {
@@ -197 +195 @@
     if (fAddWin && (winAttrib.map_state == IsUnmapped))
         fAddWin = false;
-    if (fAddWin)
-    {
-        hClient = XmuClientWindow(mDisplay, hWin);
-        if (isVirtualRoot(hClient))
-            fAddWin = false;
-    }
     XSizeHints dummyHints;
     long dummyLong;
@@ -312 +304 @@
     mChanged = false;
     XNextEvent(mDisplay, &event);
-    addClients(DefaultRootWindow(mDisplay));
     switch (event.type)
     {