Changeset 3110 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 14, 2007 4:18:18 PM (18 years ago)

Author:

vboxsync

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

21993

Message:

Added the display index parameter to the SetVideoModeHint (in the guest all hints are still processed only for the primary monitor).

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/DisplayImpl.h (modified) (1 diff)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -1334 +1334 @@
 }
 
-STDMETHODIMP Display::SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth)
+STDMETHODIMP Display::SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth, ULONG aDisplay)
 {
     AutoLock lock(this);
@@ -1358 +1358 @@
         bpp = cBits;
     }
-    ULONG vramSize;
-    mParent->machine()->COMGETTER(VRAMSize)(&vramSize);
-    /* enough VRAM? */
-    if ((width * height * (bpp / 8)) > (vramSize * 1024 * 1024))
-        return setError(E_FAIL, tr("Not enough VRAM for the selected video mode"));
+    ULONG cMonitors;
+    mParent->machine()->COMGETTER(MonitorCount)(&cMonitors);
+    if (cMonitors == 0 && aDisplay > 0)
+        return E_INVALIDARG;
+    if (aDisplay >= cMonitors)
+        return E_INVALIDARG;
+
+// sunlover 20070614: It is up to the guest to decide whether the hint is valid.
+//    ULONG vramSize;
+//    mParent->machine()->COMGETTER(VRAMSize)(&vramSize);
+//    /* enough VRAM? */
+//    if ((width * height * (bpp / 8)) > (vramSize * 1024 * 1024))
+//        return setError(E_FAIL, tr("Not enough VRAM for the selected video mode"));
 
     if (mParent->getVMMDev())
-        mParent->getVMMDev()->getVMMDevPort()->pfnRequestDisplayChange(mParent->getVMMDev()->getVMMDevPort(), aWidth, aHeight, aColorDepth);
+        mParent->getVMMDev()->getVMMDevPort()->pfnRequestDisplayChange(mParent->getVMMDev()->getVMMDevPort(), aWidth, aHeight, aColorDepth, aDisplay);
     return S_OK;
 }

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

@@ -6298 +6298 @@
     <interface
         name="IDisplay" extends="$unknown"
-        uuid="FD443EC1-0012-4F5B-9282-D72760A66916"
+        uuid="0a6a7746-5469-47e4-9a00-8b1ea28891b8"
         wsmap="suppress"
     >
@@ -6353 +6353 @@
                 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.
             </desc>
             <param name="width" type="unsigned long" dir="in"/>
             <param name="height" type="unsigned long" dir="in"/>
             <param name="colorDepth" type="unsigned long" dir="in"/>
+            <param name="display" type="unsigned long" dir="in"/>
         </method>
 

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

@@ -138 +138 @@
     STDMETHOD(UnlockFramebuffer)();
     STDMETHOD(RegisterExternalFramebuffer)(IFramebuffer *frameBuf);
-    STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG colorDepth);
+    STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG colorDepth, ULONG display);
     STDMETHOD(TakeScreenShot)(BYTE *address, ULONG width, ULONG height);
     STDMETHOD(DrawToScreen)(BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);