Changeset 79779 in vbox

Timestamp:

Jul 15, 2019 6:44:21 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Adding a way to send press/release of modifier keys immediately

Location:

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard

Files:

• UISoftKeyboard.cpp (modified) (12 diffs)
• UISoftKeyboard.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -540 +540 @@
     void keyStateChange(UISoftKeyboardKey* pKey);
     void loadLayouts();
-    void showContextMenu(const QPoint &globalPoint);
 
     void setCurrentLayout(const QString &strLayoutName);
@@ -584 +583 @@
 private slots:
 
-    void sltContextMenuRequest(const QPoint &point);
     void sltPhysicalLayoutForLayoutChanged(int iIndex);
 
@@ -597 +595 @@
     void               handleKeyPress(UISoftKeyboardKey *pKey);
     void               handleKeyRelease(UISoftKeyboardKey *pKey);
+    /** Sends usage id/page to API when a modifier key is right clicked. useful for testing and things like
+      * Window key press for start menu opening. This works orthogonal to left clicks.*/
+    void               modifierKeyPressRelease(UISoftKeyboardKey *pKey, bool fRelease);
     bool               loadPhysicalLayout(const QString &strLayoutFileName, bool isNumPad = false);
     bool               loadKeyboardLayout(const QString &strLayoutName);
@@ -634 +635 @@
     int   m_iBottomMargin;
 
-    QMenu   *m_pContextMenu;
     Mode     m_enmMode;
 
@@ -2020 +2020 @@
     , m_iRightMargin(10)
     , m_iBottomMargin(10)
-    , m_pContextMenu(0)
     , m_enmMode(Mode_Keyboard)
     , m_fShowOSMenuKeys(true)
@@ -2125 +2124 @@
 {
     QWidget::mousePressEvent(pEvent);
-    if (pEvent->button() != Qt::LeftButton)
-        return;
+    if (pEvent->button() != Qt::RightButton && pEvent->button() != Qt::LeftButton)
+        return;
+
     m_pKeyPressed = keyUnderMouse(pEvent);
-
-    if (m_enmMode == Mode_Keyboard)
-        handleKeyPress(m_pKeyPressed);
-    else if (m_enmMode == Mode_LayoutEdit)
-        setKeyBeingEdited(m_pKeyUnderMouse);
+    if (!m_pKeyPressed)
+        return;
+
+    /* Handling the right button press: */
+    if (pEvent->button() == Qt::RightButton)
+        modifierKeyPressRelease(m_pKeyPressed, false);
+    else
+    {
+        /* Handling the left button press: */
+        if (m_enmMode == Mode_Keyboard)
+            handleKeyPress(m_pKeyPressed);
+        else if (m_enmMode == Mode_LayoutEdit)
+            setKeyBeingEdited(m_pKeyUnderMouse);
+    }
     update();
 }
@@ -2139 +2148 @@
 {
     QWidget::mouseReleaseEvent(pEvent);
-    if (pEvent->button() != Qt::LeftButton)
-        return;
+
+    if (pEvent->button() != Qt::RightButton && pEvent->button() != Qt::LeftButton)
+        return;
+
     if (!m_pKeyPressed)
         return;
-
-    if (m_enmMode == Mode_Keyboard)
-        handleKeyRelease(m_pKeyPressed);
-
+    if (pEvent->button() == Qt::RightButton)
+        modifierKeyPressRelease(m_pKeyPressed, true);
+    else
+    {
+        if (m_enmMode == Mode_Keyboard)
+            handleKeyRelease(m_pKeyPressed);
+    }
+    m_pKeyPressed = 0;
     update();
-    m_pKeyPressed = 0;
 }
 
@@ -2159 +2173 @@
 void UISoftKeyboardWidget::retranslateUi()
 {
-}
-
-void UISoftKeyboardWidget::sltContextMenuRequest(const QPoint &point)
-{
-    showContextMenu(mapToGlobal(point));
 }
 
@@ -2539 +2548 @@
 }
 
+void UISoftKeyboardWidget::modifierKeyPressRelease(UISoftKeyboardKey *pKey, bool fRelease)
+{
+    if (!pKey || pKey->type() != KeyType_Modifier)
+        return;
+    if (pKey->state() != KeyState_NotPressed)
+        return;
+    QVector<QPair<LONG, LONG> > sequence;
+    sequence << pKey->usagePageIdPair();
+    if (fRelease)
+        emit sigPutUsageCodesPress(sequence);
+    else
+        emit sigPutUsageCodesRelease(sequence);
+}
+
 void UISoftKeyboardWidget::keyStateChange(UISoftKeyboardKey* pKey)
 {
@@ -2551 +2574 @@
                 m_pressedModifiers.append(pKey);
     }
-}
-
-void UISoftKeyboardWidget::showContextMenu(const QPoint &globalPoint)
-{
-    m_pContextMenu->exec(globalPoint);
-    update();
 }
 
@@ -2783 +2800 @@
 void UISoftKeyboardWidget::prepareObjects()
 {
-    m_pContextMenu = new QMenu(this);
-
     setMouseTracking(true);
-    setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(this, &UISoftKeyboardWidget::customContextMenuRequested,
-            this, &UISoftKeyboardWidget::sltContextMenuRequest);
 }
 
@@ -3485 +3497 @@
 }
 
-void UISoftKeyboard::sltStatusBarContextMenuRequest(const QPoint &point)
-{
-    if (m_pKeyboardWidget)
-        m_pKeyboardWidget->showContextMenu(statusBar()->mapToGlobal(point));
-}
-
 void UISoftKeyboard::sltLayoutSelectionChanged(const QUuid &layoutUid)
 {

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h

@@ -70 +70 @@
     void sltPutUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence);
 
-    void sltStatusBarContextMenuRequest(const QPoint &point);
     /** Handles the signal we get from the layout selector widget.
       * Selection changed is forwarded to the keyboard widget. */