Changeset 52564 in vbox

Timestamp:

Sep 2, 2014 8:53:51 AM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: more clean-up and fix a test case.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• seamless-x11.cpp (modified) (3 diffs)
• seamless-x11.h (modified) (5 diffs)
• seamless.cpp (modified) (3 diffs)
• seamless.h (modified) (2 diffs)
• testcase/tstSeamlessX11-auto.cpp (modified) (12 diffs)

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

@@ -71 +71 @@
   * @returns true if it can handle seamless, false otherwise
   */
-int SeamlessX11::init(SeamlessHostProxy *pHost)
+int SeamlessX11::init(PFNSENDREGIONUPDATE pHostCallback)
 {
     int rc = VINF_SUCCESS;
 
     LogRelFlowFunc(("\n"));
-    if (0 != mHost)  /* Assertion */
+    if (mHostCallback != NULL)  /* Assertion */
     {
         LogRel(("VBoxClient: ERROR: attempt to initialise seamless guest object twice!\n"));
@@ -86 +86 @@
         return VERR_ACCESS_DENIED;
     }
-    mHost = pHost;
+    mHostCallback = pHostCallback;
     LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
@@ -299 +299 @@
     {
         updateRects();
-        mHost->sendRegionUpdate(mpRects, mcRects);
+        mHostCallback(mpRects, mcRects);
     }
     mChanged = false;

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

@@ -34 +34 @@
 
 /**
- * Small virtual class which provides the interface for notifying the host of
- * changes to the X11 window configuration, mainly split out from
- * @a VBoxGuestSeamlessHost to simplify the unit test.
- */
-class SeamlessHostProxy
-{
-public:
-    virtual void sendRegionUpdate(RTRECT *pRects, size_t cRects) = 0;
-    virtual ~SeamlessHostProxy() {}
-};
+ * Callback which provides the interface for notifying the host of changes to
+ * the X11 window configuration, mainly split out from @a VBoxGuestSeamlessHost
+ * to simplify the unit test.
+ */
+typedef void FNSENDREGIONUPDATE(RTRECT *pRects, size_t cRects);
+typedef FNSENDREGIONUPDATE *PFNSENDREGIONUPDATE;
 
 /** Structure containing information about a guest window's position and visible area.
@@ -164 +160 @@
 
     // Private member variables
-    /** Pointer to the host class. */
-    SeamlessHostProxy *mHost;
+    /** Pointer to the host callback. */
+    PFNSENDREGIONUPDATE mHostCallback;
     /** Our connection to the X11 display we are running on. */
     Display *mDisplay;
@@ -205 +201 @@
     /**
      * Initialise the guest and ensure that it is capable of handling seamless mode
-     * @param   pHost Host interface class to notify of window configuration
+     * @param   pHost Host interface callback to notify of window configuration
      *                changes.
      *
      * @returns iprt status code
      */
-    int init(SeamlessHostProxy *pHost);
+    int init(PFNSENDREGIONUPDATE pHostCallback);
 
     /**
@@ -217 +213 @@
     void uninit(void)
     {
-        if (mHost)
+        if (mHostCallback)
             stop();
-        mHost = NULL;
+        mHostCallback = NULL;
         if (mDisplay)
             XCloseDisplay(mDisplay);
@@ -251 +247 @@
 
     SeamlessX11(void)
-        : mHost(0), mDisplay(NULL), mpRects(NULL), mcRects(0),
+        : mHostCallback(NULL), mDisplay(NULL), mpRects(NULL), mcRects(0),
           mSupportsShape(false), mEnabled(false), mChanged(false) {}
 

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

@@ -50 +50 @@
 
 /**
+ * Update the set of visible rectangles in the host.
+ */
+static void sendRegionUpdate(RTRECT *pRects, size_t cRects)
+{
+    LogRelFlowFunc(("\n"));
+    if (cRects && !pRects)  /* Assertion */
+    {
+        LogRelFunc(("ERROR: called with null pointer!\n"));
+        return;
+    }
+    VbglR3SeamlessSendRects(cRects, pRects);
+    LogRelFlowFunc(("returning\n"));
+}
+
+/**
  * initialise the service.
  */
@@ -60 +75 @@
     do {
         pcszStage = "Connecting to the X server";
-        rc = mX11Monitor.init(this);
+        rc = mX11Monitor.init(sendRegionUpdate);
         if (RT_FAILURE(rc))
             break;
@@ -175 +190 @@
 
 /**
- * Update the set of visible rectangles in the host.
- */
-void SeamlessMain::sendRegionUpdate(RTRECT *pRects, size_t cRects)
-{
-    LogRelFlowFunc(("\n"));
-    if (cRects && !pRects)  /* Assertion */
-    {
-        LogRelThisFunc(("ERROR: called with null pointer!\n"));
-        return;
-    }
-    VbglR3SeamlessSendRects(cRects, pRects);
-    LogRelFlowFunc(("returning\n"));
-}
-
-
-/**
  * The actual X11 window configuration change monitor thread function.
  */

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

@@ -29 +29 @@
  * Interface to the host
  */
-class SeamlessMain : public SeamlessHostProxy
+class SeamlessMain
 {
 private:
@@ -109 +109 @@
     int resume();
 
-    /**
-     * Update the set of visible rectangles in the host.
-     */
-    virtual void sendRegionUpdate(RTRECT *pRects, size_t cRects);
-
     /** Run a few tests to be sure everything is working as intended. */
     int selfTest();

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

@@ -297 +297 @@
 }
 
-/** Dummy host class */
-class testHost: public SeamlessHostProxy
-{
-    bool mfNotified;
-public:
-    testHost() : mfNotified(false) {}
-    virtual void sendRegionUpdate(RTRECT *pRects, size_t cRects)
-    {
-        mfNotified = true;
-    }
-    virtual ~testHost() {}
-    bool isNotified(void) { return mfNotified; }
-};
+/** Global "received a notification" flag. */
+static bool g_fNotified = false;
+
+/** Dummy host call-back. */
+static void sendRegionUpdate(RTRECT *pRects, size_t cRects)
+{
+    g_fNotified = true;
+}
+
+static bool gotNotification(void)
+{
+    if (!g_fNotified)
+        return false;
+    g_fNotified = false;
+    return true;
+}
 
 /*****************************
@@ -372 +375 @@
     /** The onscreen positions of those windows. */
     RTRECT *paReportedRects;
+    /** Do we expect notification after the event? */
+    bool fExpectNotification;
 };
 
@@ -419 +424 @@
     20,
     RT_ELEMENTS(g_aRects1),
-    g_aRects1
+    g_aRects1,
+    true
 };
 
@@ -454 +460 @@
     20,
     RT_ELEMENTS(g_aRects1),
-    g_aRects1
+    g_aRects1,
+    true
 };
 
@@ -484 +491 @@
     20,
     RT_ELEMENTS(g_aRects1),
-    g_aRects1
+    g_aRects1,
+    true
 };
 
@@ -514 +522 @@
     20,
     0,
-    NULL
+    NULL,
+    true
 };
 
@@ -545 +554 @@
     21,
     RT_ELEMENTS(g_aRects2),
-    g_aRects2
+    g_aRects2,
+    false
 };
 
@@ -574 +584 @@
     20,
     RT_ELEMENTS(g_aRects1),
-    g_aRects1
+    g_aRects1,
+    true
 };
 
@@ -599 +610 @@
 {
     SeamlessX11 subject;
-    testHost host;
     unsigned cErrs = 0;
 
-    subject.init(&host);
+    subject.init(sendRegionUpdate);
     smlsSetWindowAttributes(pFixture->paAttribsBefore,
                             pFixture->pahWindowsBefore,
@@ -619 +629 @@
                            pFixture->paShapeRectsAfter);
     smlsSetNextEvent(pFixture->x11EventType, pFixture->hEventWindow);
-    if (host.isNotified())  /* Initial window tree rebuild */
+    if (gotNotification())  /* Initial window tree rebuild */
     {
         RTPrintf("%s: fixture: %s.  Notification was set before the first event!!!\n",
@@ -626 +636 @@
     }
     subject.nextConfigurationEvent();
-    if (!host.isNotified())
+    if (!gotNotification())
     {
         RTPrintf("%s: fixture: %s.  No notification was sent for the initial window tree rebuild.\n",
@@ -634 +644 @@
     smlsSetNextEvent(0, 0);
     subject.nextConfigurationEvent();
-    if (!host.isNotified())
+    if (pFixture->fExpectNotification && !gotNotification())
     {
         RTPrintf("%s: fixture: %s.  No notification was sent after the event.\n",