From d4e88b1d351d61151c99a399abd526d9b7dda12d Mon Sep 17 00:00:00 2001 From: Federico DI Pierro Date: Sat, 9 Mar 2024 17:16:29 +0100 Subject: [PATCH] chore(src): improved some strings. Signed-off-by: Federico DI Pierro --- TODO.md | 1 + src/modules/dpms.c | 4 ++-- src/modules/dpms_plugins/kwin_wl.c | 2 +- src/modules/gamma.c | 4 ++-- src/modules/gamma_plugins/wl.c | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/TODO.md b/TODO.md index 5395408..08eee8b 100644 --- a/TODO.md +++ b/TODO.md @@ -35,6 +35,7 @@ ### Generic - [ ] Drop is_smooth options for gamma - [ ] avoid returning boolean where it does not make sense +- [ ] Rename Wl to Wlr (wlroots) in interfaces ## Ideas - [ ] follow ddcci kernel driver and in case, drop ddcutil and add the kernel driver as clightd opt-dep diff --git a/src/modules/dpms.c b/src/modules/dpms.c index bc592e9..2dc9ecb 100644 --- a/src/modules/dpms.c +++ b/src/modules/dpms.c @@ -116,7 +116,7 @@ static int method_getdpms(sd_bus_message *m, void *userdata, sd_bus_error *ret_e if (dpms_state < 0) { switch (dpms_state) { case COMPOSITOR_NO_PROTOCOL: - sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support wayland protocol."); + sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support required wayland protocols."); break; case WRONG_PLUGIN: sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "No plugin available for your configuration."); @@ -171,7 +171,7 @@ static int method_setdpms(sd_bus_message *m, void *userdata, sd_bus_error *ret_e if (err) { switch (err) { case COMPOSITOR_NO_PROTOCOL: - sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support neither 'wlr-output-power-management-unstable-v1' nor 'org_kde_kwin_dpms' protocols."); + sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support required wayland protocols."); break; case WRONG_PLUGIN: sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "No plugin available for your configuration."); diff --git a/src/modules/dpms_plugins/kwin_wl.c b/src/modules/dpms_plugins/kwin_wl.c index 8df118b..4b982e9 100644 --- a/src/modules/dpms_plugins/kwin_wl.c +++ b/src/modules/dpms_plugins/kwin_wl.c @@ -85,7 +85,7 @@ static int wl_init(const char *display, const char *env) { wl_display_roundtrip(dpy); if (dpms_control_manager == NULL) { - fprintf(stderr, "compositor doesn't support org_kde_kwin_dpms\n"); + fprintf(stderr, "compositor doesn't support '%s'\n", org_kde_kwin_dpms_manager_interface.name); ret = COMPOSITOR_NO_PROTOCOL; goto err; } diff --git a/src/modules/gamma.c b/src/modules/gamma.c index f75ab09..6bca9de 100644 --- a/src/modules/gamma.c +++ b/src/modules/gamma.c @@ -332,7 +332,7 @@ static int method_setgamma(sd_bus_message *m, void *userdata, sd_bus_error *ret_ sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Temperature value should be between 1000 and 10000."); break; case COMPOSITOR_NO_PROTOCOL: - sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support wayland protocol."); + sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support required wayland protocols."); break; case WRONG_PLUGIN: sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "No plugin available for your configuration."); @@ -375,7 +375,7 @@ static int method_getgamma(sd_bus_message *m, void *userdata, sd_bus_error *ret_ if (error || temp == -1) { switch (error) { case COMPOSITOR_NO_PROTOCOL: - sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support 'wlr-gamma-control-unstable-v1' protocol."); + sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support required wayland protocols."); break; case WRONG_PLUGIN: sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "No plugin available for your configuration."); diff --git a/src/modules/gamma_plugins/wl.c b/src/modules/gamma_plugins/wl.c index 4525802..513cf1a 100644 --- a/src/modules/gamma_plugins/wl.c +++ b/src/modules/gamma_plugins/wl.c @@ -149,7 +149,7 @@ static int validate(const char **id, const char *env, void **priv_data) { wl_display_roundtrip(display); if (priv->gamma_control_manager == NULL) { - fprintf(stderr, "compositor doesn't support wlr-gamma-control-unstable-v1\n"); + fprintf(stderr, "compositor doesn't support '%s'\n", zwlr_gamma_control_manager_v1_interface.name); ret = COMPOSITOR_NO_PROTOCOL; goto err; }