diff options
| author | Bram Moolenaar <bram@vim.org> | 2011-12-15 21:51:36 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2011-12-15 21:51:36 +0100 |
| commit | 7169ac33e19d37bbc15facb64f10ee9145e26528 (patch) | |
| tree | c89fcdc13e0796a5d7a14aed1b2ea58da49bc2f7 | |
| parent | 03323aced03923faa0245b539d79cef5c8a7f4bd (diff) | |
| download | vim-7169ac33e19d37bbc15facb64f10ee9145e26528.tar.gz | |
Problem: IME characters are inserted twice.
Solution: Do not call DefWindowProc() if the event was handled. (Yasuhiro
Matsumoto)
| -rw-r--r-- | src/gui_w32.c | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index c36f73d3..7c6896af 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -798,7 +798,7 @@ _WndProc( if (pt.y < rect.top) { show_tabline_popup_menu(); - return 0; + return 0L; } } return MyWindowProc(hwnd, uMsg, wParam, lParam); @@ -828,7 +828,10 @@ _WndProc( case WM_ENDSESSION: if (wParam) /* system only really goes down when wParam is TRUE */ + { _OnEndSession(); + return 0L; + } break; case WM_CHAR: @@ -866,7 +869,7 @@ _WndProc( * are received, mouse pointer remains hidden. */ return MyWindowProc(hwnd, uMsg, wParam, lParam); #else - return 0; + return 0L; #endif case WM_SIZING: /* HANDLE_MSG doesn't seem to handle this one */ @@ -874,7 +877,7 @@ _WndProc( case WM_MOUSEWHEEL: _OnMouseWheel(hwnd, HIWORD(wParam)); - break; + return 0L; /* Notification for change in SystemParametersInfo() */ case WM_SETTINGCHANGE: @@ -987,13 +990,19 @@ _WndProc( case TCN_SELCHANGE: if (gui_mch_showing_tabline() && ((LPNMHDR)lParam)->hwndFrom == s_tabhwnd) + { send_tabline_event(TabCtrl_GetCurSel(s_tabhwnd) + 1); + return 0L; + } break; case NM_RCLICK: if (gui_mch_showing_tabline() && ((LPNMHDR)lParam)->hwndFrom == s_tabhwnd) + { show_tabline_popup_menu(); + return 0L; + } break; # endif default: @@ -1037,6 +1046,7 @@ _WndProc( out_flush(); did_menu_tip = TRUE; } + return 0L; } break; #endif @@ -1079,18 +1089,19 @@ _WndProc( case WM_IME_NOTIFY: if (!_OnImeNotify(hwnd, (DWORD)wParam, (DWORD)lParam)) return MyWindowProc(hwnd, uMsg, wParam, lParam); - break; + return 1L; + case WM_IME_COMPOSITION: if (!_OnImeComposition(hwnd, wParam, lParam)) return MyWindowProc(hwnd, uMsg, wParam, lParam); - break; + return 1L; #endif default: if (uMsg == msh_msgmousewheel && msh_msgmousewheel != 0) { /* handle MSH_MOUSEWHEEL messages for Intellimouse */ _OnMouseWheel(hwnd, HIWORD(wParam)); - break; + return 0L; } #ifdef MSWIN_FIND_REPLACE else if (uMsg == s_findrep_msg && s_findrep_msg != 0) diff --git a/src/version.c b/src/version.c index 6ee8427c..8f7ff034 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 382, +/**/ 381, /**/ 380, |