aboutsummaryrefslogtreecommitdiff
path: root/xcursor/wlr_xcursor.c
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2023-04-14 16:13:33 +0200
committerAlexander Orzechowski <alex@ozal.ski>2023-04-18 14:54:25 +0000
commit25d9055281a744944fab3016afcb3460610fec89 (patch)
tree69490ad50a742116eba6364d9a76deef20b67ecc /xcursor/wlr_xcursor.c
parent00489b11a0d926058d23584e2ad0e2b64f5b7406 (diff)
xcursor: sync with libwayland
xcursor.c was copied over from libwayland-cursor. A lot of cosmetic imporvements have been merged upstream. Copy-paste the new version.
Diffstat (limited to 'xcursor/wlr_xcursor.c')
-rw-r--r--xcursor/wlr_xcursor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xcursor/wlr_xcursor.c b/xcursor/wlr_xcursor.c
index b2badcb7..597a0b13 100644
--- a/xcursor/wlr_xcursor.c
+++ b/xcursor/wlr_xcursor.c
@@ -117,7 +117,7 @@ static void load_default_theme(struct wlr_xcursor_theme *theme) {
}
static struct wlr_xcursor *xcursor_create_from_xcursor_images(
- XcursorImages *images, struct wlr_xcursor_theme *theme) {
+ struct xcursor_images *images, struct wlr_xcursor_theme *theme) {
struct wlr_xcursor *cursor = calloc(1, sizeof(*cursor));
if (!cursor) {
return NULL;
@@ -170,11 +170,11 @@ static struct wlr_xcursor *xcursor_create_from_xcursor_images(
return cursor;
}
-static void load_callback(XcursorImages *images, void *data) {
+static void load_callback(struct xcursor_images *images, void *data) {
struct wlr_xcursor_theme *theme = data;
if (wlr_xcursor_theme_get_cursor(theme, images->name)) {
- XcursorImagesDestroy(images);
+ xcursor_images_destroy(images);
return;
}
@@ -192,7 +192,7 @@ static void load_callback(XcursorImages *images, void *data) {
}
}
- XcursorImagesDestroy(images);
+ xcursor_images_destroy(images);
}
struct wlr_xcursor_theme *wlr_xcursor_theme_load(const char *name, int size) {