diff options
| author | Bram Moolenaar <bram@vim.org> | 2014-08-22 18:44:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2014-08-22 18:44:33 +0200 |
| commit | 9b07072aa62a98bb367fbdb0a71379075fd8b982 (patch) | |
| tree | c8c4255353e6a4f96adabe98d605e7db9a59399f | |
| parent | 85302bfce9a0ad47506ae7e9e720ca1214a0a8cd (diff) | |
| download | vim-7-4-413.tar.gz | |
Problem: MS-Windows: Using US international keyboard layout, inserting dead
key by pressing space does not always work. Issue 250.
Solution: Let MS-Windows translate the message. (John Wellesz)
| -rw-r--r-- | src/gui_w48.c | 31 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 17 insertions, 16 deletions
diff --git a/src/gui_w48.c b/src/gui_w48.c index ae4c921c..cd7fdde5 100644 --- a/src/gui_w48.c +++ b/src/gui_w48.c @@ -614,6 +614,8 @@ _OnChar( char_u string[40]; int len = 0; + dead_key = 0; + len = char_to_string(ch, string, 40, FALSE); if (len == 1 && string[0] == Ctrl_C && ctrl_c_interrupts) { @@ -1788,24 +1790,21 @@ process_message(void) if (msg.message == WM_KEYDOWN || msg.message == WM_SYSKEYDOWN) { vk = (int) msg.wParam; - /* handle key after dead key, but ignore shift, alt and control */ - if (dead_key && vk != VK_SHIFT && vk != VK_MENU && vk != VK_CONTROL) + /* + * If a dead key was pressed and the user presses VK_SPACE, VK_BACK, or + * VK_ESCAPE it means that he actually wants to deal with the dead char + * now, so do nothing special and let Windows handle it. + * + * Note that VK_SPACE combines with the dead_key's character and only + * one WM_CHAR will be generated by TranslateMessage(), in the two + * other cases two WM_CHAR will be generated: the dead char and VK_BACK + * or VK_ESCAPE. That is most likely what the user expects. + */ + if (dead_key && (vk == VK_SPACE || vk == VK_BACK || vk == VK_ESCAPE)) { dead_key = 0; - /* handle non-alphabetic keys (ones that hopefully cannot generate - * umlaut-characters), unless when control is down */ - if (vk < 'A' || vk > 'Z' || (GetKeyState(VK_CONTROL) & 0x8000)) - { - MSG dm; - - dm.message = msg.message; - dm.hwnd = msg.hwnd; - dm.wParam = VK_SPACE; - MyTranslateMessage(&dm); /* generate dead character */ - if (vk != VK_SPACE) /* and send current character once more */ - PostMessage(msg.hwnd, msg.message, msg.wParam, msg.lParam); - return; - } + MyTranslateMessage(&msg); + return; } /* Check for CTRL-BREAK */ diff --git a/src/version.c b/src/version.c index 40b7ae48..e742d187 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 413, +/**/ 412, /**/ 411, |