mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #759 from dariomanesku/master

Browse Source 
Capture SDL modifier keys even if no other keys are pressed.
This commit is contained in:
Branimir Karadžić 2016-04-14 19:14:47 -07:00
commit 68cb2b310a
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
examples/common/entry/entry_sdl.cpp
View File

@ -49,6 +49,25 @@ namespace entry
return modifiers;
}
static uint8_t translateKeyModifierPress(uint16_t _key)
{
uint8_t modifier;
switch (_key)
{
case SDL_SCANCODE_LALT: { modifier = Modifier::LeftAlt; } break;
case SDL_SCANCODE_RALT: { modifier = Modifier::RightAlt; } break;
case SDL_SCANCODE_LCTRL: { modifier = Modifier::LeftCtrl; } break;
case SDL_SCANCODE_RCTRL: { modifier = Modifier::RightCtrl; } break;
case SDL_SCANCODE_LSHIFT: { modifier = Modifier::LeftShift; } break;
case SDL_SCANCODE_RSHIFT: { modifier = Modifier::RightShift; } break;
case SDL_SCANCODE_LGUI: { modifier = Modifier::LeftMeta; } break;
case SDL_SCANCODE_RGUI: { modifier = Modifier::RightMeta; } break;
default: { modifier = 0; } break;
}
return modifier;
}
static uint8_t s_translateKey[256];
static void initTranslateKey(uint16_t _sdl, Key::Enum _key)
@ -532,6 +551,13 @@ namespace entry
uint8_t modifiers = translateKeyModifiers(kev.keysym.mod);
Key::Enum key = translateKey(kev.keysym.scancode);
/// If you only press (e.g.) 'shift' and nothing else, then key == 'shift', modifier == 0.
/// Further along, pressing 'shift' + 'ctrl' would be: key == 'shift', modifier == 'ctrl.
if (0 == key && 0 == modifiers)
{
modifiers = translateKeyModifierPress(kev.keysym.scancode);
}
// TODO: These keys are not captured by SDL_TEXTINPUT. Should be probably handled by SDL_TEXTEDITING. This is a workaround for now.
if (key == 1) // Escape
{
@ -553,7 +579,7 @@ namespace entry
}
else
{
m_eventQueue.postKeyEvent(handle, key, modifiers, kev.state == SDL_PRESSED);
m_eventQueue.postKeyEvent(handle, key, modifiers, kev.state == SDL_PRESSED);
}
}
}