Changeset 36685 in vbox

Timestamp:

Apr 15, 2011 1:35:27 PM (14 years ago)

Author:

vboxsync

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

71192

Message:

Additions/x11/seamless: replaced std::map with RTAVLU32TREE

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• seamless-x11.cpp (modified) (10 diffs)
• seamless-x11.h (modified) (6 diffs)

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

@@ -263 +263 @@
 }
 
+DECLCALLBACK(int) VBoxGuestWinFree(VBoxGuestWinInfo *pInfo, void *pvParam)
+{
+    Display *pDisplay = (Display *)pvParam;
+
+    XShapeSelectInput(pDisplay, pInfo->Core.Key, 0);
+    delete pInfo;
+    return VINF_SUCCESS;
+}
 
 /**
@@ -271 +279 @@
     /* We use post-increment in the operation to prevent the iterator from being invalidated. */
     LogRelFlowFunc(("\n"));
-    for (VBoxGuestWindowList::iterator it = mGuestWindows.begin(); it != mGuestWindows.end();
-                 mGuestWindows.removeWindow(it++))
-    {
-        XShapeSelectInput(mDisplay, it->first, 0);
-    }
+    mGuestWindows.detachAll(VBoxGuestWinFree, mDisplay);
     LogRelFlowFunc(("returning\n"));
 }
@@ -325 +329 @@
 {
     LogRelFlowFunc(("\n"));
-    VBoxGuestWindowList::iterator iter;
-
-    iter = mGuestWindows.find(hWin);
-    if (iter != mGuestWindows.end())
+    VBoxGuestWinInfo *pInfo = mGuestWindows.find(hWin);
+    if (pInfo)
     {
         XWindowAttributes winAttrib;
@@ -334 +336 @@
         if (!XGetWindowAttributes(mDisplay, hWin, &winAttrib))
             return;
-        iter->second->mX = winAttrib.x;
-        iter->second->mY = winAttrib.y;
-        iter->second->mWidth = winAttrib.width;
-        iter->second->mHeight = winAttrib.height;
-        if (iter->second->mhasShape)
+        pInfo->mX = winAttrib.x;
+        pInfo->mY = winAttrib.y;
+        pInfo->mWidth = winAttrib.width;
+        pInfo->mHeight = winAttrib.height;
+        if (pInfo->mhasShape)
         {
             XRectangle *pRects;
@@ -347 +349 @@
             if (!pRects)
                 cRects = 0;
-            if (iter->second->mpRects)
-                XFree(iter->second->mpRects);
-            iter->second->mcRects = cRects;
-            iter->second->mpRects = pRects;
+            if (pInfo->mpRects)
+                XFree(pInfo->mpRects);
+            pInfo->mcRects = cRects;
+            pInfo->mpRects = pRects;
         }
         mChanged = true;
@@ -365 +367 @@
 {
     LogRelFlowFunc(("\n"));
-    VBoxGuestWindowList::iterator iter;
-
-    iter = mGuestWindows.find(hWin);
-    if (mGuestWindows.end() == iter)
+    VBoxGuestWinInfo *pInfo = mGuestWindows.find(hWin);
+    if (!pInfo)
     {
         addClientWindow(hWin);
@@ -385 +385 @@
 {
     LogRelFlowFunc(("\n"));
-    VBoxGuestWindowList::iterator iter;
-
-    iter = mGuestWindows.find(hWin);
-    if (iter != mGuestWindows.end())
+    VBoxGuestWinInfo *pInfo = mGuestWindows.find(hWin);
+    if (pInfo)
     {
         XRectangle *pRects;
@@ -397 +395 @@
         if (!pRects)
             cRects = 0;
-        iter->second->mhasShape = true;
-        if (iter->second->mpRects)
-            XFree(iter->second->mpRects);
-        iter->second->mcRects = cRects;
-        iter->second->mpRects = pRects;
+        pInfo->mhasShape = true;
+        if (pInfo->mpRects)
+            XFree(pInfo->mpRects);
+        pInfo->mcRects = cRects;
+        pInfo->mpRects = pRects;
         mChanged = true;
     }
@@ -415 +413 @@
 {
     LogRelFlowFunc(("\n"));
-    VBoxGuestWindowList::iterator iter;
-
-    iter = mGuestWindows.find(hWin);
-    if (mGuestWindows.end() != iter)
-    {
-        mGuestWindows.removeWindow(iter);
-        mChanged = true;
-    }
-    LogRelFlowFunc(("returning\n"));
+    VBoxGuestWinFree(mGuestWindows.removeWindow(hWin), NULL);
+    LogRelFlowFunc(("returning\n"));
+}
+
+DECLCALLBACK(int) getRectsCallback(VBoxGuestWinInfo *pInfo,
+                                   std::vector<RTRECT> *pRects)
+{
+    if (pInfo->mhasShape)
+    {
+        for (int i = 0; i < pInfo->mcRects; ++i)
+        {
+            RTRECT rect;
+            rect.xLeft   =   pInfo->mX
+                            + pInfo->mpRects[i].x;
+            rect.yBottom =   pInfo->mY
+                            + pInfo->mpRects[i].y
+                            + pInfo->mpRects[i].height;
+            rect.xRight  =   pInfo->mX
+                            + pInfo->mpRects[i].x
+                            + pInfo->mpRects[i].width;
+            rect.yTop    =   pInfo->mY
+                            + pInfo->mpRects[i].y;
+            pRects->push_back(rect);
+        }
+    }
+    else
+    {
+        RTRECT rect;
+        rect.xLeft   =  pInfo->mX;
+        rect.yBottom =  pInfo->mY
+                      + pInfo->mHeight;
+        rect.xRight  =  pInfo->mX
+                      + pInfo->mWidth;
+        rect.yTop    =  pInfo->mY;
+        pRects->push_back(rect);
+    }
+    return VINF_SUCCESS;
 }
 
@@ -437 +463 @@
     if (0 != mcRects)
     {
-            apRects.get()->reserve(mcRects * 2);
-    }
-    for (VBoxGuestWindowList::iterator it = mGuestWindows.begin();
-         it != mGuestWindows.end(); ++it)
-    {
-        if (it->second->mhasShape)
-        {
-            for (int i = 0; i < it->second->mcRects; ++i)
-            {
-                RTRECT rect;
-                rect.xLeft   =   it->second->mX
-                                + it->second->mpRects[i].x;
-                rect.yBottom =   it->second->mY
-                                + it->second->mpRects[i].y
-                                + it->second->mpRects[i].height;
-                rect.xRight  =   it->second->mX
-                                + it->second->mpRects[i].x
-                                + it->second->mpRects[i].width;
-                rect.yTop    =   it->second->mY
-                                + it->second->mpRects[i].y;
-                apRects.get()->push_back(rect);
-            }
-            cRects += it->second->mcRects;
-        }
-        else
-        {
-            RTRECT rect;
-            rect.xLeft   =  it->second->mX;
-            rect.yBottom =  it->second->mY
-                          + it->second->mHeight;
-            rect.xRight  =  it->second->mX
-                          + it->second->mWidth;
-            rect.yTop    =  it->second->mY;
-            apRects.get()->push_back(rect);
-            ++cRects;
-        }
-    }
-    mcRects = cRects;
+        apRects.get()->reserve(mcRects * 2);
+    }
+    mGuestWindows.doWithAll((PVBOXGUESTWINCALLBACK)getRectsCallback,
+                            apRects.get());
+    mcRects = apRects->size();
     LogRelFlowFunc(("returning\n"));
     return apRects;

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

@@ -21 +21 @@
 
 #include <VBox/log.h>
+#include <iprt/avl.h>
 
 #include "seamless-guest.h"
@@ -28 +29 @@
 #include <X11/extensions/shape.h>
 
-#include <map>
 #include <vector>
 
@@ -41 +41 @@
 struct VBoxGuestWinInfo {
 public:
+    /** Header structure for insertion into an AVL tree */
+    AVLU32NODECORE Core;
     /** Is the window currently mapped? */
     bool mhasShape;
@@ -72 +74 @@
 };
 
+/** Callback type used for "DoWithAll" calls */
+typedef DECLCALLBACK(int) VBOXGUESTWINCALLBACK(VBoxGuestWinInfo *, void *);
+/** Pointer to VBOXGUESTWINCALLBACK */
+typedef VBOXGUESTWINCALLBACK *PVBOXGUESTWINCALLBACK;
+
+DECLCALLBACK(int) inline VBoxGuestWinCleanup(VBoxGuestWinInfo *pInfo, void *)
+{
+    delete pInfo;
+    return VINF_SUCCESS;
+}
+
 /**
- * This class is just a wrapper around a map of structures containing information about
- * the windows on the guest system.  It has a function for adding a structure (see addWindow),
- * for removing it by window handle (see removeWindow) and an iterator for
- * going through the list.
+ * This class is just a wrapper around a map of structures containing
+ * information about the windows on the guest system.  It has a function for
+ * adding a structure (see addWindow) and one for removing it by window
+ * handle (see removeWindow).
  */
 class VBoxGuestWindowList
@@ -86 +99 @@
 
     // Private class members
-    std::map<Window, VBoxGuestWinInfo *> mWindows;
+    AVLU32TREE mWindows;
 
 public:
-    // Just proxy iterators to map::iterator
-    typedef std::map<Window, VBoxGuestWinInfo *>::const_iterator const_iterator;
-    typedef std::map<Window, VBoxGuestWinInfo *>::iterator iterator;
-
     // Constructor
-    VBoxGuestWindowList(void) {}
+    VBoxGuestWindowList(void) : mWindows(NULL) {}
     // Destructor
     ~VBoxGuestWindowList()
     {
-        /* We use post-increment in the operation to prevent the iterator from being invalidated. */
-        try
-        {
-            for (iterator it = begin(); it != end(); removeWindow(it++))
-                ;
-        }
-        catch(...) {}
+        /** @todo having this inside the container class hard codes that the
+         *        elements have to be allocated with the "new" operator, and
+         *        I don't see a need to require this. */
+        doWithAll(VBoxGuestWinCleanup, NULL);
     }
 
     // Standard operations
-    const_iterator begin() const { return mWindows.begin(); }
-    iterator begin() { return mWindows.begin(); }
-    const_iterator end() const { return mWindows.end(); }
-    iterator end() { return mWindows.end(); }
-    const_iterator find(Window win) const { return mWindows.find(win); }
-    iterator find(Window win) { return mWindows.find(win); }
-
-    void addWindow(Window hWin, bool isMapped, int x, int y, int w, int h, int cRects,
+    VBoxGuestWinInfo *find(Window hWin)
+    {
+        return (VBoxGuestWinInfo *)RTAvlU32Get(&mWindows, hWin);
+    }
+
+    void detachAll(PVBOXGUESTWINCALLBACK pCallback, void *pvParam)
+    {
+        RTAvlU32Destroy(&mWindows, (PAVLU32CALLBACK)pCallback, pvParam);
+    }
+
+    int doWithAll(PVBOXGUESTWINCALLBACK pCallback, void *pvParam)
+    {
+        return RTAvlU32DoWithAll(&mWindows, 1, (PAVLU32CALLBACK)pCallback,
+                                 pvParam);
+    }
+
+    bool addWindow(Window hWin, bool isMapped, int x, int y, int w, int h, int cRects,
                    XRectangle *pRects)
     {
@@ -121 +136 @@
         VBoxGuestWinInfo *pInfo = new VBoxGuestWinInfo(isMapped, x, y, w, h, cRects,
                                                        pRects);
-        mWindows.insert(std::pair<Window, VBoxGuestWinInfo *>(hWin, pInfo));
+        pInfo->Core.Key = hWin;
         LogRelFlowFunc(("returning\n"));
-    }
-
-    void removeWindow(iterator it)
+        return RTAvlU32Insert(&mWindows, &pInfo->Core);
+    }
+
+    VBoxGuestWinInfo *removeWindow(Window hWin)
     {
         LogRelFlowFunc(("called\n"));
-        delete it->second;
-        mWindows.erase(it);
-    }
-
-    void removeWindow(Window hWin)
-    {
-        LogRelFlowFunc(("called\n"));
-        removeWindow(find(hWin));
+        return (VBoxGuestWinInfo *)RTAvlU32Remove(&mWindows, hWin);
     }
 };