emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* mu-str.[ch], mu-util.[ch]: better, simpler ANSI colors through some #defines

This commit is contained in:
Dirk-Jan C. Binnema 2011-05-26 23:32:23 +03:00
parent 4d183fc868
commit fe32cf84b1
4 changed files with 9 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mu-str.c
View File

@ -533,4 +533,3 @@ leave:
return nick;
}

1
src/mu-str.h
View File

@ -305,7 +305,6 @@ gchar* mu_str_guess_first_name (const char* name)
gchar* mu_str_guess_last_name (const char* name)
G_GNUC_WARN_UNUSED_RESULT;
G_END_DECLS
#endif /*__MU_STR_H__*/

37
src/mu-util.c
View File

@ -145,43 +145,6 @@ mu_util_cache_dir (void)
}
void
mu_util_color_print (MuColor col, const char *str)
{
const char *pfx;
const char *reset = "\x1b[0m";
static int is_tty = -1;
if (!str)
return;
if (is_tty == -1)
is_tty = isatty(fileno(stdout)) ? 1 : 0;
switch (col) {
case MU_COLOR_RED : pfx = "\x1b[31m"; break;
case MU_COLOR_GREEN : pfx = "\x1b[32m"; break;
case MU_COLOR_YELLOW : pfx = "\x1b[33m"; break;
case MU_COLOR_BLUE : pfx = "\x1b[34m"; break;
case MU_COLOR_MAGENTA : pfx = "\x1b[35m"; break;
case MU_COLOR_CYAN : pfx = "\x1b[36m"; break;
default:
g_critical ("invalid color %u", (unsigned)col);
return;
}
if (is_tty)
fputs (pfx, stdout);
fputs (str, stdout);
if (is_tty)
fputs (reset, stdout);
}
gboolean
mu_util_init_system (void)
{

29
src/mu-util.h
View File

@ -105,26 +105,6 @@ gboolean mu_util_check_dir (const gchar* path, gboolean readable,
const char* mu_util_cache_dir (void) G_GNUC_CONST;
enum _MuColor {
MU_COLOR_RED = 0,
MU_COLOR_GREEN,
MU_COLOR_YELLOW,
MU_COLOR_BLUE,
MU_COLOR_MAGENTA,
MU_COLOR_CYAN
};
typedef enum _MuColor MuColor;
/**
* print string to stdout in a certain color if the output is to a
* sufficiently capable tty; otherwise, just print the string. Color
* will *only* be printed if stdout actually is a tty.
*
* @param col a MuColor
* @param str a string, or NULL
*/
void mu_util_color_print (MuColor col, const char *str);
/**
* create a writeable file and return its file descriptor (which
@ -413,6 +393,15 @@ enum _MuError {
};
typedef enum _MuError MuError;
#define MU_COLOR_RED "\x1b[31m"
#define MU_COLOR_GREEN "\x1b[32m"
#define MU_COLOR_YELLOW "\x1b[33m"
#define MU_COLOR_BLUE "\x1b[34m"
#define MU_COLOR_MAGENTA "\x1b[35m"
#define MU_COLOR_CYAN "\x1b[36m"
#define MU_COLOR_DEFAULT "\x1b[0m"
G_END_DECLS
#endif /*__MU_UTIL_H__*/