p/xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 10 Wiki Activity

degesch: formatter: simplifications

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2015-05-10 23:06:19 +02:00
parent 6deb471423
commit 502bb26f29
1 changed files with 75 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
degesch.c
View File

@ -1473,6 +1473,10 @@ serialize_configuration (struct app_context *ctx, struct str *output)
/// Bright versions of the basic color set /// Bright versions of the basic color set
#define COLOR_BRIGHT(x) (COLOR_ ## x + 8) #define COLOR_BRIGHT(x) (COLOR_ ## x + 8)
/// Builds a color pair for 256-color terminals with a 16-color backup value
#define COLOR_256(name, c256) \
(COLOR_ ## name) & 0xFFFF | ((c256 << 16) & 0xFFFF)
static struct static struct
{ {
bool initialized; ///< Terminal is available bool initialized; ///< Terminal is available
@ -1559,6 +1563,10 @@ free_terminal (void)
del_curterm (cur_term); del_curterm (cur_term);
} }
// NOTE: commonly terminals have 8 colors (worst), 16 colors (allows brightness
// without the bold/blink attributes), 88 colors (the same plus a 4^3 RGB cube
// and a few shades of gray), or 256 colors (best)
static int static int
index_to_terminal_palette (int color) index_to_terminal_palette (int color)
{ {
@ -1706,6 +1714,21 @@ init_colors (struct app_context *ctx)
g_log_message_real = log_message_attributed; g_log_message_real = log_message_attributed;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// A little tool that tries to make the most of the terminal's capabilities
// to set up text attributes. It mostly targets just terminal emulators as that
// is what people are using these days. At least no stupid ncurses limits us
// with color pairs.
enum
{
ATTRIBUTE_BOLD = 1 << 0,
ATTRIBUTE_ITALIC = 1 << 1,
ATTRIBUTE_UNDERLINE = 1 << 2,
ATTRIBUTE_INVERSE = 1 << 3
};
// --- Output formatter -------------------------------------------------------- // --- Output formatter --------------------------------------------------------
// This complicated piece of code makes attributed text formatting simple. // This complicated piece of code makes attributed text formatting simple.
@ -1728,13 +1751,7 @@ enum formatter_item_type
FORMATTER_ITEM_ATTR, ///< Formatting attributes FORMATTER_ITEM_ATTR, ///< Formatting attributes
FORMATTER_ITEM_FG_COLOR, ///< Foreground color FORMATTER_ITEM_FG_COLOR, ///< Foreground color
FORMATTER_ITEM_BG_COLOR, ///< Background color FORMATTER_ITEM_BG_COLOR, ///< Background color
FORMATTER_ITEM_SIMPLE ///< For mIRC formatting only so far
// These are internal, for mIRC formatting only so far:
FORMATTER_ITEM_BOLD, ///< Bold
FORMATTER_ITEM_ITALIC, ///< Italic
FORMATTER_ITEM_UNDERLINE, ///< Underline
FORMATTER_ITEM_INVERSE ///< Inverse
}; };
struct formatter_item struct formatter_item
@ -1786,65 +1803,28 @@ formatter_free (struct formatter *self)
formatter_item_destroy (iter); formatter_item_destroy (iter);
} }
static struct formatter_item * static void
formatter_add_blank (struct formatter *self) formatter_add_item (struct formatter *self, struct formatter_item template_)
{ {
if (template_.type != FORMATTER_ITEM_TEXT && self->ignore_new_attributes)
return;
if (template_.text)
template_.text = xstrdup (template_.text);
struct formatter_item *item = formatter_item_new (); struct formatter_item *item = formatter_item_new ();
*item = template_;
LIST_APPEND_WITH_TAIL (self->items, self->items_tail, item); LIST_APPEND_WITH_TAIL (self->items, self->items_tail, item);
return item;
} }
static void #define FORMATTER_ADD_ITEM(self, type_, ...) formatter_add_item ((self), \
formatter_add_text (struct formatter *self, const char *text) (struct formatter_item) { .type = FORMATTER_ITEM_ ## type_, __VA_ARGS__ })
{
struct formatter_item *item = formatter_add_blank (self);
item->type = FORMATTER_ITEM_TEXT;
item->text = xstrdup (text);
}
static void #define FORMATTER_ADD_RESET(self) \
formatter_add_reset (struct formatter *self) FORMATTER_ADD_ITEM ((self), ATTR, .attribute = ATTR_RESET)
{ #define FORMATTER_ADD_TEXT(self, text_) \
if (self->ignore_new_attributes) FORMATTER_ADD_ITEM ((self), TEXT, .text = (text_))
return; #define FORMATTER_ADD_SIMPLE(self, attribute_) \
FORMATTER_ADD_ITEM ((self), SIMPLE, .attribute = ATTRIBUTE_ ## attribute_)
struct formatter_item *item = formatter_add_blank (self);
item->type = FORMATTER_ITEM_ATTR;
item->attribute = ATTR_RESET;
}
static void
formatter_add_attr (struct formatter *self, int attr_id)
{
if (self->ignore_new_attributes)
return;
struct formatter_item *item = formatter_add_blank (self);
item->type = FORMATTER_ITEM_ATTR;
item->attribute = attr_id;
}
static void
formatter_add_fg_color (struct formatter *self, int color)
{
if (self->ignore_new_attributes)
return;
struct formatter_item *item = formatter_add_blank (self);
item->type = FORMATTER_ITEM_FG_COLOR;
item->color = color;
}
static void
formatter_add_bg_color (struct formatter *self, int color)
{
if (self->ignore_new_attributes)
return;
struct formatter_item *item = formatter_add_blank (self);
item->type = FORMATTER_ITEM_BG_COLOR;
item->color = color;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -1859,41 +1839,26 @@ enum
// We use estimates from the 16 color terminal palette, or the 256 color cube, // We use estimates from the 16 color terminal palette, or the 256 color cube,
// which is not always available. The mIRC orange colour is only in the cube. // which is not always available. The mIRC orange colour is only in the cube.
// NOTE: commonly terminals have 8 colors (worst), 16 colors (allows brightness static const int g_mirc_to_terminal[] =
// without the bold/blink attributes), 88 colors (the same plus a 4^3 RGB cube
// and a few shades of gray), or 256 colors (best)
/// Builds a color pair for 256-color terminals with a 16-color backup value
#define FORMATTER_COLOR(name, c256) \
(COLOR_ ## name) & 0xFFFF | ((c256 << 16) & 0xFFFF)
static const int g_mirc_to_term[] =
{ {
[MIRC_WHITE] = FORMATTER_COLOR (BRIGHT (WHITE), 231), [MIRC_WHITE] = COLOR_256 (BRIGHT (WHITE), 231),
[MIRC_BLACK] = FORMATTER_COLOR (BLACK, 16), [MIRC_BLACK] = COLOR_256 (BLACK, 16),
[MIRC_BLUE] = FORMATTER_COLOR (BLUE, 19), [MIRC_BLUE] = COLOR_256 (BLUE, 19),
[MIRC_GREEN] = FORMATTER_COLOR (GREEN, 34), [MIRC_GREEN] = COLOR_256 (GREEN, 34),
[MIRC_L_RED] = FORMATTER_COLOR (BRIGHT (RED), 196), [MIRC_L_RED] = COLOR_256 (BRIGHT (RED), 196),
[MIRC_RED] = FORMATTER_COLOR (RED, 124), [MIRC_RED] = COLOR_256 (RED, 124),
[MIRC_PURPLE] = FORMATTER_COLOR (MAGENTA, 127), [MIRC_PURPLE] = COLOR_256 (MAGENTA, 127),
[MIRC_ORANGE] = FORMATTER_COLOR (BRIGHT (YELLOW), 214), [MIRC_ORANGE] = COLOR_256 (BRIGHT (YELLOW), 214),
[MIRC_YELLOW] = FORMATTER_COLOR (BRIGHT (YELLOW), 226), [MIRC_YELLOW] = COLOR_256 (BRIGHT (YELLOW), 226),
[MIRC_L_GREEN] = FORMATTER_COLOR (BRIGHT (GREEN), 46), [MIRC_L_GREEN] = COLOR_256 (BRIGHT (GREEN), 46),
[MIRC_CYAN] = FORMATTER_COLOR (CYAN, 37), [MIRC_CYAN] = COLOR_256 (CYAN, 37),
[MIRC_L_CYAN] = FORMATTER_COLOR (BRIGHT (CYAN), 51), [MIRC_L_CYAN] = COLOR_256 (BRIGHT (CYAN), 51),
[MIRC_L_BLUE] = FORMATTER_COLOR (BRIGHT (BLUE), 21), [MIRC_L_BLUE] = COLOR_256 (BRIGHT (BLUE), 21),
[MIRC_L_PURPLE] = FORMATTER_COLOR (BRIGHT (MAGENTA),201), [MIRC_L_PURPLE] = COLOR_256 (BRIGHT (MAGENTA),201),
[MIRC_GRAY] = FORMATTER_COLOR (BRIGHT (BLACK), 244), [MIRC_GRAY] = COLOR_256 (BRIGHT (BLACK), 244),
[MIRC_L_GRAY] = FORMATTER_COLOR (WHITE, 252), [MIRC_L_GRAY] = COLOR_256 (WHITE, 252),
}; };
static void
formatter_add_simple (struct formatter *self, enum formatter_item_type type)
{
if (!self->ignore_new_attributes)
formatter_add_blank (self)->type = type;
}
static const char * static const char *
formatter_parse_mirc_color (struct formatter *self, const char *s) formatter_parse_mirc_color (struct formatter *self, const char *s)
{ {
@ -1904,7 +1869,7 @@ formatter_parse_mirc_color (struct formatter *self, const char *s)
if (isdigit_ascii (*s)) if (isdigit_ascii (*s))
fg = fg * 10 + (*s++ - '0'); fg = fg * 10 + (*s++ - '0');
if (fg >= 0 && fg < 16) if (fg >= 0 && fg < 16)
formatter_add_fg_color (self, g_mirc_to_term[fg]); FORMATTER_ADD_ITEM (self, FG_COLOR, .color = g_mirc_to_terminal[fg]);
if (*s != ',' || !isdigit_ascii (s[1])) if (*s != ',' || !isdigit_ascii (s[1]))
return s; return s;
@ -1913,7 +1878,7 @@ formatter_parse_mirc_color (struct formatter *self, const char *s)
if (isdigit_ascii (s[1])) if (isdigit_ascii (s[1]))
bg = bg * 10 + (*++s - '0'); bg = bg * 10 + (*++s - '0');
if (bg >= 0 && bg < 16) if (bg >= 0 && bg < 16)
formatter_add_bg_color (self, g_mirc_to_term[bg]); FORMATTER_ADD_ITEM (self, BG_COLOR, .color = g_mirc_to_terminal[bg]);
return s; return s;
} }
@ -1924,33 +1889,29 @@ formatter_parse_mirc (struct formatter *self, const char *s)
struct str buf; struct str buf;
str_init (&buf); str_init (&buf);
formatter_add_reset (self); FORMATTER_ADD_RESET (self);
char c; char c;
while ((c = *s++)) while ((c = *s++))
{ {
if (buf.len && c < 0x20) if (buf.len && c < 0x20)
{ {
formatter_add_text (self, buf.str); FORMATTER_ADD_TEXT (self, buf.str);
str_reset (&buf); str_reset (&buf);
} }
#define SIMPLE(type) formatter_add_simple (self, FORMATTER_ITEM_ ## type)
switch (c) switch (c)
{ {
case '\x02': SIMPLE (BOLD); break; case '\x02': FORMATTER_ADD_SIMPLE (self, BOLD); break;
case '\x1d': SIMPLE (ITALIC); break; case '\x1d': FORMATTER_ADD_SIMPLE (self, ITALIC); break;
case '\x1f': SIMPLE (UNDERLINE); break; case '\x1f': FORMATTER_ADD_SIMPLE (self, UNDERLINE); break;
case '\x16': SIMPLE (INVERSE); break; case '\x16': FORMATTER_ADD_SIMPLE (self, INVERSE); break;
#undef SIMPLE
case '\x03': case '\x03':
s = formatter_parse_mirc_color (self, s); s = formatter_parse_mirc_color (self, s);
break; break;
case '\x0f': case '\x0f':
formatter_add_reset (self); FORMATTER_ADD_RESET (self);
break; break;
default: default:
str_append_c (&buf, c); str_append_c (&buf, c);
@ -1958,10 +1919,10 @@ formatter_parse_mirc (struct formatter *self, const char *s)
} }
if (buf.len) if (buf.len)
formatter_add_text (self, buf.str); FORMATTER_ADD_TEXT (self, buf.str);
str_free (&buf); str_free (&buf);
formatter_add_reset (self); FORMATTER_ADD_RESET (self);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -1994,22 +1955,21 @@ restart:
str_append (buf, s); str_append (buf, s);
free (s); free (s);
break; break;
case 'm': case 'm':
formatter_parse_mirc (self, va_arg (*ap, char *)); formatter_parse_mirc (self, va_arg (*ap, char *));
break; break;
case 'a': case 'a':
formatter_add_attr (self, va_arg (*ap, int)); FORMATTER_ADD_ITEM (self, ATTR, .attribute = va_arg (*ap, int));
break; break;
case 'c': case 'c':
formatter_add_fg_color (self, va_arg (*ap, int)); FORMATTER_ADD_ITEM (self, FG_COLOR, .color = va_arg (*ap, int));
break; break;
case 'C': case 'C':
formatter_add_bg_color (self, va_arg (*ap, int)); FORMATTER_ADD_ITEM (self, BG_COLOR, .color = va_arg (*ap, int));
break; break;
case 'r': case 'r':
formatter_add_reset (self); FORMATTER_ADD_RESET (self);
break; break;
default: default:
@ -2044,7 +2004,7 @@ formatter_add (struct formatter *self, const char *format, ...)
} }
if (buf.len) if (buf.len)
{ {
formatter_add_text (self, buf.str); FORMATTER_ADD_TEXT (self, buf.str);
str_reset (&buf); str_reset (&buf);
} }
@ -2052,7 +2012,7 @@ formatter_add (struct formatter *self, const char *format, ...)
} }
if (buf.len) if (buf.len)
formatter_add_text (self, buf.str); FORMATTER_ADD_TEXT (self, buf.str);
str_free (&buf); str_free (&buf);
va_end (ap); va_end (ap);