# HG changeset patch # User glx # Date 1177709222 0 # Node ID 71cb3360be117144b6ccf8a5c110a0d9f0912dd2 # Parent 3663bab358d618986ffd2c1671a0a3fbe450ecd2 (svn r9728) -Fix r9086: [win32] For some keyboard layout the 'console' key is a dead-key. It needs to be pressed twice to have an effect but the console is then opened and closed on the 'same' keypress (2 WM_CHAR events). So skip the first WM_CHAR generated to restore the 'console' key functionality. diff -r 3663bab358d6 -r 71cb3360be11 src/video/win32_v.cpp --- a/src/video/win32_v.cpp Fri Apr 27 20:50:49 2007 +0000 +++ b/src/video/win32_v.cpp Fri Apr 27 21:27:02 2007 +0000 @@ -212,6 +212,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { static uint32 keycode = 0; + static bool console = false; switch (msg) { case WM_CREATE: @@ -363,12 +364,23 @@ } #endif /* UNICODE */ + case WM_DEADCHAR: + console = GB(lParam, 16, 8) == 41; + return 0; + case WM_CHAR: { /* Silently drop all non-text messages as those were handled by WM_KEYDOWN */ if (wParam < VK_SPACE) return 0; uint scancode = GB(lParam, 16, 8); uint charcode = wParam; + /* If the console key is a dead-key, we need to press it twice to get a WM_CHAR message. + * But we then get two WM_CHAR messages, so ignore the first one */ + if (console && scancode == 41) { + console = false; + return 0; + } + #if !defined(UNICODE) wchar_t w; int len = MultiByteToWideChar(_codepage, 0, (char*)&charcode, 1, &w, 1);