godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Wayland: Emulate frame event for old wl_seat versions

Browse Source 
Multiwindow support simplified input handling by processing all data
only during a `wl_seat::frame` event, which got introduced in wl_seat
version 5. If the compositor reports an older version, we manually call
the frame event handler.

(cherry picked from commit 2e41412ee4)
This commit is contained in:
Riteo
2025-04-20 17:11:08 +02:00
committed by Rémi Verschelde
parent 452332621f
commit c4a375ca55
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
platform/linuxbsd/wayland/wayland_thread.cpp
View File

@@ -1595,6 +1595,10 @@ void WaylandThread::_wl_pointer_on_enter(void *data, struct wl_pointer *wl_point
seat_state_update_cursor(ss); seat_state_update_cursor(ss);
DEBUG_LOG_WAYLAND_THREAD(vformat("Pointer entered window %d.", ws->id)); DEBUG_LOG_WAYLAND_THREAD(vformat("Pointer entered window %d.", ws->id));
if (wl_pointer_get_version(wl_pointer) < WL_POINTER_FRAME_SINCE_VERSION) {
_wl_pointer_on_frame(data, wl_pointer);
}
} }
void WaylandThread::_wl_pointer_on_leave(void *data, struct wl_pointer *wl_pointer, uint32_t serial, struct wl_surface *surface) { void WaylandThread::_wl_pointer_on_leave(void *data, struct wl_pointer *wl_pointer, uint32_t serial, struct wl_surface *surface) {
@@ -1618,6 +1622,10 @@ void WaylandThread::_wl_pointer_on_leave(void *data, struct wl_pointer *wl_point
pd.pressed_button_mask.clear(); pd.pressed_button_mask.clear();
DEBUG_LOG_WAYLAND_THREAD(vformat("Pointer left window %d.", id)); DEBUG_LOG_WAYLAND_THREAD(vformat("Pointer left window %d.", id));
if (wl_pointer_get_version(wl_pointer) < WL_POINTER_FRAME_SINCE_VERSION) {
_wl_pointer_on_frame(data, wl_pointer);
}
} }
void WaylandThread::_wl_pointer_on_motion(void *data, struct wl_pointer *wl_pointer, uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) { void WaylandThread::_wl_pointer_on_motion(void *data, struct wl_pointer *wl_pointer, uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
@@ -1630,6 +1638,10 @@ void WaylandThread::_wl_pointer_on_motion(void *data, struct wl_pointer *wl_poin
pd.position.y = wl_fixed_to_double(surface_y); pd.position.y = wl_fixed_to_double(surface_y);
pd.motion_time = time; pd.motion_time = time;
if (wl_pointer_get_version(wl_pointer) < WL_POINTER_FRAME_SINCE_VERSION) {
_wl_pointer_on_frame(data, wl_pointer);
}
} }
void WaylandThread::_wl_pointer_on_button(void *data, struct wl_pointer *wl_pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state) { void WaylandThread::_wl_pointer_on_button(void *data, struct wl_pointer *wl_pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
@@ -1677,6 +1689,10 @@ void WaylandThread::_wl_pointer_on_button(void *data, struct wl_pointer *wl_poin
pd.button_time = time; pd.button_time = time;
pd.button_serial = serial; pd.button_serial = serial;
if (wl_pointer_get_version(wl_pointer) < WL_POINTER_FRAME_SINCE_VERSION) {
_wl_pointer_on_frame(data, wl_pointer);
}
} }
void WaylandThread::_wl_pointer_on_axis(void *data, struct wl_pointer *wl_pointer, uint32_t time, uint32_t axis, wl_fixed_t value) { void WaylandThread::_wl_pointer_on_axis(void *data, struct wl_pointer *wl_pointer, uint32_t time, uint32_t axis, wl_fixed_t value) {
@@ -1696,6 +1712,10 @@ void WaylandThread::_wl_pointer_on_axis(void *data, struct wl_pointer *wl_pointe
} }
pd.button_time = time; pd.button_time = time;
if (wl_pointer_get_version(wl_pointer) < WL_POINTER_FRAME_SINCE_VERSION) {
_wl_pointer_on_frame(data, wl_pointer);
}
} }
void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_pointer) { void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_pointer) {