changeset 30186:d9768ddc26fd v9.0.0429

patch 9.0.0429: not all keys are tested for the MS-Windows GUI Commit: https://github.com/vim/vim/commit/0adae2da17598669e442ba38547ab18a6c1406de Author: Yegappan Lakshmanan <yegappan@yahoo.com> Date: Fri Sep 9 17:39:02 2022 +0100 patch 9.0.0429: not all keys are tested for the MS-Windows GUI Problem: Not all keys are tested for the MS-Windows GUI. Solution: Add more key codes to the list. (Yegappan Lakshmanan, closes #11097)
author Bram Moolenaar <Bram@vim.org>
date Fri, 09 Sep 2022 18:45:03 +0200
parents ec82d3b921ca
children 21e6b6407754
files src/testdir/test_gui.vim src/version.c
diffstat 2 files changed, 80 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -1651,63 +1651,91 @@ func Test_gui_lowlevel_keyevent()
   endfor
 
   " Test for the various Ctrl and Shift key combinations.
+  " Refer to the following page for the virtual key codes:
+  " https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
   let keytests = [
-    \ [[0x10, 0x21], "\<S-Pageup>", 2],
-    \ [[0x11, 0x21], "\<C-Pageup>", 4],
-    \ [[0x10, 0x22], "\<S-PageDown>", 2],
-    \ [[0x11, 0x22], "\<C-PageDown>", 4],
-    \ [[0x10, 0x23], "\<S-End>", 0],
-    \ [[0x11, 0x23], "\<C-End>", 0],
-    \ [[0x10, 0x24], "\<S-Home>", 0],
-    \ [[0x11, 0x24], "\<C-Home>", 0],
-    \ [[0x10, 0x25], "\<S-Left>", 0],
-    \ [[0x11, 0x25], "\<C-Left>", 0],
-    \ [[0x10, 0x26], "\<S-Up>", 0],
-    \ [[0x11, 0x26], "\<C-Up>", 4],
-    \ [[0x10, 0x27], "\<S-Right>", 0],
-    \ [[0x11, 0x27], "\<C-Right>", 0],
-    \ [[0x10, 0x28], "\<S-Down>", 0],
-    \ [[0x11, 0x28], "\<C-Down>", 4],
-    \ [[0x11, 0x30], "\<C-0>", 4],
-    \ [[0x11, 0x31], "\<C-1>", 4],
-    \ [[0x11, 0x32], "\<C-2>", 4],
-    \ [[0x11, 0x33], "\<C-3>", 4],
-    \ [[0x11, 0x34], "\<C-4>", 4],
-    \ [[0x11, 0x35], "\<C-5>", 4],
-    \ [[0x11, 0x36], "\<C-^>", 0],
-    \ [[0x11, 0x37], "\<C-7>", 4],
-    \ [[0x11, 0x38], "\<C-8>", 4],
-    \ [[0x11, 0x39], "\<C-9>", 4],
-    \ [[0x11, 0x60], "\<C-0>", 4],
-    \ [[0x11, 0x61], "\<C-1>", 4],
-    \ [[0x11, 0x62], "\<C-2>", 4],
-    \ [[0x11, 0x63], "\<C-3>", 4],
-    \ [[0x11, 0x64], "\<C-4>", 4],
-    \ [[0x11, 0x65], "\<C-5>", 4],
-    \ [[0x11, 0x66], "\<C-6>", 4],
-    \ [[0x11, 0x67], "\<C-7>", 4],
-    \ [[0x11, 0x68], "\<C-8>", 4],
-    \ [[0x11, 0x69], "\<C-9>", 4],
-    \ [[0x11, 0x6A], "\<C-*>", 4],
-    \ [[0x11, 0x6B], "\<C-+>", 4],
-    \ [[0x11, 0x6D], "\<C-->", 4],
-    \ [[0x11, 0x70], "\<C-F1>", 4],
-    \ [[0x11, 0x71], "\<C-F2>", 4],
-    \ [[0x11, 0x72], "\<C-F3>", 4],
-    \ [[0x11, 0x73], "\<C-F4>", 4],
-    \ [[0x11, 0x74], "\<C-F5>", 4],
-    \ [[0x11, 0x75], "\<C-F6>", 4],
-    \ [[0x11, 0x76], "\<C-F7>", 4],
-    \ [[0x11, 0x77], "\<C-F8>", 4],
-    \ [[0x11, 0x78], "\<C-F9>", 4],
+    \ [[0x10, 0x21], "S-Pageup", 2],
+    \ [[0xA0, 0x21], "S-Pageup", 2],
+    \ [[0xA1, 0x21], "S-Pageup", 2],
+    \ [[0x11, 0x21], "C-Pageup", 4],
+    \ [[0xA2, 0x21], "C-Pageup", 4],
+    \ [[0xA3, 0x21], "C-Pageup", 4],
+    \ [[0x11, 0x10, 0x21], "C-S-Pageup", 6],
+    \ [[0x10, 0x22], "S-PageDown", 2],
+    \ [[0xA0, 0x22], "S-PageDown", 2],
+    \ [[0xA1, 0x22], "S-PageDown", 2],
+    \ [[0x11, 0x22], "C-PageDown", 4],
+    \ [[0xA2, 0x22], "C-PageDown", 4],
+    \ [[0xA3, 0x22], "C-PageDown", 4],
+    \ [[0x11, 0x10, 0x22], "C-S-PageDown", 6],
+    \ [[0x10, 0x23], "S-End", 0],
+    \ [[0x11, 0x23], "C-End", 0],
+    \ [[0x11, 0x10, 0x23], "C-S-End", 4],
+    \ [[0x10, 0x24], "S-Home", 0],
+    \ [[0x11, 0x24], "C-Home", 0],
+    \ [[0x11, 0x10, 0x24], "C-S-Home", 4],
+    \ [[0x10, 0x25], "S-Left", 0],
+    \ [[0x11, 0x25], "C-Left", 0],
+    \ [[0x11, 0x10, 0x25], "C-S-Left", 4],
+    \ [[0x10, 0x26], "S-Up", 0],
+    \ [[0x11, 0x26], "C-Up", 4],
+    \ [[0x11, 0x10, 0x26], "C-S-Up", 4],
+    \ [[0x10, 0x27], "S-Right", 0],
+    \ [[0x11, 0x27], "C-Right", 0],
+    \ [[0x11, 0x10, 0x27], "C-S-Right", 4],
+    \ [[0x10, 0x28], "S-Down", 0],
+    \ [[0x11, 0x28], "C-Down", 4],
+    \ [[0x11, 0x10, 0x28], "C-S-Down", 4],
+    \ [[0x11, 0x30], "C-0", 4],
+    \ [[0x11, 0x31], "C-1", 4],
+    \ [[0x11, 0x32], "C-2", 4],
+    \ [[0x11, 0x33], "C-3", 4],
+    \ [[0x11, 0x34], "C-4", 4],
+    \ [[0x11, 0x35], "C-5", 4],
+    \ [[0x11, 0x36], "C-^", 0],
+    \ [[0x11, 0x37], "C-7", 4],
+    \ [[0x11, 0x38], "C-8", 4],
+    \ [[0x11, 0x39], "C-9", 4],
+    \ [[0x11, 0x60], "C-0", 4],
+    \ [[0x11, 0x61], "C-1", 4],
+    \ [[0x11, 0x62], "C-2", 4],
+    \ [[0x11, 0x63], "C-3", 4],
+    \ [[0x11, 0x64], "C-4", 4],
+    \ [[0x11, 0x65], "C-5", 4],
+    \ [[0x11, 0x66], "C-6", 4],
+    \ [[0x11, 0x67], "C-7", 4],
+    \ [[0x11, 0x68], "C-8", 4],
+    \ [[0x11, 0x69], "C-9", 4],
+    \ [[0x11, 0x6A], "C-*", 4],
+    \ [[0x11, 0x6B], "C-+", 4],
+    \ [[0x11, 0x6D], "C--", 4],
+    \ [[0x11, 0x70], "C-F1", 4],
+    \ [[0x11, 0x10, 0x70], "C-S-F1", 4],
+    \ [[0x11, 0x71], "C-F2", 4],
+    \ [[0x11, 0x10, 0x71], "C-S-F2", 4],
+    \ [[0x11, 0x72], "C-F3", 4],
+    \ [[0x11, 0x10, 0x72], "C-S-F3", 4],
+    \ [[0x11, 0x73], "C-F4", 4],
+    \ [[0x11, 0x10, 0x73], "C-S-F4", 4],
+    \ [[0x11, 0x74], "C-F5", 4],
+    \ [[0x11, 0x10, 0x74], "C-S-F5", 4],
+    \ [[0x11, 0x75], "C-F6", 4],
+    \ [[0x11, 0x10, 0x75], "C-S-F6", 4],
+    \ [[0x11, 0x76], "C-F7", 4],
+    \ [[0x11, 0x10, 0x76], "C-S-F7", 4],
+    \ [[0x11, 0x77], "C-F8", 4],
+    \ [[0x11, 0x10, 0x77], "C-S-F8", 4],
+    \ [[0x11, 0x78], "C-F9", 4],
+    \ [[0x11, 0x10, 0x78], "C-S-F9", 4],
     \ ]
 
   for [kcodes, kstr, kmod] in keytests
     call SendKeys(kcodes)
     let ch = getcharstr()
     let mod = getcharmod()
-    call assert_equal(kstr, ch, $"key = {kstr}")
-    call assert_equal(kmod, mod)
+    let keycode = eval('"\<' .. kstr .. '>"')
+    call assert_equal(keycode, ch, $"key = {kstr}")
+    call assert_equal(kmod, mod, $"key = {kstr}")
   endfor
 
   bw!
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    429,
+/**/
     428,
 /**/
     427,