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

Timestamp:

Feb 21, 2008 4:55:59 PM (17 years ago)

Author:

vboxsync

Message:

Additions/X11: more seamless fixes

File:

• trunk/src/VBox/Additions/x11/xclient/seamless-x11.cpp (modified) (5 diffs)

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

@@ -114 +114 @@
 void VBoxGuestSeamlessX11::monitorClientList(void)
 {
-    XSelectInput(mDisplay, DefaultRootWindow(mDisplay.get()), PropertyChangeMask);
+    XSelectInput(mDisplay, DefaultRootWindow(mDisplay.get()), SubstructureNotifyMask);
 }
 
@@ -203 +203 @@
         }
     }
-    XSelectInput(mDisplay, hWin, StructureNotifyMask);
     mGuestWindows.addWindow(hWin, winAttrib.map_state != IsUnmapped, winAttrib.x, winAttrib.y,
                             winAttrib.width, winAttrib.height, cRects, rects);
@@ -217 +216 @@
                  mGuestWindows.removeWindow(it++))
     {
-        XSelectInput(mDisplay, it->first, 0);
         XShapeSelectInput(mDisplay, it->first, 0);
     }
@@ -283 +281 @@
 void VBoxGuestSeamlessX11::doMapEvent(const XMapEvent *event)
 {
-/*    VBoxGuestWindowList::iterator iter;
+    VBoxGuestWindowList::iterator iter;
 
     iter = mGuestWindows.find(event->window);
-    if (iter != mGuestWindows.end())
-    {
-        iter->second->mMapped = true;
-    } */
-    rebuildWindowTree();
-}
-
-/**
- * If the list of client windows changes, rebuild the list.
- *
- * @param event the X11 event structure
- */
-void VBoxGuestSeamlessX11::doPropertyEvent(const XPropertyEvent *event)
-{
-    if (XInternAtom(mDisplay, NET_CLIENT_LIST, true) == event->atom)
-    {
-        rebuildWindowTree();
+    if (mGuestWindows.end() == iter)
+    {
+        addClientWindow(event->window);
     }
 }
@@ -337 +321 @@
 void VBoxGuestSeamlessX11::doUnmapEvent(const XUnmapEvent *event)
 {
-/*    VBoxGuestWindowList::iterator iter;
+    VBoxGuestWindowList::iterator iter;
 
     iter = mGuestWindows.find(event->window);
-    if (iter != mGuestWindows.end())
-    {
-        iter->second->mMapped = true;
-    } */
-    rebuildWindowTree();
+    if (mGuestWindows.end() != iter)
+    {
+        mGuestWindows.removeWindow(iter);
+    }
 }