mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-26 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input/cursor: restore pointer position after emulating touch input

Browse source 
Fixes #1896.
This commit is contained in:
Tudor Brindus 2020-06-14 22:35:17 -04:00
parent 76adcc3fd3
commit 0869cd15d1
1 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

54
sway/input/cursor.c
View file

@ -304,35 +304,51 @@ void cursor_unhide(struct sway_cursor *cursor) {
static void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, static void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
struct wlr_input_device *device, double dx, double dy, struct wlr_input_device *device, double dx, double dy,
double dx_unaccel, double dy_unaccel) { double dx_unaccel, double dy_unaccel) {
double sx, sy;
struct wlr_seat *wlr_seat = cursor->seat->wlr_seat;
wlr_relative_pointer_manager_v1_send_relative_motion( wlr_relative_pointer_manager_v1_send_relative_motion(
server.relative_pointer_manager, server.relative_pointer_manager,
cursor->seat->wlr_seat, (uint64_t)time_msec * 1000, wlr_seat, (uint64_t)time_msec * 1000,
dx, dy, dx_unaccel, dy_unaccel); dx, dy, dx_unaccel, dy_unaccel);
// Only apply pointer constraints to real pointer input. if (device->type == WLR_INPUT_DEVICE_POINTER) {
if (cursor->active_constraint && device->type == WLR_INPUT_DEVICE_POINTER) { // Only apply pointer constraints to real pointer input.
struct wlr_surface *surface = NULL; if (cursor->active_constraint) {
double sx, sy; struct wlr_surface *surface = NULL;
node_at_coords(cursor->seat, node_at_coords(cursor->seat,
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy); cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
if (cursor->active_constraint->surface != surface) { if (cursor->active_constraint->surface != surface) {
return; return;
}
double sx_confined, sy_confined;
if (!wlr_region_confine(&cursor->confine, sx, sy, sx + dx, sy + dy,
&sx_confined, &sy_confined)) {
return;
}
dx = sx_confined - sx;
dy = sy_confined - sy;
} }
double sx_confined, sy_confined; // The expectation is that touch input will not update the cursor
if (!wlr_region_confine(&cursor->confine, sx, sy, sx + dx, sy + dy, // image position at all, even if it's being emulated as pointer input.
&sx_confined, &sy_confined)) { // Tablet input has already moved the cursor by this point (since it's
return; // based on absolute coordinates).
} wlr_cursor_move(cursor->cursor, device, dx, dy);
dx = sx_confined - sx;
dy = sy_confined - sy;
} }
wlr_cursor_move(cursor->cursor, device, dx, dy); wlr_seat_pointer_position(wlr_seat, &sx, &sy);
seatop_pointer_motion(cursor->seat, time_msec, dx, dy); seatop_pointer_motion(cursor->seat, time_msec, dx, dy);
// Hack: touch input UX expects the pointer (the cursor is currently
// hidden) to not move from touch input, but wlroots tracks pointer state
// internally and it will have moved it in the previous call to
// `seatop_pointer_motion` -- so restore it here.
if (device->type == WLR_INPUT_DEVICE_TOUCH) {
wlr_seat_pointer_warp(wlr_seat, sx, sy);
}
} }
static void handle_pointer_motion_relative( static void handle_pointer_motion_relative(