mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 04:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix generation of keyboard events with scancode+unicode on Windows

Browse Source
This commit is contained in:
David Capello 2016-11-29 11:09:09 -03:00
parent acdd9c3fed
commit 88b0b2161c
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/she/win/event_queue.h
View File

@ -38,15 +38,15 @@ public:
if (res) { if (res) {
// Avoid transforming WM_KEYDOWN/UP into WM_DEADCHAR/WM_CHAR // Avoid transforming WM_KEYDOWN/UP into WM_DEADCHAR/WM_CHAR
// messages when m_translateDeadKeys is disabled. // messages. Dead keys are converted manually in the
// WM_KEYDOWN processing on our WinWindow<T> class.
// //
// From MSDN TranslateMessage() documentation: // From MSDN TranslateMessage() documentation:
// "WM_KEYDOWN and WM_KEYUP combinations produce a WM_CHAR // "WM_KEYDOWN and WM_KEYUP combinations produce a WM_CHAR
// or WM_DEADCHAR message." // or WM_DEADCHAR message."
// https://msdn.microsoft.com/en-us/library/windows/desktop/ms644955.aspx // https://msdn.microsoft.com/en-us/library/windows/desktop/ms644955.aspx
if ((m_translateDeadKeys) || if (msg.message != WM_KEYDOWN &&
(msg.message != WM_KEYDOWN && msg.message != WM_KEYUP) {
msg.message != WM_KEYUP)) {
TranslateMessage(&msg); TranslateMessage(&msg);
} }
DispatchMessage(&msg); DispatchMessage(&msg);

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

@ -611,13 +611,15 @@ namespace she {
ev.setUnicodeChar(0); ev.setUnicodeChar(0);
ev.setRepeat(MAX(0, (lparam & 0xffff)-1)); ev.setRepeat(MAX(0, (lparam & 0xffff)-1));
if (!m_translateDeadKeys) { {
VkToUnicode tu; VkToUnicode tu;
if (tu) { if (tu) {
tu.toUnicode(vk, scancode); tu.toUnicode(vk, scancode);
if (tu.isDeadKey()) { if (tu.isDeadKey()) {
ev.setDeadKey(true);
ev.setUnicodeChar(tu[0]); ev.setUnicodeChar(tu[0]);
tu.toUnicode(vk, scancode); // Call again to remove dead-key if (!m_translateDeadKeys)
tu.toUnicode(vk, scancode); // Call again to remove dead-key
} }
else if (tu.size() > 0) { else if (tu.size() > 0) {
sendMsg = false; sendMsg = false;
@ -650,25 +652,6 @@ namespace she {
return 0; return 0;
} }
case WM_DEADCHAR: {
Event ev;
ev.setType(Event::KeyDown);
ev.setDeadKey(true);
ev.setUnicodeChar(wparam);
ev.setRepeat(lparam & 0xffff);
queueEvent(ev);
return 0;
}
case WM_CHAR: {
Event ev;
ev.setType(Event::KeyDown);
ev.setUnicodeChar(wparam);
ev.setRepeat(lparam & 0xffff);
queueEvent(ev);
return 0;
}
case WM_MENUCHAR: case WM_MENUCHAR:
// Avoid playing a sound when Alt+key is pressed and it's not in a native menu // Avoid playing a sound when Alt+key is pressed and it's not in a native menu
return MAKELONG(0, MNC_CLOSE); return MAKELONG(0, MNC_CLOSE);