Changeset 79669 in vbox

Timestamp:

Jul 10, 2019 10:46:06 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Handling multi part scan code prefixes correctly

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/softkeyboard/UISoftKeyboard.cpp (modified) (8 diffs)
• xml/103_iso.xml (modified) (1 diff)

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

@@ -325 +325 @@
     LONG scanCode() const;
 
-    void setScanCodePrefix(LONG scanCode);
-    LONG scanCodePrefix() const;
+    void addScanCodePrefix(LONG scanCode);
+    const QVector<LONG> &scanCodePrefix() const;
 
     void setSpaceWidthAfter(int iSpace);
@@ -378 +378 @@
     int        m_iSpaceWidthAfter;
     LONG       m_scanCode;
-    LONG       m_scanCodePrefix;
+    QVector<LONG> m_scanCodePrefix;
 
     /** @name Cutouts are used to create non-rectangle keys polygons.
@@ -1396 +1396 @@
     , m_iSpaceWidthAfter(0)
     , m_scanCode(0)
-    , m_scanCodePrefix(0)
     , m_iCutoutWidth(0)
     , m_iCutoutHeight(0)
@@ -1449 +1448 @@
 }
 
-void UISoftKeyboardKey::setScanCodePrefix(LONG scanCodePrefix)
-{
-    m_scanCodePrefix = scanCodePrefix;
-}
-
-LONG UISoftKeyboardKey::scanCodePrefix() const
+void UISoftKeyboardKey::addScanCodePrefix(LONG scanCodePrefix)
+{
+    m_scanCodePrefix << scanCodePrefix;
+}
+
+const QVector<LONG> &UISoftKeyboardKey::scanCodePrefix() const
 {
     return m_scanCodePrefix;
@@ -2428 +2427 @@
 
     QVector<LONG> sequence;
-    if (pKey->scanCodePrefix() != 0)
+    if (!pKey->scanCodePrefix().isEmpty())
         sequence <<  pKey->scanCodePrefix();
     sequence << (pKey->scanCode() | 0x80);
@@ -2436 +2435 @@
     {
         UISoftKeyboardKey *pModifier = m_pressedModifiers[i];
-        if (pModifier->scanCodePrefix() != 0)
+        if (!pModifier->scanCodePrefix().isEmpty())
             sequence << pModifier->scanCodePrefix();
         sequence << (pModifier->scanCode() | 0x80);
@@ -2459 +2458 @@
     {
         UISoftKeyboardKey *pModifier = m_pressedModifiers[i];
-        if (pModifier->scanCodePrefix() != 0)
+        if (!pModifier->scanCodePrefix().isEmpty())
             sequence << pModifier->scanCodePrefix();
         sequence << pModifier->scanCode();
     }
 
-    if (pKey->scanCodePrefix() != 0)
+    if (!pKey->scanCodePrefix().isEmpty())
         sequence << pKey->scanCodePrefix();
     sequence << pKey->scanCode();
@@ -2915 +2914 @@
         {
             QString strCode = m_xmlReader.readElementText();
-            bool fOk = false;
-            key.setScanCodePrefix(strCode.toInt(&fOk, 16));
+            QStringList strList;
+            strList << strCode.split('-', QString::SkipEmptyParts);
+            foreach (const QString &strPrefix, strList)
+            {
+                bool fOk = false;
+                LONG iCode = strPrefix.toInt(&fOk, 16);
+                if (fOk)
+                    key.addScanCodePrefix(iCode);
+            }
         }
         else if (m_xmlReader.name() == "cutout")

trunk/src/VBox/Frontends/VirtualBox/xml/103_iso.xml

@@ -82 +82 @@
             <scancodeprefix>0xe1-0x1d</scancodeprefix>
             <scancode>0x45</scancode>
+            0xe1-0x1d-0x45-0xe1-0x9d-0xc5
         </key>
     </row>