Mercurial > hg > openttd
diff src/video/win32_v.cpp @ 20696:d6112ef021b2 draft
-Codechange: Pass character and key code separately to the keyboard handler.
| author | Michael Lutz <michi@icosahedron.de> |
|---|---|
| date | Sun, 24 Mar 2013 00:06:33 +0100 (2013-03-23) |
| parents | ae27ee8c7eed |
| children | c3ef81a9b92e |
line wrap: on
line diff
--- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -442,7 +442,7 @@ charcode = len == 1 ? w : 0; #endif /* UNICODE */ - HandleKeypress(GB(charcode, 0, 16) | (keycode << 16)); + HandleKeypress(keycode, charcode); return 0; } @@ -632,7 +632,7 @@ /* No character translation? */ if (charcode == 0) { - HandleKeypress(0 | (keycode << 16)); + HandleKeypress(keycode, 0); return 0; } @@ -664,11 +664,11 @@ return 0; // do nothing case VK_F10: // F10, ignore activation of menu - HandleKeypress(MapWindowsKey(wParam) << 16); + HandleKeypress(MapWindowsKey(wParam), 0); return 0; default: // ALT in combination with something else - HandleKeypress(MapWindowsKey(wParam) << 16); + HandleKeypress(MapWindowsKey(wParam), 0); break; } break;