system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-01 07:34:28 +00:00
Code Issues Projects Releases Wiki Activity

terminal-util: merge COLOR_ON with COLOR_24BIT

Browse Source 
Currently, we assume that there is no restriction on coloring when
COLOR_24BIT. Let's merge the two values.

Follow-up for a5efbf468c.
This commit is contained in:
Yu Watanabe 2024-06-24 04:12:45 +09:00
parent 6eabe9f2ff
commit 5f0b72e53b
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/basic/terminal-util.c
View File

@ -1328,15 +1328,15 @@ static ColorMode parse_systemd_colors(void) {
return COLOR_256;
r = parse_boolean(e);
if (r >= 0)
return r > 0 ? COLOR_ON : COLOR_OFF;
return r > 0 ? COLOR_24BIT : COLOR_OFF;
return _COLOR_INVALID;
}
ColorMode get_color_mode(void) {
/* Returns the mode used to choose output colors. The possible modes are COLOR_OFF for no colors,
* COLOR_16 for only the base 16 ANSI colors, COLOR_256 for more colors and COLOR_ON for unrestricted
* color output. For that we check $SYSTEMD_COLORS first (which is the explicit way to
* COLOR_16 for only the base 16 ANSI colors, COLOR_256 for more colors, and COLOR_24BIT for
* unrestricted color output. For that we check $SYSTEMD_COLORS first (which is the explicit way to
* change the mode). If that didn't work we turn colors off unless we are on a TTY. And if we are on a TTY
* we turn it off if $TERM is set to "dumb". There's one special tweak though: if we are PID 1 then we do not
* check whether we are connected to a TTY, because we don't keep /dev/console open continuously due to fear

5
src/basic/terminal-util.h
View File

@ -122,16 +122,13 @@ typedef enum ColorMode {
/* No colors, monochrome output. */
COLOR_OFF,
/* All colors, no restrictions. */
COLOR_ON,
/* Only the base 16 colors. */
COLOR_16,
/* Only 256 colors. */
COLOR_256,
/* For truecolor or 24bit color support. */
/* For truecolor or 24bit color support, no restrictions. */
COLOR_24BIT,
_COLOR_INVALID = -EINVAL,