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

Timestamp:

Aug 10, 2015 6:36:34 PM (9 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: fix problems with invisible seamless windows in OpenBox and improve seamless responsiveness.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• seamless-x11.cpp (modified) (7 diffs)
• seamless-x11.h (modified) (1 diff)

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

@@ -129 +129 @@
 {
     LogRelFlowFunc(("called\n"));
-    XSelectInput(mDisplay, DefaultRootWindow(mDisplay), SubstructureNotifyMask);
+    XSelectInput(mDisplay, DefaultRootWindow(mDisplay), PropertyChangeMask | SubstructureNotifyMask);
 }
 
@@ -197 +197 @@
     XSizeHints dummyHints;
     long dummyLong;
+    /* Apparently (?) some old kwin versions had unwanted client windows
+     * without normal hints. */
     if (fAddWin && (!XGetWMNormalHints(mDisplay, hClient, &dummyHints,
                                        &dummyLong)))
@@ -268 +270 @@
     Display *pDisplay = (Display *)pvParam;
 
-    XShapeSelectInput(pDisplay, pInfo->Core.Key, 0);
     delete pInfo;
     return VINF_SUCCESS;
@@ -320 +321 @@
                        (unsigned long) event.xmap.window,
                        event.xmap.send_event));
-        doMapEvent(event.xmap.window);
+        rebuildWindowTree();
+        break;
+    case PropertyNotify:
+        if (   event.xproperty.atom != XInternAtom(mDisplay, "_NET_CLIENT_LIST", True /* only_if_exists */)
+            || event.xproperty.window != DefaultRootWindow(mDisplay))
+            break;
+        LogRelFlowFunc(("_NET_CLIENT_LIST property event on root window.\n"));
+        rebuildWindowTree();
         break;
     case VBoxShapeNotify:  /* This is defined wrong in my X11 header files! */
@@ -333 +341 @@
                        (unsigned long) event.xunmap.window,
                        event.xunmap.send_event));
-        doUnmapEvent(event.xunmap.window);
+        rebuildWindowTree();
         break;
     default:
@@ -359 +367 @@
         pInfo->mWidth = winAttrib.width;
         pInfo->mHeight = winAttrib.height;
-        if (pInfo->mhasShape)
-        {
-            XRectangle *pRects;
-            int cRects = 0, iOrdering;
-
-            pRects = XShapeGetRectangles(mDisplay, hWin, ShapeBounding,
-                                         &cRects, &iOrdering);
-            if (!pRects)
-                cRects = 0;
-            if (pInfo->mpRects)
-                XFree(pInfo->mpRects);
-            pInfo->mcRects = cRects;
-            pInfo->mpRects = pRects;
-        }
         mChanged = true;
     }
 }
-
-/**
- * Handle a map event in the seamless event thread.
- *
- * @param event the X11 event structure
- */
-void SeamlessX11::doMapEvent(Window hWin)
-{
-    LogRelFlowFunc(("\n"));
-    VBoxGuestWinInfo *pInfo = mGuestWindows.find(hWin);
-    if (!pInfo)
-    {
-        addClientWindow(hWin);
-        mChanged = true;
-    }
-    LogRelFlowFunc(("returning\n"));
-}
-
 
 /**
@@ -418 +394 @@
         pInfo->mcRects = cRects;
         pInfo->mpRects = pRects;
-        mChanged = true;
-    }
-    LogRelFlowFunc(("returning\n"));
-}
-
-/**
- * Handle an unmap event in the seamless event thread.
- *
- * @param event the X11 event structure
- */
-void SeamlessX11::doUnmapEvent(Window hWin)
-{
-    LogRelFlowFunc(("\n"));
-    VBoxGuestWinInfo *pInfo = mGuestWindows.removeWindow(hWin);
-    if (pInfo)
-    {
-        VBoxGuestWinFree(pInfo, mDisplay);
         mChanged = true;
     }

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

@@ -244 +244 @@
      * can call them. */
     void doConfigureEvent(Window hWin);
-    void doMapEvent(Window hWin);
-    void doUnmapEvent(Window hWin);
     void doShapeEvent(Window hWin);