platform: update key normalization tests

magiblot · Oct 23, 2024 · 2d906ff · 2d906ff
1 parent 2e848ca
commit 2d906ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/source/platform/termio.cpp b/source/platform/termio.cpp
@@ -338,7 +338,7 @@ void TermIO::normalizeKey(KeyDownEvent &keyDown) noexcept
     {
         // Modifier precedece: Shift < Ctrl < Alt.
         int largestMod = (newMods & kbLeftAlt) ? 2
-                       : (newMods & kbLeftShift) ? 1
+                       : (newMods & kbLeftCtrl) ? 1
                        : 0;
         if (ushort keyCode = moddedKeyCodes[tKey.code][largestMod])
         {

diff --git a/source/tvision/tvtext2.cpp b/source/tvision/tvtext2.cpp
@@ -10,6 +10,7 @@
  *
  */
 
+#define Uses_TKeys
 #define Uses_TEditWindow
 #define Uses_TFileList
 #define Uses_TProgram

diff --git a/test/platform/termio.test.cpp b/test/platform/termio.test.cpp
@@ -20,10 +20,10 @@ TEST(TermIO, ShouldNormalizeKeys)
         {keyDownEv('a', kbLeftAlt, "a"), keyDownEv(kbAltA, kbLeftAlt, "")},
         {keyDownEv(kbIns, kbShift, ""), keyDownEv(kbShiftIns, kbShift, "")},
         {keyDownEv(kbBack, kbLeftCtrl | kbLeftAlt, ""), keyDownEv(kbAltBack, kbLeftCtrl | kbLeftAlt, "")},
-        {keyDownEv(kbCtrlBack, kbLeftCtrl, ""), keyDownEv(kbCtrlBack, kbLeftCtrl, "")},
-        {keyDownEv(kbCtrlBack, 0x0000, ""), keyDownEv(kbCtrlBack, kbCtrlShift, "")},
+        {keyDownEv(kbCtrlBack, kbRightCtrl, ""), keyDownEv(kbCtrlBack, kbRightCtrl, "")},
+        {keyDownEv(kbCtrlBack, 0x0000, ""), keyDownEv(kbCtrlBack, kbLeftCtrl, "")},
         {keyDownEv(kbIns, kbLeftCtrl | kbEnhanced, ""), keyDownEv(kbCtrlIns, kbLeftCtrl | kbEnhanced, "")},
-        {keyDownEv(kbCtrlDel, kbLeftAlt, ""), keyDownEv(kbAltDel, kbCtrlShift | kbLeftAlt, "")},
+        {keyDownEv(kbCtrlDel, kbLeftAlt, ""), keyDownEv(kbAltDel, kbLeftCtrl | kbLeftAlt, "")},
     };
 
     for (auto &testCase : testCases)