Changeset 98557 in vbox

Timestamp:

Feb 14, 2023 12:09:21 PM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CDisplay wrapper usage step-by-step; This one is about display invalidation and viewport update stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineView.cpp (modified) (7 diffs)
• UIMachineView.h (modified) (2 diffs)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)

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

@@ -474 +474 @@
 {
     return uisession()->setSeamlessMode(fEnabled);
+}
+
+bool UIMachine::viewportChanged(ulong uScreenId, ulong xOrigin, ulong yOrigin, ulong uWidth, ulong uHeight)
+{
+    return uisession()->viewportChanged(uScreenId, xOrigin, yOrigin, uWidth, uHeight);
+}
+
+bool UIMachine::invalidateAndUpdate()
+{
+    return uisession()->invalidateAndUpdate();
+}
+
+bool UIMachine::invalidateAndUpdateScreen(ulong uScreenId)
+{
+    return uisession()->invalidateAndUpdateScreen(uScreenId);
 }
 

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

@@ -297 +297 @@
         /** Defines whether seamless mode is enabled for display. */
         bool setSeamlessMode(bool fEnabled);
+        /** Notifies display about viewport changes. */
+        bool viewportChanged(ulong uScreenId, ulong xOrigin, ulong yOrigin, ulong uWidth, ulong uHeight);
+        /** Notifies display about all screens were invalidated. */
+        bool invalidateAndUpdate();
+        /** Notifies display about screen with passed uScreenId was invalidated. */
+        bool invalidateAndUpdateScreen(ulong uScreenId);
     /** @} */
 

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

@@ -66 +66 @@
 /* COM includes: */
 #include "CConsole.h"
-#include "CDisplay.h"
 #include "CGraphicsAdapter.h"
 #include "CSession.h"
@@ -371 +370 @@
 void UIMachineView::updateViewport()
 {
-    display().ViewportChanged(screenId(), contentsX(), contentsY(), visibleWidth(), visibleHeight());
+    uimachine()->viewportChanged(screenId(), contentsX(), contentsY(), visibleWidth(), visibleHeight());
 }
 
@@ -672 +671 @@
     /* Ask for just required guest display update (it will also update
      * the viewport through IFramebuffer::NotifyUpdate): */
-    display().InvalidateAndUpdateScreen(m_uScreenId);
+    uimachine()->invalidateAndUpdateScreen(m_uScreenId);
 
     /* If we are in normal or scaled mode and if GA are active,
@@ -1085 +1084 @@
                     /* Ask for full guest display update (it will also update
                      * the viewport through IFramebuffer::NotifyUpdate): */
-                    display().InvalidateAndUpdate();
+                    uimachine()->invalidateAndUpdate();
                 }
             }
@@ -1402 +1401 @@
      * Note: VBOX_WITH_CROGL additionally requires us to call DetachFramebuffer
      * to ensure 3D gets notified of view being destroyed... */
-    if (console().isOk() && !display().isNull())
+    if (console().isOk())
         frameBuffer()->detach();
 
@@ -1429 +1428 @@
 {
     return uisession()->console();
-}
-
-CDisplay& UIMachineView::display() const
-{
-    return uisession()->display();
 }
 
@@ -1604 +1598 @@
 
     /* Dim screen-shot if it is Ok: */
-    if (display().isOk() && !screenShot.isNull())
+    if (!screenShot.isNull())
         dimImage(screenShot);
 

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

@@ -67 +67 @@
 class UISession;
 class CConsole;
-class CDisplay;
 class CGuest;
 class CMachine;
@@ -278 +277 @@
     /** Returns the session's console reference. */
     CConsole& console() const;
-    /** Returns the console's display reference. */
-    CDisplay& display() const;
 
     /* Protected getters: */

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

@@ -510 +510 @@
     CDisplay comDisplay = display();
     comDisplay.SetSeamlessMode(fEnabled);
+    const bool fSuccess = comDisplay.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotChangeDisplayParameter(comDisplay);
+    return fSuccess;
+}
+
+bool UISession::viewportChanged(ulong uScreenId, ulong xOrigin, ulong yOrigin, ulong uWidth, ulong uHeight)
+{
+    CDisplay comDisplay = display();
+    comDisplay.ViewportChanged(uScreenId, xOrigin, yOrigin, uWidth, uHeight);
+    const bool fSuccess = comDisplay.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotChangeDisplayParameter(comDisplay);
+    return fSuccess;
+}
+
+bool UISession::invalidateAndUpdate()
+{
+    CDisplay comDisplay = display();
+    comDisplay.InvalidateAndUpdate();
+    const bool fSuccess = comDisplay.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotChangeDisplayParameter(comDisplay);
+    return fSuccess;
+}
+
+bool UISession::invalidateAndUpdateScreen(ulong uScreenId)
+{
+    CDisplay comDisplay = display();
+    comDisplay.InvalidateAndUpdateScreen(uScreenId);
     const bool fSuccess = comDisplay.isOk();
     if (!fSuccess)

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

@@ -315 +315 @@
         /** Defines whether seamless mode is enabled for display. */
         bool setSeamlessMode(bool fEnabled);
+        /** Notifies display about viewport changes. */
+        bool viewportChanged(ulong uScreenId, ulong xOrigin, ulong yOrigin, ulong uWidth, ulong uHeight);
+        /** Notifies display about all screens were invalidated. */
+        bool invalidateAndUpdate();
+        /** Notifies display about screen with passed uScreenId was invalidated. */
+        bool invalidateAndUpdateScreen(ulong uScreenId);
     /** @} */