blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

input/pointer: try harder to not send duplicate motion events 

wl_fixed_t is a 32-bit data type, but our doubles are 64-bit. This meant
that two doubles that would map to the same wl_fixed_t could compare
unequal, and send a duplicate motion event.

Refs swaywm/sway#4632.
This commit is contained in:
Tudor Brindus 2021-08-05 09:15:49 -04:00 committed by Simon Ser
parent c27263c105
commit 033c9cab74
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
types/seat/wlr_seat_pointer.c
View File

@ -230,18 +230,21 @@ void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
return; return;
} }
if (wlr_seat->pointer_state.sx == sx && wlr_seat->pointer_state.sy == sy) { // Ensure we don't send duplicate motion events. Instead of comparing with an
return; // epsilon, chop off some precision by converting to a `wl_fixed_t` first,
} // since that is what a client receives.
wl_fixed_t sx_fixed = wl_fixed_from_double(sx);
wl_fixed_t sy_fixed = wl_fixed_from_double(sy);
if (wl_fixed_from_double(wlr_seat->pointer_state.sx) != sx_fixed ||
wl_fixed_from_double(wlr_seat->pointer_state.sy) != sy_fixed) {
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &client->pointers) { wl_resource_for_each(resource, &client->pointers) {
if (wlr_seat_client_from_pointer_resource(resource) == NULL) { if (wlr_seat_client_from_pointer_resource(resource) == NULL) {
continue; continue;
} }
wl_pointer_send_motion(resource, time, wl_fixed_from_double(sx), wl_pointer_send_motion(resource, time, sx_fixed, sy_fixed);
wl_fixed_from_double(sy)); }
} }
wlr_seat_pointer_warp(wlr_seat, sx, sy); wlr_seat_pointer_warp(wlr_seat, sx, sy);