asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #4943 from marcelofg55/master

Browse source 
Key modifiers (Ctrl, Alt, Meta and Shift) may be used as Input keys n…
This commit is contained in:
Rémi Verschelde 2016-06-04 15:36:24 +02:00
commit 95773c4785
1 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
platform/osx/os_osx.mm
View file

@ -772,20 +772,48 @@ static int translateKey(unsigned int key)
- (void)flagsChanged:(NSEvent *)event
{
/* int action;
unsigned int newModifierFlags =
[event modifierFlags] & NSDeviceIndependentModifierFlagsMask;
InputEvent ev;
int key = [event keyCode];
int mod = [event modifierFlags];
if (newModifierFlags > window->ns.modifierFlags)
action = GLFW_PRESS;
else
action = GLFW_RELEASE;
ev.type=InputEvent::KEY;
window->ns.modifierFlags = newModifierFlags;
if (key == 0x36 || key == 0x37) {
if (mod & NSCommandKeyMask) {
mod&= ~NSCommandKeyMask;
ev.key.pressed = true;
} else {
ev.key.pressed = false;
}
} else if (key == 0x38 || key == 0x3c) {
if (mod & NSShiftKeyMask) {
mod&= ~NSShiftKeyMask;
ev.key.pressed = true;
} else {
ev.key.pressed = false;
}
} else if (key == 0x3a || key == 0x3d) {
if (mod & NSAlternateKeyMask) {
mod&= ~NSAlternateKeyMask;
ev.key.pressed = true;
} else {
ev.key.pressed = false;
}
} else if (key == 0x3b || key == 0x3e) {
if (mod & NSControlKeyMask) {
mod&= ~NSControlKeyMask;
ev.key.pressed = true;
} else {
ev.key.pressed = false;
}
} else {
return;
}
const int key = translateKey([event keyCode]);
const int mods = translateFlags([event modifierFlags]);
_glfwInputKey(window, key, [event keyCode], action, mods);*/
ev.key.mod=translateFlags(mod);
ev.key.scancode = latin_keyboard_keycode_convert(translateKey(key));
OS_OSX::singleton->push_input(ev);
}
- (void)keyUp:(NSEvent *)event