netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH iproute2-next v2] color: default to dark color theme
@ 2025-03-10 20:36 Matteo Croce
  2025-03-10 21:12 ` Stephen Hemminger
  0 siblings, 1 reply; 8+ messages in thread
From: Matteo Croce @ 2025-03-10 20:36 UTC (permalink / raw)
  To: netdev; +Cc: Stephen Hemminger, Phil Sutter, Matteo Croce

From: Matteo Croce <teknoraver@meta.com>

The majority of Linux terminals are using a dark background.
iproute2 tries to detect the color theme via the `COLORFGBG` environment
variable, and defaults to light background if not set.

Change the default behaviour to dark background, and while at it change
the current logic which assumes that the color code is a single digit.

Signed-off-by: Matteo Croce <teknoraver@meta.com>
---
 lib/color.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/color.c b/lib/color.c
index cd0f9f75..b883aa1c 100644
--- a/lib/color.c
+++ b/lib/color.c
@@ -72,7 +72,7 @@ static enum color attr_colors_dark[] = {
 	C_CLEAR
 };
 
-static int is_dark_bg;
+static int is_light_bg;
 static int color_is_enabled;
 
 static void enable_color(void)
@@ -128,10 +128,12 @@ static void set_color_palette(void)
 	 * values separated by semicolons; we want the last value in either case.
 	 * If this value is 0-6 or 8, background is dark.
 	 */
-	if (p && (p = strrchr(p, ';')) != NULL
-		&& ((p[1] >= '0' && p[1] <= '6') || p[1] == '8')
-		&& p[2] == '\0')
-		is_dark_bg = 1;
+	if (p && (p = strrchr(p, ';')) != NULL) {
+		int bg = atoi(p + 1);
+
+		if (bg == 7 || (bg >= 9 && bg <= 15))
+			is_light_bg = 1;
+	}
 }
 
 __attribute__((format(printf, 3, 4)))
@@ -150,8 +152,8 @@ int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...)
 		goto end;
 	}
 
-	ret += fprintf(fp, "%s", color_codes[is_dark_bg ?
-		attr_colors_dark[attr] : attr_colors_light[attr]]);
+	ret += fprintf(fp, "%s", color_codes[is_light_bg ?
+		attr_colors_light[attr] : attr_colors_dark[attr]]);
 
 	ret += vfprintf(fp, fmt, args);
 	ret += fprintf(fp, "%s", color_codes[C_CLEAR]);
-- 
2.48.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2025-03-14 17:37 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-10 20:36 [PATCH iproute2-next v2] color: default to dark color theme Matteo Croce
2025-03-10 21:12 ` Stephen Hemminger
2025-03-13 11:28   ` Phil Sutter
2025-03-13 11:41     ` Matteo Croce
2025-03-13 12:05       ` Phil Sutter
2025-03-13 16:30         ` Stephen Hemminger
2025-03-14 17:12           ` Phil Sutter
2025-03-14 17:37             ` Phil Sutter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).