From 666498db015ad1439a8916bce609baf8fa042b5d Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 14 May 2020 17:45:42 +0200 Subject: [PATCH] Make wlr_xcursor_manager_load() return a bool This is currently inconsistent with the rest of the library and a bit of a footgun for new compositors. However, this breaks the API in a very unfortunate way for existing compositors. --- include/wlr/types/wlr_xcursor_manager.h | 2 +- types/wlr_xcursor_manager.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wlr/types/wlr_xcursor_manager.h b/include/wlr/types/wlr_xcursor_manager.h index 25c277c1..a9530214 100644 --- a/include/wlr/types/wlr_xcursor_manager.h +++ b/include/wlr/types/wlr_xcursor_manager.h @@ -46,7 +46,7 @@ void wlr_xcursor_manager_destroy(struct wlr_xcursor_manager *manager); /** * Ensures an xcursor theme at the given scale factor is loaded in the manager. */ -int wlr_xcursor_manager_load(struct wlr_xcursor_manager *manager, +bool wlr_xcursor_manager_load(struct wlr_xcursor_manager *manager, float scale); /** diff --git a/types/wlr_xcursor_manager.c b/types/wlr_xcursor_manager.c index 7333a7a1..3526285b 100644 --- a/types/wlr_xcursor_manager.c +++ b/types/wlr_xcursor_manager.c @@ -32,27 +32,27 @@ void wlr_xcursor_manager_destroy(struct wlr_xcursor_manager *manager) { free(manager); } -int wlr_xcursor_manager_load(struct wlr_xcursor_manager *manager, +bool wlr_xcursor_manager_load(struct wlr_xcursor_manager *manager, float scale) { struct wlr_xcursor_manager_theme *theme; wl_list_for_each(theme, &manager->scaled_themes, link) { if (theme->scale == scale) { - return 0; + return true; } } theme = calloc(1, sizeof(struct wlr_xcursor_manager_theme)); if (theme == NULL) { - return 1; + return false; } theme->scale = scale; theme->theme = wlr_xcursor_theme_load(manager->name, manager->size * scale); if (theme->theme == NULL) { free(theme); - return 1; + return false; } wl_list_insert(&manager->scaled_themes, &theme->link); - return 0; + return true; } struct wlr_xcursor *wlr_xcursor_manager_get_xcursor(