nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

cursor: Don't warp to (0,0) when last output is disconnected

Browse Source 
There doesn't appear to be any good reason to warp the cursor to
the top-left corner when all outputs are disconnected; it's no more
valid than any other (x,y) point in that case.

The real-world case here is a user with a single external monitor
turning it off (which apparently counts as disconnected depending
on the connection type/hardware).  For that user, it's desirable to
have the cursor remain in its original location when the monitor
is turned back on.
This commit is contained in:
John Lindgren 2022-09-20 14:51:39 -04:00
parent 5417a182e5
commit 68c8cef38e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
types/wlr_cursor.c
View File

@ -300,9 +300,19 @@ void wlr_cursor_warp_closest(struct wlr_cursor *cur,
get_mapping(cur, dev, &mapping); get_mapping(cur, dev, &mapping);
if (!wlr_box_empty(&mapping)) { if (!wlr_box_empty(&mapping)) {
wlr_box_closest_point(&mapping, lx, ly, &lx, &ly); wlr_box_closest_point(&mapping, lx, ly, &lx, &ly);
} else { } else if (!wl_list_empty(&cur->state->layout->outputs)) {
wlr_output_layout_closest_point(cur->state->layout, NULL, lx, ly, wlr_output_layout_closest_point(cur->state->layout, NULL, lx, ly,
&lx, &ly); &lx, &ly);
} else {
/*
* There is no mapping box for the input device and the
* output layout is empty. This can happen for example
* when external monitors are turned off/disconnected.
* In this case, all (x,y) points are equally invalid,
* so leave the cursor in its current location (better
* from a user standpoint than warping it to (0,0)).
*/
return;
} }
cursor_warp_unchecked(cur, lx, ly); cursor_warp_unchecked(cur, lx, ly);
@ -819,9 +829,9 @@ static void handle_layout_change(struct wl_listener *listener, void *data) {
struct wlr_output_layout *layout = data; struct wlr_output_layout *layout = data;
if (!wlr_output_layout_contains_point(layout, NULL, state->cursor->x, if (!wlr_output_layout_contains_point(layout, NULL, state->cursor->x,
state->cursor->y)) { state->cursor->y) && !wl_list_empty(&layout->outputs)) {
// the output we were on has gone away so go to the closest boundary // the output we were on has gone away so go to the closest boundary
// point // point (unless the layout is empty; compare warp_closest())
double x, y; double x, y;
wlr_output_layout_closest_point(layout, NULL, state->cursor->x, wlr_output_layout_closest_point(layout, NULL, state->cursor->x,
state->cursor->y, &x, &y); state->cursor->y, &x, &y);