From b75bd6507a970520784791a6ff6beb1cf771077b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Thu, 20 May 2021 17:51:04 +0200 Subject: [PATCH] notifications: use \e[22m to disable bold MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit \e[21m was previously used to disable bold. That changed a while ago, to align foot with the majority of other terminal emulators. \e[22m now disables both bold and dim. When this change was done, the user notifications were not updated, meaning the ‘message’ part was always in bold. This was never the intended behavior. --- config.c | 11 +++++++---- slave.c | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/config.c b/config.c index 0f8f5aec..7159d299 100644 --- a/config.c +++ b/config.c @@ -633,14 +633,17 @@ parse_section_main(const char *key, const char *value, struct config *conf, } else if (strcmp(key, "bell") == 0) { - LOG_WARN("deprecated: %s:%d: [default]: bell: set actions in section '[bell]' instead", path, lineno); + LOG_WARN( + "deprecated: %s:%d: [default]: bell: " + "set actions in section '[bell]' instead", path, lineno); - const char fmt[] = "%s:%d \033[1mbell\033[21m, use section \033[1m[bell]\033[21m instead"; - char *text = xasprintf(fmt, path, lineno); + const char fmt[] = + "%s:%d: \033[1mbell\033[22m, use \033[1murgent\033[22m in " + "the \033[1m[bell]\033[22m section instead"; struct user_notification deprecation = { .kind = USER_NOTIFICATION_DEPRECATED, - .text = text, + .text = xasprintf(fmt, path, lineno), }; tll_push_back(conf->notifications, deprecation); diff --git a/slave.c b/slave.c index 0740d6ae..6a431d02 100644 --- a/slave.c +++ b/slave.c @@ -79,15 +79,15 @@ emit_one_notification(int fd, const struct user_notification *notif) switch (notif->kind) { case USER_NOTIFICATION_DEPRECATED: - prefix = "\033[33;1mdeprecated\033[39;21m: "; + prefix = "\033[33;1mdeprecated\033[39;22m: "; break; case USER_NOTIFICATION_WARNING: - prefix = "\033[33;1mwarning\033[39;21m: "; + prefix = "\033[33;1mwarning\033[39;22m: "; break; case USER_NOTIFICATION_ERROR: - prefix = "\033[31;1merror\033[39;21m: "; + prefix = "\033[31;1merror\033[39;22m: "; break; }