To: vim_dev@googlegroups.com Subject: Patch 9.0.0888 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0888 Problem: MS-Windows GUI: CTRL-] does not work on Swiss keyboard. Solution: Check the key code and don't consider it as a dead key. (Aedin Louis Xavier, closes #11556) Files: src/gui_w32.c *** ../vim-9.0.0887/src/gui_w32.c 2022-11-06 11:27:35.894580888 +0000 --- src/gui_w32.c 2022-11-16 12:00:11.705093583 +0000 *************** *** 2152,2167 **** if (len <= 0) { ! if ( dead_key == DEAD_KEY_SET_DEFAULT ! && (GetKeyState(VK_CONTROL) & 0x8000) ! && ( (vk == 221 && scan_code == 26) // AZERTY CTRL+dead_circumflex ! || (vk == 220 && scan_code == 41) // QWERTZ CTRL+dead_circumflex ! ) ! ) { // post WM_CHAR='[' - which will be interpreted with CTRL // still hold as ESC ! PostMessageW(msg.hwnd, WM_CHAR, '[', msg.lParam); // ask _OnChar() to not touch this state, wait for next key // press and maintain knowledge that we are "poisoned" with // "dead state" --- 2152,2176 ---- if (len <= 0) { ! int wm_char = NUL; ! ! if (dead_key == DEAD_KEY_SET_DEFAULT ! && (GetKeyState(VK_CONTROL) & 0x8000)) ! { ! if ( // AZERTY CTRL+dead_circumflex ! (vk == 221 && scan_code == 26) ! // QWERTZ CTRL+dead_circumflex ! || (vk == 220 && scan_code == 41)) ! wm_char = '['; ! if ( // QWERTZ CTRL+dead_two-overdots ! (vk == 192 && scan_code == 27)) ! wm_char = ']'; ! } ! if (wm_char != NUL) { // post WM_CHAR='[' - which will be interpreted with CTRL // still hold as ESC ! PostMessageW(msg.hwnd, WM_CHAR, wm_char, msg.lParam); // ask _OnChar() to not touch this state, wait for next key // press and maintain knowledge that we are "poisoned" with // "dead state" *** ../vim-9.0.0887/src/version.c 2022-11-15 22:58:41.229439838 +0000 --- src/version.c 2022-11-16 11:57:04.117025955 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 888, /**/ -- hundred-and-one symptoms of being an internet addict: 79. All of your most erotic dreams have a scrollbar at the right side. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///