Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-15 00:23:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #95008 from bruvzg/x11_mm_state

Browse Source 
[X11] Use motion event button state instead of async state.
This commit is contained in:
Rémi Verschelde 2024-08-06 12:30:52 +02:00
commit 945f70ef34
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
platform/linuxbsd/x11/display_server_x11.cpp
View File

@ -4970,6 +4970,23 @@ void DisplayServerX11::process_events() {
pos = Point2i(windows[focused_window_id].size.width / 2, windows[focused_window_id].size.height / 2);
}
BitField<MouseButtonMask> last_button_state = 0;
if (event.xmotion.state & Button1Mask) {
last_button_state.set_flag(MouseButtonMask::LEFT);
}
if (event.xmotion.state & Button2Mask) {
last_button_state.set_flag(MouseButtonMask::MIDDLE);
}
if (event.xmotion.state & Button3Mask) {
last_button_state.set_flag(MouseButtonMask::RIGHT);
}
if (event.xmotion.state & Button4Mask) {
last_button_state.set_flag(MouseButtonMask::MB_XBUTTON1);
}
if (event.xmotion.state & Button5Mask) {
last_button_state.set_flag(MouseButtonMask::MB_XBUTTON2);
}
Ref<InputEventMouseMotion> mm;
mm.instantiate();
@ -4977,13 +4994,13 @@ void DisplayServerX11::process_events() {
if (xi.pressure_supported) {
mm->set_pressure(xi.pressure);
} else {
mm->set_pressure(bool(mouse_get_button_state().has_flag(MouseButtonMask::LEFT)) ? 1.0f : 0.0f);
mm->set_pressure(bool(last_button_state.has_flag(MouseButtonMask::LEFT)) ? 1.0f : 0.0f);
}
mm->set_tilt(xi.tilt);
mm->set_pen_inverted(xi.pen_inverted);
_get_key_modifier_state(event.xmotion.state, mm);
mm->set_button_mask(mouse_get_button_state());
mm->set_button_mask(last_button_state);
mm->set_position(pos);
mm->set_global_position(pos);
mm->set_velocity(Input::get_singleton()->get_last_mouse_velocity());