Changeset 98938 in vbox

Timestamp:

Mar 13, 2023 3:47:28 PM (2 years ago)

Author:

vboxsync

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

156276

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking some of old mouse related getters to have proper COM result checks.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -841 +841 @@
         QApplication::translate("UIMessageCenter", "Failed to acquire update agent parameter.") +
         UIErrorString::formatErrorInfo(comAgent));
+}
+
+/* static */
+void UINotificationMessage::cannotAcquireMouseParameter(const CMouse &comMouse)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Mouse failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to acquire mouse parameter.") +
+        UIErrorString::formatErrorInfo(comMouse));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -358 +358 @@
           * @param  comAgent  Brings the object parameter get acquired from. */
         static void cannotAcquireUpdateAgentParameter(const CUpdateAgent &comAgent);
+        /** Notifies about inability to acquire IMouse parameter.
+          * @param  comMouse  Brings the object parameter get acquired from. */
+        static void cannotAcquireMouseParameter(const CMouse &comMouse);
         /** Notifies about inability to acquire IEmulatedUSB parameter.
           * @param  comDispatcher  Brings the object parameter get acquired from. */

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

@@ -2180 +2180 @@
 void UIMachine::updateMouseState()
 {
-    m_fIsMouseSupportsAbsolute = uisession()->getAbsoluteSupported();
-    m_fIsMouseSupportsRelative = uisession()->getRelativeSupported();
-    m_fIsMouseSupportsTouchScreen = uisession()->getTouchScreenSupported();
-    m_fIsMouseSupportsTouchPad = uisession()->getTouchPadSupported();
-    m_fIsMouseHostCursorNeeded = uisession()->getNeedsHostCursor();
+    uisession()->acquireWhetherAbsoluteSupported(m_fIsMouseSupportsAbsolute);
+    uisession()->acquireWhetherRelativeSupported(m_fIsMouseSupportsRelative);
+    uisession()->acquireWhetherTouchScreenSupported(m_fIsMouseSupportsTouchScreen);
+    uisession()->acquireWhetherTouchPadSupported(m_fIsMouseSupportsTouchPad);
+    uisession()->acquireWhetherNeedsHostCursor(m_fIsMouseHostCursorNeeded);
 }
 

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

@@ -465 +465 @@
 }
 
-bool UISession::getAbsoluteSupported()
-{
-    return mouse().GetAbsoluteSupported();
-}
-
-bool UISession::getRelativeSupported()
-{
-    return mouse().GetRelativeSupported();
-}
-
-bool UISession::getTouchScreenSupported()
-{
-    return mouse().GetTouchScreenSupported();
-}
-
-bool UISession::getTouchPadSupported()
-{
-    return mouse().GetTouchPadSupported();
-}
-
-bool UISession::getNeedsHostCursor()
-{
-    return mouse().GetNeedsHostCursor();
+bool UISession::acquireWhetherAbsoluteSupported(bool &fSupported)
+{
+    CMouse comMouse = mouse();
+    const BOOL fAbsoluteSupported = comMouse.GetAbsoluteSupported();
+    const bool fSuccess = comMouse.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMouseParameter(comMouse);
+    else
+        fSupported = fAbsoluteSupported == TRUE;
+    return fSuccess;
+}
+
+bool UISession::acquireWhetherRelativeSupported(bool &fSupported)
+{
+    CMouse comMouse = mouse();
+    const BOOL fRelativeSupported = comMouse.GetRelativeSupported();
+    const bool fSuccess = comMouse.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMouseParameter(comMouse);
+    else
+        fSupported = fRelativeSupported == TRUE;
+    return fSuccess;
+}
+
+bool UISession::acquireWhetherTouchScreenSupported(bool &fSupported)
+{
+    CMouse comMouse = mouse();
+    const BOOL fTouchScreenSupported = comMouse.GetTouchScreenSupported();
+    const bool fSuccess = comMouse.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMouseParameter(comMouse);
+    else
+        fSupported = fTouchScreenSupported == TRUE;
+    return fSuccess;
+}
+
+bool UISession::acquireWhetherTouchPadSupported(bool &fSupported)
+{
+    CMouse comMouse = mouse();
+    const BOOL fTouchPadSupported = comMouse.GetTouchPadSupported();
+    const bool fSuccess = comMouse.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMouseParameter(comMouse);
+    else
+        fSupported = fTouchPadSupported == TRUE;
+    return fSuccess;
+}
+
+bool UISession::acquireWhetherNeedsHostCursor(bool &fNeeds)
+{
+    CMouse comMouse = mouse();
+    const BOOL fNeedsHostCursor = comMouse.GetNeedsHostCursor();
+    const bool fSuccess = comMouse.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMouseParameter(comMouse);
+    else
+        fNeeds = fNeedsHostCursor == TRUE;
+    return fSuccess;
 }
 

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

@@ -288 +288 @@
      ** @{ */
         /** Returns whether VM's mouse supports absolute coordinates. */
-        bool getAbsoluteSupported();
+        bool acquireWhetherAbsoluteSupported(bool &fSupported);
         /** Returns whether VM's mouse supports relative coordinates. */
-        bool getRelativeSupported();
+        bool acquireWhetherRelativeSupported(bool &fSupported);
         /** Returns whether VM's mouse supports touch screen device. */
-        bool getTouchScreenSupported();
+        bool acquireWhetherTouchScreenSupported(bool &fSupported);
         /** Returns whether VM's mouse supports touch pad device. */
-        bool getTouchPadSupported();
+        bool acquireWhetherTouchPadSupported(bool &fSupported);
         /** Returns whether VM's mouse requires host cursor. */
-        bool getNeedsHostCursor();
+        bool acquireWhetherNeedsHostCursor(bool &fNeeds);
 
         /** Sends relative mouse move event to VM's mouse. */