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

backend/x11: clamp hotspot to texture bounds 

When a new texture is set, the hotspot may actually belong to the
previous texture and be out of bounds. Rather than incur X errors for
these, clamp the hotspot to be inside of the texture.

This fixes weston examples updating their cursors (e.g.
weston-eventdemo).
This commit is contained in:
Ilia Mirkin 2021-02-06 16:15:46 -05:00 committed by Simon Ser
parent 7dffe9339b
commit 10dbb00f5f
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/x11/output.c
View File

@ -477,6 +477,19 @@ static bool output_set_cursor(struct wlr_output *wlr_output,
if (texture != NULL) {
width = texture->width * wlr_output->scale / scale;
height = texture->height * wlr_output->scale / scale;
if (hotspot_x < 0) {
hotspot_x = 0;
}
if ((uint32_t)hotspot_x > texture->width) {
hotspot_x = texture->width;
}
if (hotspot_y < 0) {
hotspot_y = 0;
}
if ((uint32_t)hotspot_y > texture->height) {
hotspot_y = texture->height;
}
}
struct wlr_box hotspot = { .x = hotspot_x, .y = hotspot_y };