Changeset 77842 in vbox for trunk/src/VBox

Timestamp:

Mar 22, 2019 8:12:35 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9376: Move UIFrameBuffer mouse cursor position listener from UIConsoleEventHandler to UISession, using UISession API instead of caching own stuff.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (10 diffs)

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

@@ -25 +25 @@
 #include "UIActionPool.h"
 #include "UIActionPoolRuntime.h"
-#include "UIConsoleEventHandler.h"
 #include "UIFrameBuffer.h"
 #include "UISession.h"
@@ -277 +276 @@
 protected slots:
 
-    /** Handles guest request to change the cursor position to @a uX * @a uY.
-      * @param  fContainsData  Brings whether the @a uX and @a uY values are valid and could be used by the GUI now. */
-    void sltCursorPositionChange(bool fContainsData, unsigned long uX, unsigned long uY);
+    /** Handles guest request to change the cursor position. */
+    void sltCursorPositionChange();
 
 protected:
@@ -396 +394 @@
      QUuid m_uFramebufferId;
 
-     /** Holds whether cursor position is valid. */
-     bool   m_fCursorPositionValid;
      /** Holds the last cursor rectangle. */
      QRect  m_cursorRectangle;
@@ -542 +538 @@
     , m_dDevicePixelRatioActual(1.0)
     , m_fUseUnscaledHiDPIOutput(false)
-    , m_fCursorPositionValid(false)
 {
     /* Update coordinate-system: */
@@ -1303 +1298 @@
 }
 
-void UIFrameBufferPrivate::sltCursorPositionChange(bool fContainsData, unsigned long uX, unsigned long uY)
-{
-    /* Remember whether cursor position is valid: */
-    m_fCursorPositionValid = fContainsData;
-
+void UIFrameBufferPrivate::sltCursorPositionChange()
+{
     /* Do we have view and valid cursor position? */
-    if (m_pMachineView && m_fCursorPositionValid)
+    if (m_pMachineView && m_pMachineView->uisession()->isValidCursorPositionPresent())
     {
         /* Acquire cursor hotspot: */
         QPoint cursorHotspot = m_pMachineView->uisession()->cursorHotspot();
-
         /* Apply the scale-factor if necessary: */
         cursorHotspot /= scaleFactor();
-
         /* Take the device-pixel-ratio into account: */
         if (!useUnscaledHiDPIOutput())
@@ -1322 +1312 @@
 
         /* Acquire cursor position and size: */
-        QPoint cursorPosition = QPoint(uX, uY) - cursorHotspot;
+        QPoint cursorPosition = m_pMachineView->uisession()->cursorPosition() - cursorHotspot;
         QSize cursorSize = m_pMachineView->uisession()->cursorSize();
-
         /* Apply the scale-factor if necessary: */
         cursorPosition *= scaleFactor();
         cursorSize *= scaleFactor();
-
         /* Take the device-pixel-ratio into account: */
         if (!useUnscaledHiDPIOutput())
@@ -1365 +1353 @@
 
     /* Attach GUI connections: */
-    connect(gConsoleEvents, &UIConsoleEventHandler::sigCursorPositionChange,
+    connect(m_pMachineView->uisession(), &UISession::sigCursorPositionChange,
             this, &UIFrameBufferPrivate::sltCursorPositionChange);
 }
@@ -1382 +1370 @@
 
     /* Detach GUI connections: */
-    disconnect(gConsoleEvents, &UIConsoleEventHandler::sigCursorPositionChange,
+    disconnect(m_pMachineView->uisession(), &UISession::sigCursorPositionChange,
                this, &UIFrameBufferPrivate::sltCursorPositionChange);
 }
@@ -1475 +1463 @@
 
     /* Paint cursor if it has valid shape and position: */
-    if (m_pMachineView->uisession()->isValidPointerShapePresent() && m_fCursorPositionValid)
+    if (m_pMachineView->uisession()->isValidPointerShapePresent() && m_pMachineView->uisession()->isValidCursorPositionPresent())
     {
         /* Acquire session cursor pixmap: */
@@ -1578 +1566 @@
 
     /* Paint cursor if it has valid shape and position: */
-    if (m_pMachineView->uisession()->isValidPointerShapePresent() && m_fCursorPositionValid)
+    if (m_pMachineView->uisession()->isValidPointerShapePresent() && m_pMachineView->uisession()->isValidCursorPositionPresent())
     {
         /* Acquire session cursor pixmap: */