Changeset 105329 in vbox

Timestamp:

Jul 15, 2024 3:00:45 PM (5 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10672: Runtime UI: More wise and clear states processing for mouse pointer and corresponding indicator.

Location:

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

Files:

• UIIndicatorsPool.cpp (modified) (7 diffs)
• UIMachineDefs.h (modified) (1 diff)
• UIMouseHandler.cpp (modified) (1 diff)

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

@@ -1107 +1107 @@
     Q_OBJECT;
 
+    /** Possible indicator states. */
+    enum
+    {
+        State_NotCaptured         = 0, // 000 == !MouseCaptured
+        State_Captured            = 1, // 001 == MouseCaptured
+        State_AbsoluteNotCaptured = 2, // 010 == !MouseCaptured & MouseSupportsAbsolute
+        State_AbsoluteCaptured    = 3, // 011 == MouseCaptured & MouseSupportsAbsolute
+        State_Integrated          = 6, // 110 == MouseSupportsAbsolute & MouseIntegrated
+    };
+
 public:
 
@@ -1114 +1124 @@
     {
         /* Assign state-icons: */
-        setStateIcon(0, UIIconPool::iconSet(":/mouse_disabled_16px.png"));
-        setStateIcon(1, UIIconPool::iconSet(":/mouse_16px.png"));
-        setStateIcon(2, UIIconPool::iconSet(":/mouse_seamless_16px.png"));
-        setStateIcon(3, UIIconPool::iconSet(":/mouse_can_seamless_16px.png"));
-        setStateIcon(4, UIIconPool::iconSet(":/mouse_can_seamless_uncaptured_16px.png"));
-        /* Configure connection: */
-        connect(m_pMachine, &UIMachine::sigMouseStateChange,
-                this, static_cast<void(UIIndicatorMouse::*)(int)>(&UIIndicatorMouse::setState)); // us to blame ..
+        setStateIcon(State_NotCaptured,         UIIconPool::iconSet(":/mouse_disabled_16px.png"));                // 000
+        setStateIcon(State_Captured,            UIIconPool::iconSet(":/mouse_16px.png"));                         // 001
+        setStateIcon(State_AbsoluteNotCaptured, UIIconPool::iconSet(":/mouse_can_seamless_uncaptured_16px.png")); // 010
+        setStateIcon(State_AbsoluteCaptured,    UIIconPool::iconSet(":/mouse_can_seamless_16px.png"));            // 011
+        setStateIcon(State_Integrated,          UIIconPool::iconSet(":/mouse_seamless_16px.png"));                // 110
+
+        /* Configure machine connection: */
+        connect(m_pMachine, &UIMachine::sigMouseStateChange, this, &UIIndicatorMouse::setState);
+
         /* Update & translate finally: */
         updateAppearance();
@@ -1131 +1142 @@
     virtual void updateAppearance() RT_OVERRIDE
     {
+        /* Retranslate finally: */
+        sltRetranslateUI();
+    }
+
+    /** Handles translation event. */
+    virtual void sltRetranslateUI() RT_OVERRIDE
+    {
+        /* Call to base-class: */
+        UISessionStateStatusBarIndicator::sltRetranslateUI();
+
+        /* Update tool-tip: */
         const QString strToolTip = tr("Indicates whether the host mouse pointer is "
                                       "captured by the guest OS:%1", "Mouse tooltip");
@@ -1136 +1158 @@
         strFullData += s_strTableRow3
             .arg(QString("<img src=:/mouse_disabled_16px.png/>"))
-            .arg(tr("pointer is not captured", "Mouse tooltip"));
+            .arg(tr("Pointer is not captured", "Mouse tooltip"));
         strFullData += s_strTableRow3
             .arg(QString("<img src=:/mouse_16px.png/>"))
-            .arg(tr("pointer is captured", "Mouse tooltip"));
+            .arg(tr("Pointer is captured", "Mouse tooltip"));
+        strFullData += s_strTableRow3
+            .arg(QString("<img src=:/mouse_can_seamless_uncaptured_16px.png/>"))
+            .arg(tr("Mouse integration is Off, pointer is not captured", "Mouse tooltip"));
+        strFullData += s_strTableRow3
+            .arg(QString("<img src=:/mouse_can_seamless_16px.png/>"))
+            .arg(tr("Mouse integration is Off, pointer is captured", "Mouse tooltip"));
         strFullData += s_strTableRow3
             .arg(QString("<img src=:/mouse_seamless_16px.png/>"))
-            .arg(tr("mouse integration (MI) is On", "Mouse tooltip"));
-        strFullData += s_strTableRow3
-            .arg(QString("<img src=:/mouse_can_seamless_16px.png/>"))
-            .arg(tr("MI is Off, pointer is captured", "Mouse tooltip"));
-        strFullData += s_strTableRow3
-            .arg(QString("<img src=:/mouse_can_seamless_uncaptured_16px.png/>"))
-            .arg(tr("MI is Off, pointer is not captured", "Mouse tooltip"));
+            .arg(tr("Mouse integration is On", "Mouse tooltip"));
         strFullData = s_strTable.arg(strFullData);
         strFullData += tr("Note that the mouse integration feature requires Guest "
                           "Additions to be installed in the guest OS.", "Mouse tooltip");
-
-        /* Update tool-tip: */
         setToolTip(strToolTip.arg(strFullData));
-
-        /* Retranslate finally: */
-        sltRetranslateUI();
-    }
-
-    /** Handles translation event. */
-    virtual void sltRetranslateUI() RT_OVERRIDE
-    {
-        /* Call to base-class: */
-        UISessionStateStatusBarIndicator::sltRetranslateUI();
 
         /* Append description with more info: */
@@ -1170 +1180 @@
         switch (state())
         {
-            case 0: strState = tr("pointer is not captured", "Mouse tooltip"); break;
-            case 1: strState = tr("pointer is captured", "Mouse tooltip"); break;
-            case 2: strState = tr("mouse integration (MI) is On", "Mouse tooltip"); break;
-            case 3: strState = tr("MI is Off, pointer is captured", "Mouse tooltip"); break;
-            case 4: strState = tr("MI is Off, pointer is not captured", "Mouse tooltip"); break;
-            default: break;
+            case State_NotCaptured:
+                strState = tr("Pointer is not captured", "Mouse tooltip"); break;
+            case State_Captured:
+                strState = tr("Pointer is captured", "Mouse tooltip"); break;
+            case State_AbsoluteNotCaptured:
+                strState = tr("Mouse integration is Off, pointer is not captured", "Mouse tooltip"); break;
+            case State_AbsoluteCaptured:
+                strState = tr("Mouse integration is Off, pointer is captured", "Mouse tooltip"); break;
+            case State_Integrated:
+                strState = tr("Mouse integration is On", "Mouse tooltip"); break;
+            default:
+                break;
         }
         if (!strState.isNull())
@@ -1186 +1202 @@
     void setState(int iState) RT_OVERRIDE
     {
-        if ((iState & UIMouseStateType_MouseAbsoluteDisabled) &&
-            (iState & UIMouseStateType_MouseAbsolute) &&
-            !(iState & UIMouseStateType_MouseCaptured))
-            QIStateStatusBarIndicator::setState(4);
-        else
-            QIStateStatusBarIndicator::setState(iState & (UIMouseStateType_MouseAbsolute | UIMouseStateType_MouseCaptured));
-        sltRetranslateUI();
+        /* Call to base-class: */
+        QIStateStatusBarIndicator::setState(iState);
+
+        /* Update everything: */
+        updateAppearance();
     }
 };
+
 
 /** UISessionStateStatusBarIndicator extension for Runtime UI: Keyboard indicator. */
@@ -1247 +1262 @@
     }
 };
+
 
 /** QITextStatusBarIndicator extension for Runtime UI: Keyboard-extension indicator. */

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

@@ -58 +58 @@
 {
     UIMouseStateType_MouseCaptured         = RT_BIT(0),
-    UIMouseStateType_MouseAbsolute         = RT_BIT(1),
-    UIMouseStateType_MouseAbsoluteDisabled = RT_BIT(2),
-    UIMouseStateType_MouseNeedsHostCursor  = RT_BIT(3)
+    UIMouseStateType_MouseSupportsAbsolute = RT_BIT(1),
+    UIMouseStateType_MouseIntegrated       = RT_BIT(2)
 };
 

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

@@ -258 +258 @@
 int UIMouseHandler::state() const
 {
-    return uimachine()->machineState() == KMachineState_Null ? 0 :
-           (uimachine()->isMouseCaptured() ? UIMouseStateType_MouseCaptured : 0) |
-           (uimachine()->isMouseSupportsAbsolute() ? UIMouseStateType_MouseAbsolute : 0) |
-           (uimachine()->isMouseIntegrated() ? 0 : UIMouseStateType_MouseAbsoluteDisabled);
+    int iResult = 0;
+    if (uimachine()->isMouseCaptured())
+        iResult |= UIMouseStateType_MouseCaptured;
+    if (uimachine()->isMouseSupportsAbsolute())
+    {
+        iResult |= UIMouseStateType_MouseSupportsAbsolute;
+        if (uimachine()->isMouseIntegrated())
+            iResult |= UIMouseStateType_MouseIntegrated;
+    }
+    return iResult;
 }