dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r25671) -Codechange: Pass character and key code separately to the keyboard handler.

Browse Source
This commit is contained in:
michi_cc
2013-08-05 20:36:36 +00:00
parent 270d8aa639
commit 019984a14f
6 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/win32_v.cpp
View File

@@ -447,7 +447,7 @@ static LRESULT HandleCharMsg(uint keycode, uint charcode)
charcode = len == 1 ? w : 0;
#endif /* UNICODE */
HandleKeypress(GB(charcode, 0, 16) | (keycode << 16));
HandleKeypress(keycode, charcode);
return 0;
}
@@ -637,7 +637,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
/* No character translation? */
if (charcode == 0) {
HandleKeypress(0 | (keycode << 16));
HandleKeypress(keycode, 0);
return 0;
}
@@ -669,11 +669,11 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
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;