Changeset 88247 in vbox

Timestamp:

Mar 22, 2021 3:32:40 PM (4 years ago)

Author:

vboxsync

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

143447

Message:

FE/Qt: bugref:9973: Runtime UI: A bit of rework directed to make enable/disable and resize logic more versatile; Do not forget to save new resolution.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (2 diffs)
• runtime/UIMachineView.h (modified) (1 diff)
• runtime/normal/UIMachineLogicNormal.cpp (modified) (2 diffs)
• runtime/normal/UIMachineLogicNormal.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -67 +67 @@
 #include "CConsole.h"
 #include "CDHCPServer.h"
+#include "CDisplay.h"
 #include "CExtPack.h"
 #include "CExtPackFile.h"
@@ -2840 +2841 @@
 }
 
+void UIMessageCenter::cannotAcquireDispayParameter(const CDisplay &comDisplay)
+{
+    error(0, MessageType_Error,
+          tr("Failed to acquire display parameter."),
+          UIErrorString::formatErrorInfo(comDisplay));
+}
+
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 bool UIMessageCenter::confirmCancelingAllNetworkRequests() const

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -502 +502 @@
     void cannotSwitchScreenInSeamless(quint64 uMinVRAM) const;
     void cannotAddDiskEncryptionPassword(const CConsole &console);
+    void cannotAcquireDispayParameter(const CDisplay &comDisplay);
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

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

@@ -363 +363 @@
 }
 
+void UIMachineView::sltHandleActionTriggerViewScreenToggle(int iScreen, bool fEnabled)
+{
+    /* Skip unrelated guest-screen index: */
+    if (iScreen != (int)screenId())
+        return;
+
+    /* Acquire current resolution: */
+    ULONG uWidth, uHeight, uBitsPerPixel;
+    LONG uOriginX, uOriginY;
+    KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
+    display().GetScreenResolution(screenId(), uWidth, uHeight, uBitsPerPixel, uOriginX, uOriginY, monitorStatus);
+    if (!display().isOk())
+    {
+        msgCenter().cannotAcquireDispayParameter(display());
+        return;
+    }
+
+    /* Update desirable screen status: */
+    uisession()->setScreenVisibleHostDesires(screenId(), fEnabled);
+
+    /* Send enabling size-hint: */
+    if (fEnabled)
+    {
+        /* Defaults: */
+        if (!uWidth)
+            uWidth = 800;
+        if (!uHeight)
+            uHeight = 600;
+
+        /* Update current window size limitations: */
+        setMaxGuestSize(QSize(uWidth, uHeight));
+
+        /* Record the hint to extra data, needed for guests using VMSVGA:
+         * This should be done before the actual hint is sent in case the guest overrides it.
+         * Do not send a hint if nothing has changed to prevent the guest being notified about its own changes. */
+        if (   !isFullscreenOrSeamless()
+            && uisession()->isGuestSupportsGraphics()
+            && (   (int)m_pFrameBuffer->width() != uWidth
+                || (int)m_pFrameBuffer->height() != uHeight
+                || uisession()->isScreenVisible(screenId()) != uisession()->isScreenVisibleHostDesires(screenId())))
+            storeGuestSizeHint(QSize(uWidth, uHeight));
+
+        /* Send enabling size-hint to the guest: */
+        LogRel(("GUI: UIMachineView::sltHandleActionTriggerViewScreenToggle: Enabling guest-screen %d\n", (int)screenId()));
+        display().SetVideoModeHint(screenId(),
+                                   true /* enabled? */,
+                                   false /* change origin? */,
+                                   0 /* origin x */,
+                                   0 /* origin y */,
+                                   uWidth,
+                                   uHeight,
+                                   0 /* bits per pixel */,
+                                   true /* notify? */);
+    }
+    else
+    {
+        /* Send disabling size-hint to the guest: */
+        LogRel(("GUI: UIMachineView::sltHandleActionTriggerViewScreenToggle: Disabling guest-screen %d\n", (int)screenId()));
+        display().SetVideoModeHint(screenId(),
+                                   false /* enabled? */,
+                                   false /* change origin? */,
+                                   0 /* origin x */,
+                                   0 /* origin y */,
+                                   0 /* width */,
+                                   0 /* height */,
+                                   0 /* bits per pixel */,
+                                   true /* notify? */);
+    }
+}
+
+void UIMachineView::sltHandleActionTriggerViewScreenResize(int iScreen, const QSize &size)
+{
+    /* Skip unrelated guest-screen index: */
+    if (iScreen != (int)m_uScreenId)
+        return;
+
+    /* Make sure we have valid size to work with: */
+    AssertMsgReturnVoid(size.isValid() && size.width() > 0 && size.height() > 0,
+                        ("Size should be valid (%dx%d)!\n", size.width(), size.height()));
+
+    /* Update current window size limitations: */
+    setMaxGuestSize(size);
+
+    /* Record the hint to extra data, needed for guests using VMSVGA:
+     * This should be done before the actual hint is sent in case the guest overrides it.
+     * Do not send a hint if nothing has changed to prevent the guest being notified about its own changes. */
+    if (   !isFullscreenOrSeamless()
+        && uisession()->isGuestSupportsGraphics()
+        && (   (int)m_pFrameBuffer->width() != size.width()
+            || (int)m_pFrameBuffer->height() != size.height()
+            || uisession()->isScreenVisible(screenId()) != uisession()->isScreenVisibleHostDesires(screenId())))
+        storeGuestSizeHint(size);
+
+    /* Send enabling size-hint to the guest: */
+    LogRel(("GUI: UIMachineView::sltHandleActionTriggerViewScreenResize: Resizing guest-screen %d\n", (int)screenId()));
+    display().SetVideoModeHint(screenId(),
+                               true /* enabled? */,
+                               false /* change origin? */,
+                               0 /* origin x */,
+                               0 /* origin y */,
+                               size.width(),
+                               size.height(),
+                               0 /* bits per pixel */,
+                               true /* notify? */);
+}
+
 void UIMachineView::sltHandleNotifyChange(int iWidth, int iHeight)
 {
@@ -880 +986 @@
     connect(gEDataManager, &UIExtraDataManager::sigScalingOptimizationTypeChange,
             this, &UIMachineView::sltHandleScalingOptimizationChange);
+    /* Action-pool connections: */
+    UIActionPoolRuntime *pActionPoolRuntime = qobject_cast<UIActionPoolRuntime*>(actionPool());
+    if (pActionPoolRuntime)
+    {
+        connect(pActionPoolRuntime, &UIActionPoolRuntime::sigNotifyAboutTriggeringViewScreenToggle,
+                this, &UIMachineView::sltHandleActionTriggerViewScreenToggle);
+        connect(pActionPoolRuntime, &UIActionPoolRuntime::sigNotifyAboutTriggeringViewScreenResize,
+                this, &UIMachineView::sltHandleActionTriggerViewScreenResize);
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -116 +116 @@
      *         guest coordinate system (absolute one) before passing to guest. */
     void sltPerformGuestResize(const QSize &toSize = QSize());
+
+    /** Handles guest-screen toggle request.
+      * @param  iScreen   Brings the number of screen being referred.
+      * @param  fEnabled  Brings whether this screen should be enabled. */
+    void sltHandleActionTriggerViewScreenToggle(int iScreen, bool fEnabled);
+    /** Handles guest-screen resize request.
+      * @param  iScreen  Brings the number of screen being referred.
+      * @param  size     Brings the size of screen to be applied. */
+    void sltHandleActionTriggerViewScreenResize(int iScreen, const QSize &size);
 
     /* Handler: Frame-buffer NotifyChange stuff: */

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

@@ -216 +216 @@
 }
 
-void UIMachineLogicNormal::sltHandleActionTriggerViewScreenToggle(int iIndex, bool fEnabled)
-{
-    /* Enable/disable guest keeping current size: */
-    ULONG uWidth, uHeight, uBitsPerPixel;
-    LONG uOriginX, uOriginY;
-    KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
-    display().GetScreenResolution(iIndex, uWidth, uHeight, uBitsPerPixel, uOriginX, uOriginY, monitorStatus);
-    if (!fEnabled)
-    {
-        uisession()->setScreenVisibleHostDesires(iIndex, false);
-        display().SetVideoModeHint(iIndex, false, false, 0, 0, 0, 0, 0, true);
-    }
-    else
-    {
-        /* Defaults: */
-        if (!uWidth)
-            uWidth = 800;
-        if (!uHeight)
-            uHeight = 600;
-        uisession()->setScreenVisibleHostDesires(iIndex, true);
-        display().SetVideoModeHint(iIndex, true, false, 0, 0, uWidth, uHeight, 32, true);
-    }
-}
-
-void UIMachineLogicNormal::sltHandleActionTriggerViewScreenResize(int iIndex, const QSize &size)
-{
-    /* Resize guest to required size: */
-    display().SetVideoModeHint(iIndex, uisession()->isScreenVisible(iIndex),
-                             false, 0, 0, size.width(), size.height(), 0, true);
-}
-
 void UIMachineLogicNormal::sltHostScreenAvailableAreaChange()
 {
@@ -297 +266 @@
     connect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility), &UIAction::triggered,
             this, &UIMachineLogicNormal::sltToggleStatusBar);
-    UIActionPoolRuntime* pActionPoolRuntime = qobject_cast<UIActionPoolRuntime*>(actionPool());
-    AssertPtrReturnVoid(pActionPoolRuntime);
-    {
-        connect(pActionPoolRuntime, &UIActionPoolRuntime::sigNotifyAboutTriggeringViewScreenToggle,
-                this, &UIMachineLogicNormal::sltHandleActionTriggerViewScreenToggle);
-        connect(pActionPoolRuntime, &UIActionPoolRuntime::sigNotifyAboutTriggeringViewScreenResize,
-                this, &UIMachineLogicNormal::sltHandleActionTriggerViewScreenResize);
-    }
 }
 

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

@@ -67 +67 @@
     void sltToggleStatusBar();
 
-    /** Handles guest-screen toggle requests. */
-    void sltHandleActionTriggerViewScreenToggle(int iIndex, bool fEnabled);
-    /** Handles guest-screen resize requests. */
-    void sltHandleActionTriggerViewScreenResize(int iIndex, const QSize &size);
-
     /** Handles host-screen available-area change. */
     virtual void sltHostScreenAvailableAreaChange() /* override */;