mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-19 19:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Unicode char to WM_KEYDOWN processing in she::Window<T>

Browse Source
This commit is contained in:
David Capello 2015-05-19 15:17:07 -03:00
parent 4c0bbd50f8
commit 20f532ffe8
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/she/win/window.h
View File

@ -310,12 +310,35 @@ namespace she {
}
case WM_KEYDOWN: {
int vk = wparam;
int scancode = (lparam >> 16) & 0xff;
BYTE keystate[256];
WCHAR buffer[8];
int charsInBuffer = 0;
if (GetKeyboardState(&keystate[0])) {
// ToUnicode can return several characters inside the
// buffer in case that a dead-key wasn't combined with the
// next pressed character.
charsInBuffer = ToUnicode(vk, scancode, keystate, buffer,
sizeof(buffer)/sizeof(buffer[0]), 0);
}
Event ev;
ev.setType(Event::KeyDown);
ev.setScancode(win32vk_to_scancode(wparam));
ev.setUnicodeChar(0); // TODO
ev.setScancode(win32vk_to_scancode(vk));
ev.setRepeat(lparam & 15);
queueEvent(ev);
if (charsInBuffer < 1) {
ev.setUnicodeChar(0);
queueEvent(ev);
}
else {
for (int i=0; i<charsInBuffer; ++i) {
ev.setUnicodeChar(buffer[i]);
queueEvent(ev);
}
}
break;
}
@ -323,17 +346,7 @@ namespace she {
Event ev;
ev.setType(Event::KeyUp);
ev.setScancode(win32vk_to_scancode(wparam));
ev.setUnicodeChar(0); // TODO
ev.setRepeat(lparam & 15);
queueEvent(ev);
break;
}
case WM_UNICHAR: {
Event ev;
ev.setType(Event::KeyUp);
ev.setScancode(kKeyNil); // TODO
ev.setUnicodeChar(wparam);
ev.setUnicodeChar(0);
ev.setRepeat(lparam & 15);
queueEvent(ev);
break;