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

Timestamp:

Oct 8, 2014 7:09:11 AM (10 years ago)

Author:

vboxsync

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

96430

Message:

IDisplay::GetScreenResolution returns status of the guest monitor.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleVRDPServer.cpp (modified) (1 diff)
• DisplayImpl.cpp (modified) (4 diffs)
• GuestDnDPrivate.cpp (modified) (1 diff)

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

@@ -1104 +1104 @@
         {
             ULONG dummy;
+            GuestMonitorStatus_T monitorStatus;
             hr = server->mConsole->i_getDisplay()->GetScreenResolution(uScreenId, &dummy, &dummy, &dummy,
-                                                                     &xOrigin, &yOrigin);
+                                                                       &xOrigin, &yOrigin, &monitorStatus);
 
             if (SUCCEEDED(hr))

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

@@ -1448 +1448 @@
 /////////////////////////////////////////////////////////////////////////////
 HRESULT Display::getScreenResolution(ULONG aScreenId, ULONG *aWidth, ULONG *aHeight, ULONG *aBitsPerPixel,
-                                     LONG *aXOrigin, LONG *aYOrigin)
+                                     LONG *aXOrigin, LONG *aYOrigin, GuestMonitorStatus_T *aGuestMonitorStatus)
 {
     LogRelFlowFunc(("aScreenId=%RU32\n", aScreenId));
@@ -1459 +1459 @@
     int32_t xOrigin = 0;
     int32_t yOrigin = 0;
+    bool fEnabled = true;
 
     if (aScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
@@ -1483 +1484 @@
         xOrigin = pFBInfo->xOrigin;
         yOrigin = pFBInfo->yOrigin;
+        fEnabled = !RT_BOOL(pFBInfo->flags & VBVA_SCREEN_F_DISABLED);
     }
     else
@@ -1499 +1501 @@
     if (aYOrigin)
         *aYOrigin = yOrigin;
+    if (aGuestMonitorStatus)
+        *aGuestMonitorStatus = fEnabled? GuestMonitorStatus_Enabled: GuestMonitorStatus_Disabled;
 
     return S_OK;

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

@@ -478 +478 @@
     ULONG dummy;
     LONG xShift, yShift;
+    GuestMonitorStatus_T monitorStatus;
     hr = pDisplay->GetScreenResolution(uScreenId, &dummy, &dummy, &dummy,
-                                       &xShift, &yShift);
+                                       &xShift, &yShift, &monitorStatus);
     if (FAILED(hr))
         return hr;