godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87277 from bruvzg/macos_swipe 

[macOS] Handle Trackpad / Magic Mouse swipe events and simulate XBUTTON1 / XBUTTON2 buttons.
This commit is contained in:
Rémi Verschelde 2024-02-13 17:23:46 +01:00
parent c8b5290119 8c22836532
commit bd57d2de18
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/macos/godot_content_view.h
View File

@ -72,7 +72,7 @@
- (void)processScrollEvent:(NSEvent *)event button:(MouseButton)button factor:(double)factor;
- (void)processPanEvent:(NSEvent *)event dx:(double)dx dy:(double)dy;
- (void)processMouseEvent:(NSEvent *)event index:(MouseButton)index pressed:(bool)pressed;
- (void)processMouseEvent:(NSEvent *)event index:(MouseButton)index pressed:(bool)pressed outofstream:(bool)outofstream;
- (void)setWindowID:(DisplayServer::WindowID)wid;
- (void)updateLayerDelegate;
- (void)cancelComposition;

49
platform/macos/godot_content_view.mm
View File

@ -356,7 +356,7 @@
ds->cursor_update_shape();
}
- (void)processMouseEvent:(NSEvent *)event index:(MouseButton)index pressed:(bool)pressed {
- (void)processMouseEvent:(NSEvent *)event index:(MouseButton)index pressed:(bool)pressed outofstream:(bool)outofstream {
DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
if (!ds || !ds->has_window(window_id)) {
return;
@ -377,14 +377,18 @@
Ref<InputEventMouseButton> mb;
mb.instantiate();
mb->set_window_id(window_id);
ds->update_mouse_pos(wd, [event locationInWindow]);
if (outofstream) {
ds->update_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]);
} else {
ds->update_mouse_pos(wd, [event locationInWindow]);
}
ds->get_key_modifier_state([event modifierFlags], mb);
mb->set_button_index(index);
mb->set_pressed(pressed);
mb->set_position(wd.mouse_pos);
mb->set_global_position(wd.mouse_pos);
mb->set_button_mask(last_button_state);
if (index == MouseButton::LEFT && pressed) {
if (!outofstream && index == MouseButton::LEFT && pressed) {
mb->set_double_click([event clickCount] == 2);
}
@ -394,10 +398,10 @@
- (void)mouseDown:(NSEvent *)event {
if (([event modifierFlags] & NSEventModifierFlagControl)) {
mouse_down_control = true;
[self processMouseEvent:event index:MouseButton::RIGHT pressed:true];
[self processMouseEvent:event index:MouseButton::RIGHT pressed:true outofstream:false];
} else {
mouse_down_control = false;
[self processMouseEvent:event index:MouseButton::LEFT pressed:true];
[self processMouseEvent:event index:MouseButton::LEFT pressed:true outofstream:false];
}
}
@ -407,9 +411,9 @@
- (void)mouseUp:(NSEvent *)event {
if (mouse_down_control) {
[self processMouseEvent:event index:MouseButton::RIGHT pressed:false];
[self processMouseEvent:event index:MouseButton::RIGHT pressed:false outofstream:false];
} else {
[self processMouseEvent:event index:MouseButton::LEFT pressed:false];
[self processMouseEvent:event index:MouseButton::LEFT pressed:false outofstream:false];
}
}
@ -458,7 +462,7 @@
}
- (void)rightMouseDown:(NSEvent *)event {
[self processMouseEvent:event index:MouseButton::RIGHT pressed:true];
[self processMouseEvent:event index:MouseButton::RIGHT pressed:true outofstream:false];
}
- (void)rightMouseDragged:(NSEvent *)event {
@ -466,16 +470,16 @@
}
- (void)rightMouseUp:(NSEvent *)event {
[self processMouseEvent:event index:MouseButton::RIGHT pressed:false];
[self processMouseEvent:event index:MouseButton::RIGHT pressed:false outofstream:false];
}
- (void)otherMouseDown:(NSEvent *)event {
if ((int)[event buttonNumber] == 2) {
[self processMouseEvent:event index:MouseButton::MIDDLE pressed:true];
[self processMouseEvent:event index:MouseButton::MIDDLE pressed:true outofstream:false];
} else if ((int)[event buttonNumber] == 3) {
[self processMouseEvent:event index:MouseButton::MB_XBUTTON1 pressed:true];
[self processMouseEvent:event index:MouseButton::MB_XBUTTON1 pressed:true outofstream:false];
} else if ((int)[event buttonNumber] == 4) {
[self processMouseEvent:event index:MouseButton::MB_XBUTTON2 pressed:true];
[self processMouseEvent:event index:MouseButton::MB_XBUTTON2 pressed:true outofstream:false];
} else {
return;
}
@ -487,16 +491,31 @@
- (void)otherMouseUp:(NSEvent *)event {
if ((int)[event buttonNumber] == 2) {
[self processMouseEvent:event index:MouseButton::MIDDLE pressed:false];
[self processMouseEvent:event index:MouseButton::MIDDLE pressed:false outofstream:false];
} else if ((int)[event buttonNumber] == 3) {
[self processMouseEvent:event index:MouseButton::MB_XBUTTON1 pressed:false];
[self processMouseEvent:event index:MouseButton::MB_XBUTTON1 pressed:false outofstream:false];
} else if ((int)[event buttonNumber] == 4) {
[self processMouseEvent:event index:MouseButton::MB_XBUTTON2 pressed:false];
[self processMouseEvent:event index:MouseButton::MB_XBUTTON2 pressed:false outofstream:false];
} else {
return;
}
}
- (void)swipeWithEvent:(NSEvent *)event {
// Swipe gesture on Trackpad/Magic Mouse, or physical back/forward mouse buttons.
if ([event phase] == NSEventPhaseEnded || [event phase] == NSEventPhaseChanged) {
if (Math::is_equal_approx([event deltaX], 1.0)) {
// Swipe left (back).
[self processMouseEvent:event index:MouseButton::MB_XBUTTON1 pressed:true outofstream:true];
[self processMouseEvent:event index:MouseButton::MB_XBUTTON1 pressed:false outofstream:true];
} else if (Math::is_equal_approx([event deltaX], -1.0)) {
// Swipe right (forward).
[self processMouseEvent:event index:MouseButton::MB_XBUTTON2 pressed:true outofstream:true];
[self processMouseEvent:event index:MouseButton::MB_XBUTTON2 pressed:false outofstream:true];
}
}
}
- (void)mouseExited:(NSEvent *)event {
DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
if (!ds || !ds->has_window(window_id)) {