Changeset 79729 in vbox

Timestamp:

Jul 12, 2019 12:22:16 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Using usage page/id instead of scan codes

Location:

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

Files:

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

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

@@ -96 +96 @@
 };
 
-struct KeyCaptions
-{
-    QString m_strBase;
-    QString m_strShift;
-    QString m_strAltGr;
-    QString m_strShiftAltGr;
-};
-
 enum KeyboardColorType
 {
@@ -112 +104 @@
     KeyboardColorType_Pressed,
     KeyboardColorType_Max
+};
+
+struct KeyCaptions
+{
+    QString m_strBase;
+    QString m_strShift;
+    QString m_strAltGr;
+    QString m_strShiftAltGr;
+};
+
+struct UsageCode
+{
+    LONG usageId;
+    LONG usagePage;
+    bool fRelease;
 };
 
@@ -327 +334 @@
     void addScanCodePrefix(LONG scanCode);
     const QVector<LONG> &scanCodePrefix() const;
+
+    void setUsageId(LONG usageId);
+    void setUsagePage(LONG usagePage);
+    QPair<LONG, LONG> usagePageIdPair() const;
 
     void setSpaceWidthAfter(int iSpace);
@@ -391 +402 @@
     int        m_iPosition;
     UISoftKeyboardWidget  *m_pParentWidget;
+
+    LONG m_iUsageId;
+    LONG m_iUsagePage;
+
     bool m_fIsNumPadKey;
     bool m_fIsOSMenuKey;
@@ -509 +524 @@
     void sigStatusBarMessage(const QString &strMessage);
     void sigPutKeyboardSequence(QVector<LONG> sequence);
+
+    void sigPutUsageCodesPress(QVector<QPair<LONG, LONG> > sequence);
+    void sigPutUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence);
+
+
     void sigCurrentLayoutChange();
     void sigKeyToEdit(UISoftKeyboardKey* pKey);
@@ -1463 +1483 @@
 }
 
+void UISoftKeyboardKey::setUsageId(LONG usageId)
+{
+    m_iUsageId = usageId;
+}
+
+void UISoftKeyboardKey::setUsagePage(LONG usagePage)
+{
+    m_iUsagePage = usagePage;
+}
+
+QPair<LONG, LONG> UISoftKeyboardKey::usagePageIdPair() const
+{
+    return QPair<LONG, LONG>(m_iUsageId, m_iUsagePage);
+}
+
 int UISoftKeyboardKey::spaceWidthAfter() const
 {
@@ -2426 +2461 @@
         return;
 
+#if 0
+
     QVector<LONG> sequence;
     if (!pKey->scanCodePrefix().isEmpty())
@@ -2442 +2479 @@
     }
     emit sigPutKeyboardSequence(sequence);
+
+#else
+
+    QVector<QPair<LONG, LONG> > sequence;
+    sequence << QPair<LONG, LONG>(pKey->usagePageIdPair());
+    /* Add the pressed modifiers in the reverse order: */
+    for (int i = m_pressedModifiers.size() - 1; i >= 0; --i)
+    {
+        UISoftKeyboardKey *pModifier = m_pressedModifiers[i];
+        sequence << pModifier->usagePageIdPair();
+        /* Release the pressed modifiers (if there are not locked): */
+        pModifier->release();
+    }
+    emit sigPutUsageCodesRelease(sequence);
+
+#endif
 }
 
@@ -2453 +2506 @@
         return;
 
+#if 0
     QVector<LONG> sequence;
      /* Add the pressed modifiers first: */
@@ -2467 +2521 @@
     sequence << pKey->scanCode();
     emit sigPutKeyboardSequence(sequence);
+
+#else
+
+    QVector<QPair<LONG, LONG> > sequence;
+
+     /* Add the pressed modifiers first: */
+    for (int i = 0; i < m_pressedModifiers.size(); ++i)
+    {
+        UISoftKeyboardKey *pModifier = m_pressedModifiers[i];
+        sequence << pModifier->usagePageIdPair();
+    }
+
+    sequence << pKey->usagePageIdPair();
+    emit sigPutUsageCodesPress(sequence);
+
+#endif
 }
 
@@ -2923 +2993 @@
                     key.addScanCodePrefix(iCode);
             }
+        }
+        else if (m_xmlReader.name() == "usageid")
+        {
+            QString strCode = m_xmlReader.readElementText();
+            bool fOk = false;
+            key.setUsageId(strCode.toInt(&fOk, 16));
+        }
+        else if (m_xmlReader.name() == "usagepage")
+        {
+            QString strCode = m_xmlReader.readElementText();
+            bool fOk = false;
+            key.setUsagePage(strCode.toInt(&fOk, 16));
         }
         else if (m_xmlReader.name() == "cutout")
@@ -3391 +3473 @@
 }
 
+void UISoftKeyboard::sltPutUsageCodesPress(QVector<QPair<LONG, LONG> > sequence)
+{
+    for (int i = 0; i < sequence.size(); ++i)
+        keyboard().PutUsageCode(sequence[i].first, sequence[i].second, false);
+}
+
+void UISoftKeyboard::sltPutUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence)
+{
+    for (int i = 0; i < sequence.size(); ++i)
+        keyboard().PutUsageCode(sequence[i].first, sequence[i].second, true);
+}
+
 void UISoftKeyboard::sltStatusBarContextMenuRequest(const QPoint &point)
 {
@@ -3592 +3686 @@
     connect(m_pSession, &UISession::sigKeyboardLedsChange, this, &UISoftKeyboard::sltKeyboardLedsChange);
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigPutKeyboardSequence, this, &UISoftKeyboard::sltPutKeyboardSequence);
+    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigPutUsageCodesPress, this, &UISoftKeyboard::sltPutUsageCodesPress);
+    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigPutUsageCodesRelease, this, &UISoftKeyboard::sltPutUsageCodesRelease);
+
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigCurrentLayoutChange, this, &UISoftKeyboard::sltCurentLayoutChanged);
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigKeyToEdit, this, &UISoftKeyboard::sltKeyToEditChanged);

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

@@ -67 +67 @@
     void sltKeyboardLedsChange();
     void sltPutKeyboardSequence(QVector<LONG> sequence);
+    void sltPutUsageCodesPress(QVector<QPair<LONG, LONG> > sequence);
+    void sltPutUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence);
+
     void sltStatusBarContextMenuRequest(const QPoint &point);
     /** Handles the signal we get from the layout selector widget.