maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed osx input event

Browse source
This commit is contained in:
toger5 2017-05-21 19:02:35 -07:00
parent 5b3709d309
commit b90df858c1
1 changed files with 141 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

274
platform/osx/os_osx.mm
View file

@ -63,15 +63,12 @@ static NSRect convertRectToBacking(NSRect contentRect) {
return contentRect; return contentRect;
} }
static InputModifierState translateFlags(NSUInteger flags) { static void get_osx_key_modifier_state(unsigned int flags, Ref<InputEventWithModifiers> state) {
InputModifierState mod;
mod.shift = (flags & NSShiftKeyMask); state->set_shift((flags & NSShiftKeyMask));
mod.control = (flags & NSControlKeyMask); state->set_control((flags & NSControlKeyMask));
mod.alt = (flags & NSAlternateKeyMask); state->set_alt((flags & NSAlternateKeyMask));
mod.meta = (flags & NSCommandKeyMask); state->set_metakey((flags & NSCommandKeyMask));
return mod;
} }
static int mouse_x = 0; static int mouse_x = 0;
@ -286,20 +283,19 @@ static int button_mask = 0;
- (void)mouseDown:(NSEvent *)event { - (void)mouseDown:(NSEvent *)event {
//print_line("mouse down:");
button_mask |= BUTTON_MASK_LEFT; button_mask |= BUTTON_MASK_LEFT;
Ref<InputEvent> ev;
ev.type = InputEvent::MOUSE_BUTTON; Ref<InputEventMouseButton> mb;
ev->get_button_index() = BUTTON_LEFT; mb.instance();
ev->is_pressed() = true;
ev->get_pos().x = mouse_x; get_osx_key_modifier_state([event modifierFlags], mb);
ev->get_pos().y = mouse_y; mb->set_button_index(BUTTON_LEFT);
ev.mouse_button.global_x = mouse_x; mb->set_pressed(true);
ev.mouse_button.global_y = mouse_y; mb->set_pos(Vector2(mouse_x, mouse_y));
ev->get_button_mask() = button_mask; mb->set_global_pos(Vector2(mouse_x, mouse_y));
ev.mouse_button.doubleclick = [event clickCount] == 2; mb->set_button_mask(button_mask);
ev.mouse_button.mod = translateFlags([event modifierFlags]); mb->set_doubleclick([event clickCount] == 2);
OS_OSX::singleton->push_input(ev); OS_OSX::singleton->push_input(mb);
} }
- (void)mouseDragged:(NSEvent *)event { - (void)mouseDragged:(NSEvent *)event {
@ -309,56 +305,58 @@ static int button_mask = 0;
- (void)mouseUp:(NSEvent *)event { - (void)mouseUp:(NSEvent *)event {
button_mask &= ~BUTTON_MASK_LEFT; button_mask &= ~BUTTON_MASK_LEFT;
Ref<InputEvent> ev; Ref<InputEventMouseButton> mb;
ev.type = InputEvent::MOUSE_BUTTON; mb.instance();
ev->get_button_index() = BUTTON_LEFT;
ev->is_pressed() = false; get_osx_key_modifier_state([event modifierFlags], mb);
ev->get_pos().x = mouse_x; mb->set_button_index(BUTTON_LEFT);
ev->get_pos().y = mouse_y; mb->set_pressed(false);
ev.mouse_button.global_x = mouse_x; mb->set_pos(Vector2(mouse_x, mouse_y));
ev.mouse_button.global_y = mouse_y; mb->set_global_pos(Vector2(mouse_x, mouse_y));
ev->get_button_mask() = button_mask; mb->set_button_mask(button_mask);
ev.mouse_button.mod = translateFlags([event modifierFlags]); mb->set_doubleclick([event clickCount] == 2);
OS_OSX::singleton->push_input(ev); OS_OSX::singleton->push_input(mb);
} }
- (void)mouseMoved:(NSEvent *)event { - (void)mouseMoved:(NSEvent *)event {
Ref<InputEvent> ev; Ref<InputEventMouseMotion> mm;
ev.type = InputEvent::MOUSE_MOTION; mm.instance();
ev->get_button_mask() = button_mask;
mm->set_button_mask(button_mask);
prev_mouse_x = mouse_x; prev_mouse_x = mouse_x;
prev_mouse_y = mouse_y; prev_mouse_y = mouse_y;
const NSRect contentRect = [OS_OSX::singleton->window_view frame]; const NSRect contentRect = [OS_OSX::singleton->window_view frame];
const NSPoint p = [event locationInWindow]; const NSPoint p = [event locationInWindow];
mouse_x = p.x * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); mouse_x = p.x * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]);
mouse_y = (contentRect.size.height - p.y) * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); mouse_y = (contentRect.size.height - p.y) * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]);
ev.mouse_motion.x = mouse_x; mm->set_pos(Vector2(mouse_x, mouse_y));
ev.mouse_motion.y = mouse_y; mm->set_global_pos(Vector2(mouse_x, mouse_y));
ev.mouse_motion.global_x = mouse_x; Vector2 relativeMotion = Vector2();
ev.mouse_motion.global_y = mouse_y; relativeMotion.x = [event deltaX] * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]);
ev->get_relative().x = [event deltaX] * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); relativeMotion.y = [event deltaY] * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]);
ev->get_relative().y = [event deltaY] * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); mm->set_relative(relativeMotion);
ev.mouse_motion.mod = translateFlags([event modifierFlags]); get_osx_key_modifier_state([event modifierFlags], mm);
OS_OSX::singleton->input->set_mouse_position(Point2(mouse_x, mouse_y)); OS_OSX::singleton->input->set_mouse_position(Point2(mouse_x, mouse_y));
OS_OSX::singleton->push_input(ev); OS_OSX::singleton->push_input(mm);
} }
- (void)rightMouseDown:(NSEvent *)event { - (void)rightMouseDown:(NSEvent *)event {
button_mask |= BUTTON_MASK_RIGHT; button_mask |= BUTTON_MASK_RIGHT;
Ref<InputEvent> ev;
ev.type = InputEvent::MOUSE_BUTTON; Ref<InputEventMouseButton> mb;
ev->get_button_index() = BUTTON_RIGHT; mb.instance();
ev->is_pressed() = true;
ev->get_pos().x = mouse_x; get_osx_key_modifier_state([event modifierFlags], mb);
ev->get_pos().y = mouse_y; mb->set_button_index(BUTTON_RIGHT);
ev.mouse_button.global_x = mouse_x; mb->set_pressed(true);
ev.mouse_button.global_y = mouse_y; mb->set_pos(Vector2(mouse_x, mouse_y));
ev->get_button_mask() = button_mask; mb->set_global_pos(Vector2(mouse_x, mouse_y));
ev.mouse_button.mod = translateFlags([event modifierFlags]); mb->set_button_mask(button_mask);
OS_OSX::singleton->push_input(ev); mb->set_doubleclick([event clickCount] == 2);
OS_OSX::singleton->push_input(mb);
} }
- (void)rightMouseDragged:(NSEvent *)event { - (void)rightMouseDragged:(NSEvent *)event {
@ -367,18 +365,19 @@ static int button_mask = 0;
- (void)rightMouseUp:(NSEvent *)event { - (void)rightMouseUp:(NSEvent *)event {
button_mask &= ~BUTTON_MASK_RIGHT; button_mask |= BUTTON_MASK_RIGHT;
Ref<InputEvent> ev;
ev.type = InputEvent::MOUSE_BUTTON; Ref<InputEventMouseButton> mb;
ev->get_button_index() = BUTTON_RIGHT; mb.instance();
ev->is_pressed() = false;
ev->get_pos().x = mouse_x; get_osx_key_modifier_state([event modifierFlags], mb);
ev->get_pos().y = mouse_y; mb->set_button_index(BUTTON_RIGHT);
ev.mouse_button.global_x = mouse_x; mb->set_pressed(false);
ev.mouse_button.global_y = mouse_y; mb->set_pos(Vector2(mouse_x, mouse_y));
ev->get_button_mask() = button_mask; mb->set_global_pos(Vector2(mouse_x, mouse_y));
ev.mouse_button.mod = translateFlags([event modifierFlags]); mb->set_button_mask(button_mask);
OS_OSX::singleton->push_input(ev); mb->set_doubleclick([event clickCount] == 2);
OS_OSX::singleton->push_input(mb);
} }
- (void)otherMouseDown:(NSEvent *)event { - (void)otherMouseDown:(NSEvent *)event {
@ -387,17 +386,18 @@ static int button_mask = 0;
return; return;
button_mask |= BUTTON_MASK_MIDDLE; button_mask |= BUTTON_MASK_MIDDLE;
Ref<InputEvent> ev;
ev.type = InputEvent::MOUSE_BUTTON; Ref<InputEventMouseButton> mb;
ev->get_button_index() = BUTTON_MIDDLE; mb.instance();
ev->is_pressed() = true;
ev->get_pos().x = mouse_x; get_osx_key_modifier_state([event modifierFlags], mb);
ev->get_pos().y = mouse_y; mb->set_button_index(BUTTON_MIDDLE);
ev.mouse_button.global_x = mouse_x; mb->set_pressed(true);
ev.mouse_button.global_y = mouse_y; mb->set_pos(Vector2(mouse_x, mouse_y));
ev->get_button_mask() = button_mask; mb->set_global_pos(Vector2(mouse_x, mouse_y));
ev.mouse_button.mod = translateFlags([event modifierFlags]); mb->set_button_mask(button_mask);
OS_OSX::singleton->push_input(ev); mb->set_doubleclick([event clickCount] == 2);
OS_OSX::singleton->push_input(mb);
} }
- (void)otherMouseDragged:(NSEvent *)event { - (void)otherMouseDragged:(NSEvent *)event {
@ -409,18 +409,19 @@ static int button_mask = 0;
if ((int)[event buttonNumber] != 2) if ((int)[event buttonNumber] != 2)
return; return;
button_mask &= ~BUTTON_MASK_MIDDLE; button_mask |= BUTTON_MASK_MIDDLE;
Ref<InputEvent> ev;
ev.type = InputEvent::MOUSE_BUTTON; Ref<InputEventMouseButton> mb;
ev->get_button_index() = BUTTON_MIDDLE; mb.instance();
ev->is_pressed() = false;
ev->get_pos().x = mouse_x; get_osx_key_modifier_state([event modifierFlags], mb);
ev->get_pos().y = mouse_y; mb->set_button_index(BUTTON_MIDDLE);
ev.mouse_button.global_x = mouse_x; mb->set_pressed(true);
ev.mouse_button.global_y = mouse_y; mb->set_pos(Vector2(mouse_x, mouse_y));
ev->get_button_mask() = button_mask; mb->set_global_pos(Vector2(mouse_x, mouse_y));
ev.mouse_button.mod = translateFlags([event modifierFlags]); mb->set_button_mask(button_mask);
OS_OSX::singleton->push_input(ev); mb->set_doubleclick([event clickCount] == 2);
OS_OSX::singleton->push_input(mb);
} }
- (void)mouseExited:(NSEvent *)event { - (void)mouseExited:(NSEvent *)event {
@ -610,96 +611,101 @@ static int translateKey(unsigned int key) {
} }
- (void)keyDown:(NSEvent *)event { - (void)keyDown:(NSEvent *)event {
Ref<InputEvent> ev;
ev.type = InputEvent::KEY; Ref<InputEventKey> k;
ev->is_pressed() = true; k.instance();
ev.key.mod = translateFlags([event modifierFlags]);
ev->get_scancode() = latin_keyboard_keycode_convert(translateKey([event keyCode])); get_osx_key_modifier_state([event modifierFlags], k);
ev->is_echo() = [event isARepeat]; k->set_pressed(true);
k->set_scancode(latin_keyboard_keycode_convert(translateKey([event keyCode])));
k->set_echo([event isARepeat]);
NSString *characters = [event characters]; NSString *characters = [event characters];
NSUInteger i, length = [characters length]; NSUInteger i, length = [characters length];
if (length > 0 && keycode_has_unicode(ev->get_scancode())) { if (length > 0 && keycode_has_unicode(k->get_scancode())) {
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
ev.key.unicode = [characters characterAtIndex:i]; k->set_unicode([characters characterAtIndex:i]);
OS_OSX::singleton->push_input(ev); OS_OSX::singleton->push_input(k);
ev->get_scancode() = 0; k->set_scancode(0);
} }
} else { } else {
OS_OSX::singleton->push_input(ev); OS_OSX::singleton->push_input(k);
} }
} }
- (void)flagsChanged:(NSEvent *)event { - (void)flagsChanged:(NSEvent *)event {
Ref<InputEvent> ev; Ref<InputEventKey> k;
k.instance();
int key = [event keyCode]; int key = [event keyCode];
int mod = [event modifierFlags]; int mod = [event modifierFlags];
ev.type = InputEvent::KEY;
if (key == 0x36 || key == 0x37) { if (key == 0x36 || key == 0x37) {
if (mod & NSCommandKeyMask) { if (mod & NSCommandKeyMask) {
mod &= ~NSCommandKeyMask; mod &= ~NSCommandKeyMask;
ev->is_pressed() = true; k->set_pressed(true);
} else { } else {
ev->is_pressed() = false; k->set_pressed(false);
} }
} else if (key == 0x38 || key == 0x3c) { } else if (key == 0x38 || key == 0x3c) {
if (mod & NSShiftKeyMask) { if (mod & NSShiftKeyMask) {
mod &= ~NSShiftKeyMask; mod &= ~NSShiftKeyMask;
ev->is_pressed() = true; k->set_pressed(true);
} else { } else {
ev->is_pressed() = false; k->set_pressed(false);
} }
} else if (key == 0x3a || key == 0x3d) { } else if (key == 0x3a || key == 0x3d) {
if (mod & NSAlternateKeyMask) { if (mod & NSAlternateKeyMask) {
mod &= ~NSAlternateKeyMask; mod &= ~NSAlternateKeyMask;
ev->is_pressed() = true; k->set_pressed(true);
} else { } else {
ev->is_pressed() = false; k->set_pressed(false);
} }
} else if (key == 0x3b || key == 0x3e) { } else if (key == 0x3b || key == 0x3e) {
if (mod & NSControlKeyMask) { if (mod & NSControlKeyMask) {
mod &= ~NSControlKeyMask; mod &= ~NSControlKeyMask;
ev->is_pressed() = true; k->set_pressed(true);
} else { } else {
ev->is_pressed() = false; k->set_pressed(false);
} }
} else { } else {
return; return;
} }
ev.key.mod = translateFlags(mod); get_osx_key_modifier_state(mod, k);
ev->get_scancode() = latin_keyboard_keycode_convert(translateKey(key)); k->set_scancode(latin_keyboard_keycode_convert(translateKey(key)));
OS_OSX::singleton->push_input(ev); OS_OSX::singleton->push_input(k);
} }
- (void)keyUp:(NSEvent *)event { - (void)keyUp:(NSEvent *)event {
Ref<InputEvent> ev; Ref<InputEventKey> k;
ev.type = InputEvent::KEY; k.instance();
ev->is_pressed() = false;
ev.key.mod = translateFlags([event modifierFlags]); get_osx_key_modifier_state([event modifierFlags], k);
ev->get_scancode() = latin_keyboard_keycode_convert(translateKey([event keyCode])); k->set_pressed(false);
OS_OSX::singleton->push_input(ev); k->set_scancode(latin_keyboard_keycode_convert(translateKey([event keyCode])));
OS_OSX::singleton->push_input(k);
} }
inline void sendScrollEvent(int button, double factor) { inline void sendScrollEvent(int button, double factor) {
Ref<InputEvent> ev; //toger scroll event has not modifier keys or are they added somewhere else
ev.type = Ref<InputEvent>::MOUSE_BUTTON; Ref<InputEventMouseButton> sc;
ev->get_button_index() = button; sc.instance();
ev.mouse_button->get_factor() = factor;
ev->is_pressed() = true; sc->set_button_index(button);
ev->get_pos().x = mouse_x; sc->set_factor(factor);
ev->get_pos().y = mouse_y; sc->set_pressed(true);
ev.mouse_button.global_x = mouse_x; Vector2 mouse_pos = Vector2(mouse_x, mouse_y);
ev.mouse_button.global_y = mouse_y; sc->set_pos(mouse_pos);
ev->get_button_mask() = button_mask; sc->set_global_pos(mouse_pos);
OS_OSX::singleton->push_input(ev); sc->set_button_mask(button_mask);
ev->is_pressed() = false; OS_OSX::singleton->push_input(sc);
OS_OSX::singleton->push_input(ev); sc->set_pressed(false);
OS_OSX::singleton->push_input(sc);
} }
- (void)scrollWheel:(NSEvent *)event { - (void)scrollWheel:(NSEvent *)event {
@ -1516,7 +1522,7 @@ void OS_OSX::process_events() {
} }
void OS_OSX::push_input(const Ref<InputEvent> &p_event) { void OS_OSX::push_input(const Ref<InputEvent> &p_event) {
//toger why is ther another function alternative would be to just use input->input->parse_input_event(ev);
Ref<InputEvent> ev = p_event; Ref<InputEvent> ev = p_event;
input->parse_input_event(ev); input->parse_input_event(ev);
} }