Changeset 3911 in vbox

Timestamp:

Jul 27, 2007 8:04:47 PM (18 years ago)

Author:

vboxsync

Message:

Main: IGuest::seamlessSupport => supportsSeamless.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (3 diffs)
• Main/DisplayImpl.cpp (modified) (2 diffs)
• Main/GuestImpl.cpp (modified) (3 diffs)
• Main/VMMDevInterface.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (5 diffs)
• Main/include/GuestImpl.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -232 +232 @@
                          const QString &aAddVersion,
                          bool aAddActive,
-                         bool aSeamlessActive) :
+                         bool aSupportsSeamless) :
         QEvent ((QEvent::Type) VBoxDefs::AdditionsStateChangeEventType),
         mOsTypeId (aOsTypeId), mAddVersion (aAddVersion),
-        mAddActive (aAddActive), mSeamlessActive (aSeamlessActive) {}
+        mAddActive (aAddActive), mSupportsSeamless (aSupportsSeamless) {}
     const QString &osTypeId() const { return mOsTypeId; }
     const QString &additionVersion() const { return mAddVersion; }
     bool additionActive() const { return mAddActive; }
-    bool seamlessActive() const { return mSeamlessActive; }
+    bool supportsSeamless() const { return mSupportsSeamless; }
 private:
     QString mOsTypeId;
     QString mAddVersion;
     bool mAddActive;
-    bool mSeamlessActive;
+    bool mSupportsSeamless;
 };
 
@@ -396 +396 @@
                                      guest.GetAdditionsVersion(),
                                      guest.GetAdditionsActive(),
-                                     guest.GetSeamlessSupport()));
+                                     guest.GetSupportsSeamless()));
         return S_OK;
     }
@@ -1045 +1045 @@
                 emit additionsStateChanged (ge->additionVersion(),
                                             ge->additionActive(),
-                                            ge->seamlessActive());
+                                            ge->supportsSeamless());
                 return true;
             }

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -1536 +1536 @@
     lock.leave ();
     if (mParent->getVMMDev())
-        mParent->getVMMDev()->getVMMDevPort()->pfnRequestDisplayChange(mParent->getVMMDev()->getVMMDevPort(), aWidth, aHeight, aBitsPerPixel, aDisplay);
+        mParent->getVMMDev()->getVMMDevPort()->
+            pfnRequestDisplayChange (mParent->getVMMDev()->getVMMDevPort(),
+                                     aWidth, aHeight, aBitsPerPixel, aDisplay);
     return S_OK;
 }
@@ -1548 +1550 @@
     lock.leave ();
     if (mParent->getVMMDev())
-        mParent->getVMMDev()->getVMMDevPort()->pfnRequestSeamlessChange(mParent->getVMMDev()->getVMMDevPort(), !!enabled);
+        mParent->getVMMDev()->getVMMDevPort()->
+            pfnRequestSeamlessChange (mParent->getVMMDev()->getVMMDevPort(),
+                                      !!enabled);
     return S_OK;
 }

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;
+STDMETHODIMP Guest::COMGETTER(SupportsSeamless) (BOOL *aSupportsSeamless)
+{
+    if (!aSupportsSeamless)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *aSupportsSeamless = mData.mSupportsSeamless;
 
     return S_OK;
@@ -201 +201 @@
 }
 
-void Guest::setSeamlessSupport(BOOL aSeamlessSupport)
+void Guest::setSupportsSeamless (BOOL aSupportsSeamless)
 {
     AutoCaller autoCaller (this);
@@ -208 +208 @@
     AutoLock alock (this);
 
-    mData.mSeamlessSupport = aSeamlessSupport;
-}
+    mData.mSupportsSeamless = aSupportsSeamless;
+}

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -206 +206 @@
     Assert(!(newCapabilities & ~VMMDEV_GUEST_SUPPORTS_SEAMLESS));
 
-    guest->setSeamlessSupport(BOOL (newCapabilities & VMMDEV_GUEST_SUPPORTS_SEAMLESS));
+    guest->setSupportsSeamless(BOOL (newCapabilities & VMMDEV_GUEST_SUPPORTS_SEAMLESS));
 
     /*

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

@@ -4150 +4150 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="d7a3f7cf-84c4-4628-9267-a1cff0e5f3bc"
+     uuid="4a61e982-172b-4116-b12e-024b8a9a2b9d"
      wsmap="suppress"
      >
@@ -4193 +4193 @@
     </attribute>
 
-    <attribute name="seamlessSupport" type="boolean" readonly="yes">
-      <desc>
-        Flag whether seamless guest display rendering is supported.
+    <attribute name="supportsSeamless" type="boolean" readonly="yes">
+      <desc>
+        Flag whether seamless guest display rendering (seamless desktop
+        integration) is supported.
       </desc>
     </attribute>
@@ -6307 +6308 @@
         to="PixelFormat::PixelFormatOpaque"/> then direct access to the guest
         VRAM buffer is not available -- the @a VRAM, @a bitsPerPixel and @a
-        bytesPerLine parameters must be ingored and the implementation must use
+        bytesPerLine parameters must be ignored and the implementation must use
         the indirect mode (where it provides its own buffer in one of the
         supported formats). In all other cases, @a pixelFormat together with @a
@@ -6625 +6626 @@
         should issue the request and wait for a resolution change and
         after a timeout retry.
-        Specifying "0" for either width and height or the color depth
-        means that the dimensions or color depth should not be changed.
-        It is possible to specify the number of the guest display
-        that has to be resized, if guest supports multimonitor configuration.
-        The display value 0 means primary display, 1 - first secondary.
+        
+        Specifying <tt>0</tt> for either @a width, @a height or @a bitsPerPixel
+        parameters means that the corresponding values should be taken from the
+        current video mode (i.e. left unchanged).
+
+        If the guest OS supports multi-monitor configuration then the @a display
+        parameter specifies the number of the guest display to send the hint to:
+        <tt>0</tt> is the primary display, <tt>1</tt> is the first secondary and
+        so on. If the multi-monitor configuration is not supported, @a display
+        must be <tt>0</tt>.
+
       </desc>
       <param name="width" type="unsigned long" dir="in"/>
@@ -6639 +6646 @@
     <method name="setSeamlessMode">
       <desc>
-        Current guest seamless mode.
+        Enables or disables seamless guest display rendering (seamless desktop
+        integration) mode.
+        <note>
+          Calling this method has no effect if <link
+          to="IGuest::supportsSeamless"/> returns <tt>false</tt>.
+        </note>
       </desc>
       <param name="enabled" type="boolean" dir="in"/>

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

@@ -59 +59 @@
     STDMETHOD(COMGETTER(AdditionsActive)) (BOOL *aAdditionsActive);
     STDMETHOD(COMGETTER(AdditionsVersion)) (BSTR *aAdditionsVersion);
-    STDMETHOD(COMGETTER(SeamlessSupport)) (BOOL *aSeamlessSupport);
+    STDMETHOD(COMGETTER(SupportsSeamless)) (BOOL *aSupportsSeamless);
 
     // IGuest methods
@@ -68 +68 @@
     void setAdditionsVersion (Bstr aVersion);
 
-    void setSeamlessSupport(BOOL aSeamlessSupport);
+    void setSupportsSeamless (BOOL aSupportsSeamless);
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -77 +77 @@
     struct Data
     {
-        Data() : mAdditionsActive (FALSE), mSeamlessSupport (FALSE) {}
+        Data() : mAdditionsActive (FALSE), mSupportsSeamless (FALSE) {}
 
         Bstr mOSTypeId;
         BOOL mAdditionsActive;
         Bstr mAdditionsVersion;
-        BOOL mSeamlessSupport;
+        BOOL mSupportsSeamless;
     };