Changeset 52978 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

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

Author:

vboxsync

Message:

IDisplay::GetScreenResolution returns status of the guest monitor.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIVMInfoDialog.cpp (modified) (1 diff)
• runtime/UIFrameBuffer.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UIMouseHandler.cpp (modified) (2 diffs)
• runtime/UIMultiScreenLayout.cpp (modified) (1 diff)
• runtime/normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• selector/graphics/details/UIGMachinePreview.cpp (modified) (1 diff)

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

@@ -575 +575 @@
         LONG xOrigin = 0;
         LONG yOrigin = 0;
-        console.GetDisplay().GetScreenResolution(0, uWidth, uHeight, uBpp, xOrigin, yOrigin);
+        KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
+        console.GetDisplay().GetScreenResolution(0, uWidth, uHeight, uBpp, xOrigin, yOrigin, monitorStatus);
         QString strResolution = QString("%1x%2").arg(uWidth).arg(uHeight);
         if (uBpp)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -643 +643 @@
         LONG xOrigin = 0;
         LONG yOrigin = 0;
+        KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
         CDisplay display = m_pMachineView->uisession()->session().GetConsole().GetDisplay();
         display.GetScreenResolution(m_pMachineView->screenId(),
-                                    ulWidth, ulHeight, ulGuestBitsPerPixel, xOrigin, yOrigin);
+                                    ulWidth, ulHeight, ulGuestBitsPerPixel, xOrigin, yOrigin, monitorStatus);
 
         /* Remind user if necessary, ignore text and VGA modes: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -2342 +2342 @@
         LONG xOrigin = 0;
         LONG yOrigin = 0;
-        display.GetScreenResolution(i, width, height, bpp, xOrigin, yOrigin);
+        KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
+        display.GetScreenResolution(i, width, height, bpp, xOrigin, yOrigin, monitorStatus);
         uMaxWidth  += width;
         uMaxHeight  = RT_MAX(uMaxHeight, height);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

@@ -962 +962 @@
             LONG xShift = 0, yShift = 0;
             ULONG dummy;
-            session().GetConsole().GetDisplay().GetScreenResolution(uScreenId, dummy, dummy, dummy, xShift, yShift);
+            KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
+            session().GetConsole().GetDisplay().GetScreenResolution(uScreenId, dummy, dummy, dummy, xShift, yShift, monitorStatus);
             /* Set shifting: */
             cpnt.setX(cpnt.x() + xShift);
@@ -1027 +1028 @@
     LONG xShift = 0, yShift = 0;
     ULONG dummy;
-    session().GetConsole().GetDisplay().GetScreenResolution(uScreenId, dummy, dummy, dummy, xShift, yShift);
+    KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
+    session().GetConsole().GetDisplay().GetScreenResolution(uScreenId, dummy, dummy, dummy, xShift, yShift, monitorStatus);
 
     /* Pass all multi-touch events into guest: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp

@@ -317 +317 @@
         else
             screen = QApplication::desktop()->screenGeometry(screenLayout.value(iGuestScreen, 0));
-        display.GetScreenResolution(iGuestScreen, width, height, guestBpp, xOrigin, yOrigin);
+        KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
+        display.GetScreenResolution(iGuestScreen, width, height, guestBpp, xOrigin, yOrigin, monitorStatus);
         usedBits += screen.width() * /* display width */
                     screen.height() * /* display height */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -205 +205 @@
     ULONG uWidth, uHeight, uBitsPerPixel;
     LONG uOriginX, uOriginY;
+    KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
     CDisplay display = session().GetConsole().GetDisplay();
-    display.GetScreenResolution(iIndex, uWidth, uHeight, uBitsPerPixel, uOriginX, uOriginY);
+    display.GetScreenResolution(iIndex, uWidth, uHeight, uBitsPerPixel, uOriginX, uOriginY, monitorStatus);
     if (!fEnabled)
         display.SetVideoModeHint(iIndex, false, false, 0, 0, 0, 0, 0);

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp

@@ -241 +241 @@
                     LONG iOriginX, iOriginY;
                     ULONG uGuestWidth, uGuestHeight, uBpp;
-                    display.GetScreenResolution(0, uGuestWidth, uGuestHeight, uBpp, iOriginX, iOriginY);
+                    KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
+                    display.GetScreenResolution(0, uGuestWidth, uGuestHeight, uBpp, iOriginX, iOriginY, monitorStatus);
                     double dAspectRatio = (double)uGuestWidth / uGuestHeight;
                     /* Look for the best aspect-ratio preset preset: */