mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor: fix and simplify region mapping

Browse source 
Fixes: 4462f5dcb3
This commit is contained in:
Kirill Primak 2024-01-31 20:44:01 +03:00 • committed by Simon Zeni
parent 60af3b6b78
commit 56cc25185d
1 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
types/wlr_cursor.c
View file

@ -1179,21 +1179,11 @@ void wlr_cursor_map_input_to_output(struct wlr_cursor *cur,
void wlr_cursor_map_to_region(struct wlr_cursor *cur, void wlr_cursor_map_to_region(struct wlr_cursor *cur,
const struct wlr_box *box) { const struct wlr_box *box) {
cur->state->mapped_box = (struct wlr_box){0}; cur->state->mapped_box = wlr_box_empty(box) ? (struct wlr_box){0} : *box;
if (box) {
if (wlr_box_empty(box)) {
wlr_log(WLR_ERROR, "cannot map cursor to an empty region");
return;
}
cur->state->mapped_box = *box;
}
} }
void wlr_cursor_map_input_to_region(struct wlr_cursor *cur, void wlr_cursor_map_input_to_region(struct wlr_cursor *cur,
struct wlr_input_device *dev, const struct wlr_box *box) { struct wlr_input_device *dev, const struct wlr_box *box) {
cur->state->mapped_box = (struct wlr_box){0};
struct wlr_cursor_device *c_device = get_cursor_device(cur, dev); struct wlr_cursor_device *c_device = get_cursor_device(cur, dev);
if (!c_device) { if (!c_device) {
wlr_log(WLR_ERROR, "Cannot map device \"%s\" to geometry (not found in" wlr_log(WLR_ERROR, "Cannot map device \"%s\" to geometry (not found in"
@ -1201,13 +1191,5 @@ void wlr_cursor_map_input_to_region(struct wlr_cursor *cur,
return; return;
} }
if (box) { c_device->mapped_box = wlr_box_empty(box) ? (struct wlr_box){0} : *box;
if (wlr_box_empty(box)) {
wlr_log(WLR_ERROR,
"cannot map device \"%s\" input to an empty region",
dev->name);
return;
}
c_device->mapped_box = *box;
}
} }