Changeset 8323 in vbox for trunk/src/VBox

Timestamp:

Apr 23, 2008 10:11:19 AM (17 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox3/4, Main: only switch to seamless mode if the host resolution is less than the maximum currently supported by the additions

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)
• Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/GuestImpl.h (modified) (1 diff)

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

@@ -1971 +1971 @@
                          * screen.height() /* display height */
                          * QColor::numBitPlanes(); /* bit per pixel */
-        if (aOn && (availBits < usedBits))
+        CGuest guest = console->console().GetGuest();
+        ULONG maxWidth  = guest.GetMaxGuestWidth();
+        ULONG maxHeight = guest.GetMaxGuestHeight();
+        if (aOn && (   (availBits < usedBits)
+                    || ((maxWidth != 0) && (maxWidth < screen.width()))
+                    || ((maxHeight != 0) && (maxHeight < screen.height()))
+                   )
+           )
         {
             vboxProblem().cannotEnterSeamlessMode (screen.width(),

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -1994 +1994 @@
                          * screen.height() /* display height */
                          * depth(); /* bit per pixel */
-        if (aOn && (availBits < usedBits))
+        CGuest guest = console->console().GetGuest();
+        ULONG maxWidth  = guest.GetMaxGuestWidth();
+        ULONG maxHeight = guest.GetMaxGuestHeight();
+        if (aOn && (   (availBits < usedBits)
+                    || ((maxWidth != 0) && (maxWidth < screen.width()))
+                    || ((maxHeight != 0) && (maxHeight < screen.height()))
+                   )
+           )
         {
             vboxProblem().cannotEnterSeamlessMode (screen.width(),

trunk/src/VBox/Main/GuestImpl.cpp

@@ -161 +161 @@
 }
 
+STDMETHODIMP Guest::COMGETTER(MaxGuestWidth) (ULONG *aMaxWidth)
+{
+    if (!VALID_PTR(aMaxWidth))
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    *aMaxWidth = mData.mMaxWidth;
+
+    return S_OK;
+}
+
+STDMETHODIMP Guest::COMGETTER(MaxGuestHeight) (ULONG *aMaxHeight)
+{
+    if (!VALID_PTR(aMaxHeight))
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    *aMaxHeight = mData.mMaxHeight;
+
+    return S_OK;
+}
+
 STDMETHODIMP Guest::COMGETTER(SupportsSeamless) (BOOL *aSupportsSeamless)
 {

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

@@ -5184 +5184 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="d8556fca-81bc-12af-fca3-365528fa38ca"
+     uuid="655f0f7f-a35b-4e2f-a728-175d7e18dcce"
 
      wsmap="suppress"
@@ -5227 +5227 @@
         the version might be refused by VirtualBox (incompatible) or
         other failures occured.
+      </desc>
+    </attribute>
+
+    <attribute name="maxGuestWidth" type="unsigned long" readonly="yes">
+      <desc>
+        The maximum horizontal resolution currently supported by the
+        Guest Additions for the purpose of host-initiated resiing
+        (and fullscreen and seamless).  A value of zero means no
+        arbitrary maximum other than that imposed by VRAM limits.
+      </desc>
+    </attribute>
+
+    <attribute name="maxGuestHeight" type="unsigned long" readonly="yes">
+      <desc>
+        The maximum vertical resolution currently supported by the
+        Guest Additions for the purpose of host-initiated resiing
+        (and fullscreen and seamless).  A value of zero means no
+        arbitrary maximum other than that imposed by VRAM limits.
       </desc>
     </attribute>

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

@@ -61 +61 @@
     STDMETHOD(COMGETTER(AdditionsActive)) (BOOL *aAdditionsActive);
     STDMETHOD(COMGETTER(AdditionsVersion)) (BSTR *aAdditionsVersion);
+    STDMETHOD(COMGETTER(MaxGuestWidth)) (ULONG *aMaxWidth);
+    STDMETHOD(COMGETTER(MaxGuestHeight)) (ULONG *aMaxHeight);
     STDMETHOD(COMGETTER(SupportsSeamless)) (BOOL *aSupportsSeamless);
     STDMETHOD(COMGETTER(SupportsGraphics)) (BOOL *aSupportsGraphics);