mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chase wlroots: Use wlr_cursor_set_xcursor()

Browse source 
Chases: 18bafbfc57039e16d1dabd78b882b3d6477f76b5
xcursor-manager: drop wlr_xcursor_manager_set_cursor_image()
This commit is contained in:
John Lindgren 2023-07-17 02:01:02 -04:00 • committed by Johan Malm
parent 4d49c8250c
commit 9c5266ac76
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/input/cursor.c
View file

@ -252,8 +252,8 @@ cursor_set(struct seat *seat, enum lab_cursors cursor)
return;
}
wlr_xcursor_manager_set_cursor_image(
seat->xcursor_manager, cursor_names[cursor], seat->cursor);
wlr_cursor_set_xcursor(seat->cursor, seat->xcursor_manager,
cursor_names[cursor]);
seat->server_cursor = cursor;
}
@ -274,8 +274,15 @@ cursor_update_image(struct seat *seat)
}
return;
}
wlr_xcursor_manager_set_cursor_image(
seat->xcursor_manager, cursor_names[cursor], seat->cursor);
/*
* Call wlr_cursor_unset_image() first to force wlroots to
* update the cursor (e.g. for a new output). Otherwise,
* wlr_cursor_set_xcursor() may detect that we are setting the
* same cursor as before, and do nothing.
*/
wlr_cursor_unset_image(seat->cursor);
wlr_cursor_set_xcursor(seat->cursor, seat->xcursor_manager,
cursor_names[cursor]);
}
bool

2
subprojects/wlroots.wrap
View file

@ -1,6 +1,6 @@
[wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = 70c1a5724814d2f786f7d3a0e55a05f11af14029
revision = 18bafbfc57039e16d1dabd78b882b3d6477f76b5
[provide]
dependency_names = wlroots