ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib/colors: add function to return color from scheme 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-08-13 10:09:08 +02:00
parent 413b91d190
commit b8731ebcf2
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/colors.h
View File

@ -65,7 +65,9 @@ extern void colors_on(void);
/* Set the color */
extern void color_fenable(const char *seq, FILE *f);
extern void color_scheme_fenable(const char *name, const char *dflt, FILE *f);
extern const char *color_scheme_get_sequence(const char *name, const char *dflt);
static inline void color_enable(const char *seq)
{

33
lib/colors.c
View File

@ -65,6 +65,9 @@ struct ul_color_ctl {
int scores[__UL_COLORFILE_COUNT]; /* the best match */
};
/*
* Control struct, globally shared.
*/
static struct ul_color_ctl ul_colors;
static void colors_free_schemes(struct ul_color_ctl *cc);
@ -597,12 +600,15 @@ done:
return rc;
}
/*
/**
* colors_init:
* @mode: UL_COLORMODE_*
* @name: util argv[0]
*
* Initialize private color control struct and initialize the colors
* status. The color schemes are parsed on demand by colors_get_scheme().
*
* @mode: UL_COLORMODE_*
* @name: util argv[0]
* Returns: >0 on success.
*/
int colors_init(int mode, const char *name)
{
@ -676,19 +682,32 @@ void color_fenable(const char *seq, FILE *f)
}
/*
* Enable color by logical @name
* Returns escape sequence by logical @name, if undefined then returns @dflt.
*/
void color_scheme_fenable(const char *name, const char *dflt, FILE *f)
const char *color_scheme_get_sequence(const char *name, const char *dflt)
{
struct ul_color_scheme *cs;
if (ul_colors.disabled || !ul_colors.has_colors)
return;
return NULL;
cs = colors_get_scheme(&ul_colors, name);
color_fenable(cs && cs->seq ? cs->seq : dflt, f);
return cs && cs->seq ? cs->seq : dflt;
}
/*
* Enable color by logical @name, if undefined enable @dflt.
*/
void color_scheme_fenable(const char *name, const char *dflt, FILE *f)
{
const char *seq = color_scheme_get_sequence(name, dflt);
if (!seq)
return;
color_fenable(seq, f);
}
/*
* Disable previously enabled color
*/