Changeset 36806 in vbox

Timestamp:

Apr 21, 2011 10:41:21 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/seamless: no more std::autoptr or std::vector, use the new STL-vector-in-C instead

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• seamless-guest.h (modified) (2 diffs)
• seamless-host.cpp (modified) (1 diff)
• seamless-host.h (modified) (2 diffs)
• seamless-x11.cpp (modified) (5 diffs)
• seamless-x11.h (modified) (5 diffs)
• seamless.h (modified) (1 diff)

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

@@ -19 +19 @@
 #ifndef __Additions_client_seamless_guest_h
 # define __Additions_client_seamless_guest_h
-
-#include <memory>            /* for auto_ptr */
-#include <vector>            /* for vector */
 
 #include <iprt/types.h>      /* for RTRECT */
@@ -45 +42 @@
         INCAPABLE
     };
-
-    /**
-     * Initialise the guest and ensure that it is capable of handling seamless mode
-     *
-     * @param   pObserver An observer object to which to report changes in state and events
-     *                    by calling its notify() method.  A state change to CAPABLE also
-     *                    signals new seamless data.
-     * @returns iprt status code
-     */
-    int init(VBoxGuestSeamlessObserver *pObserver);
-
-    /**
-     * Shutdown seamless event monitoring.
-     */
-    void uninit(void);
-
-    /**
-     * Initialise seamless event reporting in the guest.
-     *
-     * @returns IPRT status code
-     */
-    int start(void);
-    /** Stop reporting seamless events. */
-    void stop(void);
-    /** Get the current state of the guest (capable or incapable of seamless mode). */
-    // meEvent getState(void);
-    /** Get the current list of visible rectangles. */
-    std::auto_ptr<std::vector<RTRECT> > getRects(void);
-    /** Process next event in the guest event queue - called by the event thread. */
-    void nextEvent(void);
-    /** Wake up the event thread if it is waiting for an event so that it can exit. */
-    bool interruptEvent(void);
 };
 

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

@@ -134 +134 @@
  * Update the set of visible rectangles in the host.
  */
-void VBoxGuestSeamlessHost::updateRects(std::auto_ptr<std::vector<RTRECT> > pRects)
+void VBoxGuestSeamlessHost::updateRects(RTRECT *pRects, size_t cRects)
 {
     LogRelFlowFunc(("\n"));
-    if (0 == pRects.get())  /* Assertion */
+    if (!pRects)  /* Assertion */
     {
         LogRelThisFunc(("ERROR: called with null pointer!\n"));
         return;
     }
-    VbglR3SeamlessSendRects(pRects.get()->size(), pRects.get()->empty() ? NULL : &pRects.get()->front());
+    VbglR3SeamlessSendRects(cRects, pRects);
     LogRelFlowFunc(("returning\n"));
 }

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

@@ -18 +18 @@
 #ifndef __Additions_client_seamless_host_h
 # define __Additions_client_seamless_host_h
-
-#include <memory>                   /* for auto_ptr */
-#include <vector>                   /* for vector */
 
 #include <VBox/log.h>
@@ -151 +148 @@
      * Update the set of visible rectangles in the host.
      */
-    void updateRects(std::auto_ptr<std::vector<RTRECT> > pRects);
+    void updateRects(RTRECT *pRects, size_t cRects);
 
     VBoxGuestSeamlessHost(void) : mThreadFunction(this),

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

@@ -29 +29 @@
 
 #include <limits.h>
+
+#include "vector.h"
 
 #ifdef TESTCASE
@@ -297 +299 @@
        here because we want to send all such information from a single thread. */
     if (mChanged)
+    {
+        updateRects();
         mObserver->notify();
+    }
     mChanged = false;
     XNextEvent(mDisplay, &event);
@@ -418 +423 @@
 }
 
+/**
+ * Gets the list of visible rectangles
+ */
+RTRECT *VBoxGuestSeamlessX11::getRects(void)
+{
+    return mpRects;
+}
+
+/**
+ * Gets the number of rectangles in the visible rectangle list
+ */
+size_t VBoxGuestSeamlessX11::getRectCount(void)
+{
+    return mcRects;
+}
+
+RTVEC_DECL(RectList, RTRECT)
+
 DECLCALLBACK(int) getRectsCallback(VBoxGuestWinInfo *pInfo,
-                                   std::vector<RTRECT> *pRects)
+                                   struct RectList *pRects)
 {
     if (pInfo->mhasShape)
@@ -425 +448 @@
         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);
+            RTRECT *pRect;
+            
+            pRect = RectListPushBack(pRects);
+            if (!pRect)
+                return VERR_NO_MEMORY;
+            pRect->xLeft   =   pInfo->mX
+                             + pInfo->mpRects[i].x;
+            pRect->yBottom =   pInfo->mY
+                             + pInfo->mpRects[i].y
+                             + pInfo->mpRects[i].height;
+            pRect->xRight  =   pInfo->mX
+                             + pInfo->mpRects[i].x
+                             + pInfo->mpRects[i].width;
+            pRect->yTop    =   pInfo->mY
+                             + pInfo->mpRects[i].y;
         }
     }
     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);
+        RTRECT *pRect;
+
+        pRect = RectListPushBack(pRects);
+        if (!pRect)
+            return VERR_NO_MEMORY;
+        pRect->xLeft   =  pInfo->mX;
+        pRect->yBottom =  pInfo->mY
+                        + pInfo->mHeight;
+        pRect->xRight  =  pInfo->mX
+                        + pInfo->mWidth;
+        pRect->yTop    =  pInfo->mY;
     }
     return VINF_SUCCESS;
@@ -454 +483 @@
 
 /**
- * Sends an updated list of visible rectangles to the host
- */
-std::auto_ptr<std::vector<RTRECT> > VBoxGuestSeamlessX11::getRects(void)
+ * Updates the list of seamless rectangles
+ */
+int VBoxGuestSeamlessX11::updateRects(void)
 {
     LogRelFlowFunc(("\n"));
     unsigned cRects = 0;
-    std::auto_ptr<std::vector<RTRECT> > apRects(new std::vector<RTRECT>);
+    struct RectList rects = RTVEC_INITIALIZER;
 
     if (0 != mcRects)
     {
-        apRects.get()->reserve(mcRects * 2);
+        int rc = RectListReserve(&rects, mcRects * 2);
+        if (RT_FAILURE(rc))
+            return rc;
     }
     mGuestWindows.doWithAll((PVBOXGUESTWINCALLBACK)getRectsCallback,
-                            apRects.get());
-    mcRects = apRects->size();
-    LogRelFlowFunc(("returning\n"));
-    return apRects;
+                            &rects);
+    if (mpRects)
+        RTMemFree(mpRects);
+    mcRects = RectListSize(&rects);
+    mpRects = RectListDetach(&rects);
+    LogRelFlowFunc(("returning\n"));
+    return VINF_SUCCESS;
 }
 

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

@@ -28 +28 @@
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
-
-#include <vector>
 
 #define WM_TYPE_PROP "_NET_WM_WINDOW_TYPE"
@@ -164 +162 @@
     /** Class to keep track of visible guest windows. */
     VBoxGuestWindowList mGuestWindows;
-    /** Keeps track of the total number of rectangles needed for the visible area of all
-        guest windows on the last call to getRects.  Used for pre-allocating space in
-        the vector of rectangles passed to the host. */
+    /** The current set of seamless rectangles. */
+    RTRECT *mpRects;
+    /** The current number of seamless rectangles. */
     int mcRects;
     /** Do we support the X shaped window extension? */
@@ -194 +192 @@
     void freeWindowTree(void);
     void updateHostSeamlessInfo(void);
+    int updateRects(void);
 
 public:
@@ -225 +224 @@
     void stop(void);
     /** Get the current list of visible rectangles. */
-    std::auto_ptr<std::vector<RTRECT> > getRects(void);
+    RTRECT *getRects(void);
+    /** Get the number of visible rectangles in the current list */
+    size_t getRectCount(void);
 
     /** Process next event in the guest event queue - called by the event thread. */
@@ -240 +241 @@
 
     VBoxGuestSeamlessX11(void)
-        : mObserver(0), mDisplay(NULL), mcRects(0), mSupportsShape(false),
-          mEnabled(false), mChanged(false) {}
+        : mObserver(0), mDisplay(NULL), mpRects(NULL), mcRects(0),
+          mSupportsShape(false), mEnabled(false), mChanged(false) {}
 
     ~VBoxGuestSeamlessX11()

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

@@ -124 +124 @@
     virtual void notify(void)
     {
-        mHost->updateRects(mGuest->getRects());
+        mHost->updateRects(mGuest->getRects(), mGuest->getRectCount());
     }
 };