Changeset 78784 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

May 27, 2019 2:16:41 PM (6 years ago)

Author:

vboxsync

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

130873

Message:

API: add getVideoModeHint.
bugref:9472: API: let the GUI notice video mode hints from other sources.
This Display object API method lets a caller retrieve information about the
virtual monitor attached to a virtual display output, including the preferred
mode (was: last mode hint). The name is legacy and will be changed to
getMonitorInfo in 7.0.

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -42 +42 @@
 # include <VBox/vmm/vm.h>
 #endif
-#include <VBox/VMMDev.h>
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -1971 +1970 @@
     }
 
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     if (aDisplay >= mcMonitors)
@@ -2002 +2001 @@
     }
 
+    VMMDevDisplayDef d;
+    d.idDisplay     = aDisplay;
+    d.xOrigin       = aOriginX;
+    d.yOrigin       = aOriginY;
+    d.cx            = aWidth;
+    d.cy            = aHeight;
+    d.cBitsPerPixel = aBitsPerPixel;
+    d.fDisplayFlags = VMMDEV_DISPLAY_CX | VMMDEV_DISPLAY_CY | VMMDEV_DISPLAY_BPP;
+    if (!aEnabled)
+        d.fDisplayFlags |= VMMDEV_DISPLAY_DISABLED;
+    if (aChangeOrigin)
+        d.fDisplayFlags |= VMMDEV_DISPLAY_ORIGIN;
+    if (aDisplay == 0)
+        d.fDisplayFlags |= VMMDEV_DISPLAY_PRIMARY;
     /* We currently never suppress the VMMDev hint if the guest has requested
      * it.  Specifically the video graphics driver may not be responsible for
@@ -2011 +2024 @@
         PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
         if (pVMMDevPort)
-        {
-            VMMDevDisplayDef d;
-            d.idDisplay     = aDisplay;
-            d.xOrigin       = aOriginX;
-            d.yOrigin       = aOriginY;
-            d.cx            = aWidth;
-            d.cy            = aHeight;
-            d.cBitsPerPixel = aBitsPerPixel;
-            d.fDisplayFlags = VMMDEV_DISPLAY_CX | VMMDEV_DISPLAY_CY | VMMDEV_DISPLAY_BPP;
-            if (!aEnabled)
-                d.fDisplayFlags |= VMMDEV_DISPLAY_DISABLED;
-            if (aChangeOrigin)
-                d.fDisplayFlags |= VMMDEV_DISPLAY_ORIGIN;
-            if (aDisplay == 0)
-                d.fDisplayFlags |= VMMDEV_DISPLAY_PRIMARY;
-
             pVMMDevPort->pfnRequestDisplayChange(pVMMDevPort, 1, &d, false);
-        }
-    }
+    }
+    /* Remember the monitor information. */
+    maFramebuffers[aDisplay].monitorDesc = d;
+    return S_OK;
+}
+
+HRESULT Display::getVideoModeHint(ULONG cDisplay, BOOL *pfEnabled,
+                                  BOOL *pfChangeOrigin, LONG *pxOrigin, LONG *pyOrigin,
+                                  ULONG *pcx, ULONG *pcy, ULONG *pcBitsPerPixel)
+{
+    if (cDisplay >= mcMonitors)
+        return E_INVALIDARG;
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (pfEnabled)
+        *pfEnabled      = !(  maFramebuffers[cDisplay].monitorDesc.fDisplayFlags
+                            & VMMDEV_DISPLAY_DISABLED);
+    if (pfChangeOrigin)
+        *pfChangeOrigin = RT_BOOL(  maFramebuffers[cDisplay].monitorDesc.fDisplayFlags
+                                  & VMMDEV_DISPLAY_ORIGIN);
+    if (pxOrigin)
+        *pxOrigin       = maFramebuffers[cDisplay].monitorDesc.xOrigin;
+    if (pyOrigin)
+        *pyOrigin       = maFramebuffers[cDisplay].monitorDesc.yOrigin;
+    if (pcx)
+        *pcx            = maFramebuffers[cDisplay].monitorDesc.cx;
+    if (pcy)
+        *pcy            = maFramebuffers[cDisplay].monitorDesc.cy;
+    if (pcBitsPerPixel)
+        *pcBitsPerPixel = maFramebuffers[cDisplay].monitorDesc.cBitsPerPixel;
     return S_OK;
 }