mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-05 04:06:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/cursor.c: handle pointer constraint position hint

Browse source 
Now cursor hints are respected once cursor movement occurs
after unlocking the pointer.

Fixes Overwatch 2 failing to center the mouse pointer when
opening the communication wheel in-game.

Fixes #872
This commit is contained in:
Jean-Luc Mackail 2023-04-12 16:42:32 +10:00 • committed by Consolatis
parent d4288415c9
commit 4fc88dca44
1 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/cursor.c
View file

@ -543,6 +543,27 @@ cursor_update_focus(struct server *server)
}
}
static void
warp_cursor_to_constraint_hint(struct seat *seat,
struct wlr_pointer_constraint_v1 *constraint)
{
if (!seat->server->focused_view) {
return;
}
if (constraint->current.committed
& WLR_POINTER_CONSTRAINT_V1_STATE_CURSOR_HINT) {
double sx = constraint->current.cursor_hint.x;
double sy = constraint->current.cursor_hint.y;
wlr_cursor_warp(seat->cursor, NULL,
seat->server->focused_view->current.x + sx,
seat->server->focused_view->current.y + sy);
/* Make sure we are not sending unnecessary surface movements */
wlr_seat_pointer_warp(seat->seat, sx, sy);
}
}
static void
handle_constraint_commit(struct wl_listener *listener, void *data)
{
@ -561,6 +582,8 @@ destroy_constraint(struct wl_listener *listener, void *data)
wl_list_remove(&constraint->destroy.link);
if (seat->current_constraint == wlr_constraint) {
warp_cursor_to_constraint_hint(seat, wlr_constraint);
if (seat->constraint_commit.link.next) {
wl_list_remove(&seat->constraint_commit.link);
}
@ -600,6 +623,10 @@ constrain_cursor(struct server *server, struct wlr_pointer_constraint_v1
}
wl_list_remove(&seat->constraint_commit.link);
if (seat->current_constraint) {
if (!constraint) {
warp_cursor_to_constraint_hint(seat, seat->current_constraint);
}
wlr_pointer_constraint_v1_send_deactivated(
seat->current_constraint);
}