Changeset 78672 in vbox for trunk/src

Timestamp:

May 22, 2019 5:32:20 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Handling the CapsLock correctly

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/softkeyboard/UISoftKeyboard.cpp (modified) (11 diffs)
• xml/us_layout.xml (modified) (9 diffs)

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

@@ -46 +46 @@
 enum UIKeyType
 {
-    UIKeyType_SingleState,
-    UIKeyType_DualState,
-    UIKeyType_TriState,
+    UIKeyType_Ordinary,
+    /** e.g. CapsLock. Can be only in UIKeyState_NotPressed, UIKeyState_Locked, */
+    UIKeyType_Toggleable,
+    /** e.g. Shift Can be in all 3 states*/
+    UIKeyType_Modifier,
     UIKeyType_Max
 };
@@ -248 +250 @@
     key.m_scanCodePrefix = 0;
     key.m_iSpaceAfter = 0;
-    key.m_enmType = UIKeyType_SingleState;
+    key.m_enmType = UIKeyType_Ordinary;
 
     while (m_xmlReader.readNextStartElement())
@@ -280 +282 @@
         {
             QString strType = m_xmlReader.readElementText();
-            if (strType == "tristate")
-                key.m_enmType = UIKeyType_TriState;
-            else if (strType == "dualstate")
-                key.m_enmType = UIKeyType_DualState;
+            if (strType == "modifier")
+                key.m_enmType = UIKeyType_Modifier;
+            else if (strType == "toggleable")
+                key.m_enmType = UIKeyType_Toggleable;
         }
         else
@@ -301 +303 @@
     , m_scanCode(0)
     , m_scanCodePrefix(0)
-    , m_enmType(UIKeyType_SingleState)
+    , m_enmType(UIKeyType_Ordinary)
     , m_enmState(UIKeyState_NotPressed)
     , m_fScaleMultiplier(1.f)
@@ -401 +403 @@
     QToolButton::paintEvent(pEvent);
 
-    if (m_enmType == UIKeyType_SingleState)
-        return;
-
+    if (m_enmType == UIKeyType_Ordinary)
+        return;
 
     QPainter painter(this);
@@ -427 +428 @@
 void UISoftKeyboardKey::updateState(bool fPressed)
 {
-    if (m_enmType == UIKeyType_SingleState)
-        return;
-    if (m_enmType == UIKeyType_TriState)
+    if (m_enmType == UIKeyType_Ordinary)
+        return;
+    if (m_enmType == UIKeyType_Modifier)
     {
         if (fPressed)
@@ -446 +447 @@
         }
     }
-    else if (m_enmType == UIKeyType_DualState)
+    else if (m_enmType == UIKeyType_Toggleable)
     {
         if (fPressed)
@@ -566 +567 @@
     if (!pKey)
         return;
-    if (pKey->type() != UIKeyType_SingleState)
+    if (pKey->type() == UIKeyType_Modifier)
         return;
 
@@ -591 +592 @@
     if (!pKey)
         return;
-
-    if (pKey->type() != UIKeyType_SingleState)
+    /* We only send the scan codes of Ordinary keys: */
+    if (pKey->type() == UIKeyType_Modifier)
         return;
 
@@ -604 +605 @@
     {
         UISoftKeyboardKey *pModifier = m_pressedModifiers[i];
-        if (pModifier->type() == UIKeyType_DualState)
-            continue;
         if (pModifier->scanCodePrefix() != 0)
             sequence << pModifier->scanCodePrefix();
@@ -620 +619 @@
     if (!pKey)
         return;
-    if (pKey->type() == UIKeyType_SingleState)
+    if (pKey->type() != UIKeyType_Modifier)
         return;
     if (pKey->state() == UIKeyState_NotPressed)

trunk/src/VBox/Frontends/VirtualBox/xml/us_layout.xml

@@ -290 +290 @@
             <width>70</width>
             <label>CapsLock</label>
-            <type>dualstate</type>
+            <type>toggleable</type>
             <position>30</position>
             <scancode>0x3a</scancode>
@@ -374 +374 @@
             <width>115</width>
             <label>Shift</label>
-            <type>tristate</type>
+            <type>modifier</type>
             <position>44</position>
             <scancode>0x2a</scancode>
@@ -444 +444 @@
             <width>115</width>
             <label>Shift</label>
-            <type>tristate</type>
+            <type>modifier</type>
             <position>57</position>
             <scancode>0x36</scancode>
@@ -455 +455 @@
             <width>90</width>
             <label>Ctrl</label>
-            <type>tristate</type>
+            <type>modifier</type>
             <position>58</position>
             <scancode>0x1d</scancode>
@@ -462 +462 @@
             <width>50</width>
             <label>Win</label>
-            <type>tristate</type>
+            <type>modifier</type>
             <scancodeprefix>0xe0</scancodeprefix>
             <scancode>0x5b</scancode>
@@ -470 +470 @@
             <position>60</position>
             <label>Alt</label>
-            <type>tristate</type>
+            <type>modifier</type>
             <scancode>0x38</scancode>
         </key>
@@ -481 +481 @@
             <width>70</width>
             <label>AltGr</label>
-            <type>tristate</type>
+            <type>modifier</type>
             <scancodeprefix>0xe0</scancodeprefix>
             <scancode>0x38</scancode>
@@ -488 +488 @@
             <width>50</width>
             <label>Win</label>
-            <type>tristate</type>
+            <type>modifier</type>
             <scancodeprefix>0xe0</scancodeprefix>
             <scancode>0x5c</scancode>
@@ -501 +501 @@
             <width>90</width>
             <label>Ctrl</label>
-            <type>tristate</type>
+            <type>modifier</type>
             <scancodeprefix>0xe0</scancodeprefix>
             <scancode>0x1d</scancode>