Changeset 3582 in vbox

Timestamp:

Jul 12, 2007 2:05:10 PM (18 years ago)

Author:

vboxsync

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

22831

Message:

Added seamless support property to the IGuest class

Location:

trunk

Files:

• include/VBox/VBoxDev.h (modified) (2 diffs)
• include/VBox/pdm.h (modified) (1 diff)
• src/VBox/Main/GuestImpl.cpp (modified) (2 diffs)
• src/VBox/Main/VMMDevInterface.cpp (modified) (2 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/GuestImpl.h (modified) (3 diffs)

trunk/include/VBox/VBoxDev.h

@@ -29 +29 @@
  * @{ */
 /** the guest requests absolute mouse coordinates (guest additions installed) */
-#define VMMDEV_MOUSEGUESTWANTSABS        BIT(0)
+#define VMMDEV_MOUSEGUESTWANTSABS                           BIT(0)
 /** the host wants to send absolute mouse coordinates (input not captured) */
-#define VMMDEV_MOUSEHOSTWANTSABS         BIT(1)
+#define VMMDEV_MOUSEHOSTWANTSABS                            BIT(1)
 /** the guest needs a hardware cursor on host. When guest additions are installed
  *  and the host has promised to display the cursor itself, the guest installs a
  *  hardware mouse driver. Don't ask the guest to switch to a software cursor then. */
-#define VMMDEV_MOUSEGUESTNEEDSHOSTCUR    BIT(2)
+#define VMMDEV_MOUSEGUESTNEEDSHOSTCUR                       BIT(2)
 /** the host is NOT able to draw the cursor itself (e.g. L4 console) */
-#define VMMDEV_MOUSEHOSTCANNOTHWPOINTER  BIT(3)
+#define VMMDEV_MOUSEHOSTCANNOTHWPOINTER                     BIT(3)
 /** @} */
 
@@ -43 +43 @@
  * @{ */
 /** the guest should perform a logon with the credentials */
-#define VMMDEV_SETCREDENTIALS_GUESTLOGON BIT(0)
+#define VMMDEV_SETCREDENTIALS_GUESTLOGON                    BIT(0)
 /** the guest should prevent local logons */
-#define VMMDEV_SETCREDENTIALS_NOLOCALLOGON BIT(1)
+#define VMMDEV_SETCREDENTIALS_NOLOCALLOGON                  BIT(1)
 /** the guest should verify the credentials */
-#define VMMDEV_SETCREDENTIALS_JUDGE      BIT(15)
+#define VMMDEV_SETCREDENTIALS_JUDGE                         BIT(15)
+/** @} */
+
+/** Guest capability bits
+ * @{ */
+/** the guest supports seamless display rendering */
+#define VMMDEV_GUEST_SUPPORTS_SEAMLESS                      BIT(0)
+/** the guest supports mapping guest to host windows */
+#define VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING     BIT(1)
 /** @} */
 

trunk/include/VBox/pdm.h

@@ -1943 +1943 @@
      */
     DECLR3CALLBACKMEMBER(void, pfnUpdateGuestVersion,(PPDMIVMMDEVCONNECTOR pInterface, struct VBoxGuestInfo *pGuestInfo));
+
+    /**
+     * Update the guest additions capabilities.
+     * This is called when the guest additions capabilities change. The new capabilities
+     * are given and the connector should update its internal state.
+     *
+     * @param   pInterface          Pointer to this interface.
+     * @param   newCapabilities     New capabilities.
+     * @thread  The emulation thread.
+     */
+    DECLR3CALLBACKMEMBER(void, pfnUpdateGuesteCapabilities,(PPDMIVMMDEVCONNECTOR pInterface, uint32_t newCapabilities));
 
     /**

trunk/src/VBox/Main/GuestImpl.cpp

@@ -141 +141 @@
 }
 
+STDMETHODIMP Guest::COMGETTER(SeamlessSupport) (BOOL *aSeamlessSupport)
+{
+    if (!aSeamlessSupport)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *aSeamlessSupport = mData.mSeamlessSupport;
+
+    return S_OK;
+}
+
 STDMETHODIMP Guest::SetCredentials(INPTR BSTR aUserName, INPTR BSTR aPassword,
                                    INPTR BSTR aDomain, BOOL aAllowInteractiveLogon)
@@ -185 +200 @@
     mData.mAdditionsActive = TRUE;
 }
+
+void Guest::setSeamlessSupport(BOOL aSeamlessSupport)
+{
+    AutoCaller autoCaller (this);
+    AssertComRCReturnVoid (autoCaller.rc());
+
+    AutoLock alock (this);
+
+    mData.mSeamlessSupport = aSeamlessSupport;
+}

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -183 +183 @@
         pDrv->pVMMDev->getParent()->onAdditionsOutdated();
     }
+}
+
+/**
+ * Update the guest additions capabilities.
+ * This is called when the guest additions capabilities change. The new capabilities
+ * are given and the connector should update its internal state.
+ *
+ * @param   pInterface          Pointer to this interface.
+ * @param   newCapabilities     New capabilities.
+ * @thread  The emulation thread.
+ */
+DECLCALLBACK(void) vmmdevUpdateGuestCapabilities(PPDMIVMMDEVCONNECTOR pInterface, uint32_t newCapabilities)
+{
+    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
+
+    /* store that information in IGuest */
+    Guest* guest = pDrv->pVMMDev->getParent()->getGuest();
+    Assert(guest);
+    if (!guest)
+        return;
+
+    guest->setSeamlessSupport(BOOL (newCapabilities & VMMDEV_GUEST_SUPPORTS_SEAMLESS));
+
+    /*
+     * Tell the console interface about the event
+     * so that it can notify its consumers.
+     */
+    pDrv->pVMMDev->getParent()->onAdditionsStateChange();
+    
 }
 
@@ -507 +536 @@
 
     pData->Connector.pfnUpdateGuestVersion            = vmmdevUpdateGuestVersion;
+    pData->Connector.pfnUpdateGuesteCapabilities      = vmmdevUpdateGuestCapabilities;
     pData->Connector.pfnUpdateMouseCapabilities       = vmmdevUpdateMouseCapabilities;
     pData->Connector.pfnUpdatePointerShape            = vmmdevUpdatePointerShape;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4131 +4131 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="4b71ac5f-db5a-4b4f-af6e-a947d4b83dda"
+     uuid="d7a3f7cf-84c4-4628-9267-a1cff0e5f3bc"
      wsmap="suppress"
      >
@@ -4171 +4171 @@
         the version might be refused by VirtualBox (incompatible) or
         other failures occured.
+      </desc>
+    </attribute>
+
+    <attribute name="seamlessSupport" type="boolean" readonly="yes">
+      <desc>
+        Flag whether seamless guest display rendering is supported.
       </desc>
     </attribute>

trunk/src/VBox/Main/include/GuestImpl.h

@@ -59 +59 @@
     STDMETHOD(COMGETTER(AdditionsActive)) (BOOL *aAdditionsActive);
     STDMETHOD(COMGETTER(AdditionsVersion)) (BSTR *aAdditionsVersion);
+    STDMETHOD(COMGETTER(SeamlessSupport)) (BOOL *aSeamlessSupport);
 
     // IGuest methods
@@ -67 +68 @@
     void setAdditionsVersion (Bstr aVersion);
 
+    void setSeamlessSupport(BOOL aSeamlessSupport);
+
     // for VirtualBoxSupportErrorInfoImpl
     static const wchar_t *getComponentName() { return L"Guest"; }
@@ -74 +77 @@
     struct Data
     {
-        Data() : mAdditionsActive (FALSE) {}
+        Data() : mAdditionsActive (FALSE), mSeamlessSupport (FALSE) {}
 
         Bstr mOSTypeId;
         BOOL mAdditionsActive;
         Bstr mAdditionsVersion;
+        BOOL mSeamlessSupport;
     };