From d4287bc15173ea58a4e85b9bbafe6b7fe6797b85 Mon Sep 17 00:00:00 2001 From: Thomas Glanzmann Date: Sun, 21 Aug 2016 10:05:07 +0200 Subject: [PATCH 2/5] Make it possible to colorize the status bar Examples: color status blue white color status brightred white (New|Del|Post|Inc|Flag):[0-9]+ color status brightcyan white ^..(s) 1 color status brightred white ^..(S) 1 color status brightred white ^.(\\\*) 1 color status brightred white \\\((all|end|no\ mailbox)\\\) 1 color status brightred white \\\(([0-9]+%)\\\) 1 color status brightred white \\\[([A-Za-z0-9\ ]+)\\\] 1 color status brightred white \\\(([^)]+/[^)]+)\\\) 1 color status blue white \\\((threads/date-received)\\\) 1 --- color.c | 41 ++++++++++++++++----- curs_main.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- mutt_curses.h | 2 ++ pager.c | 4 +-- protos.h | 1 + 5 files changed, 150 insertions(+), 11 deletions(-) diff --git a/color.c b/color.c index c33d41e..369278e 100644 --- a/color.c +++ b/color.c @@ -34,6 +34,7 @@ int ColorQuoteUsed; int ColorDefs[MT_COLOR_MAX]; COLOR_LINE *ColorHdrList = NULL; COLOR_LINE *ColorBodyList = NULL; +COLOR_LINE *ColorStatusList = NULL; COLOR_LINE *ColorIndexList = NULL; /* local to this file */ @@ -506,7 +507,7 @@ static int _mutt_parse_uncolor (BUFFER *buf, BUFFER *s, unsigned long data, static int add_pattern (COLOR_LINE **top, const char *s, int sensitive, int fg, int bg, int attr, BUFFER *err, - int is_index) + int is_index, int match) { /* is_index used to store compiled pattern @@ -577,6 +578,7 @@ add_pattern (COLOR_LINE **top, const char *s, int sensitive, } tmp->next = *top; tmp->pattern = safe_strdup (s); + tmp->match = match; #ifdef HAVE_COLOR if(fg != -1 && bg != -1) { @@ -719,7 +721,7 @@ _mutt_parse_color (BUFFER *buf, BUFFER *s, BUFFER *err, parser_callback_t callback, short dry_run) { int object = 0, attr = 0, fg = 0, bg = 0, q_level = 0; - int r = 0; + int r = 0, match = 0; if(parse_object(buf, s, &object, &q_level, err) == -1) return -1; @@ -727,8 +729,6 @@ _mutt_parse_color (BUFFER *buf, BUFFER *s, BUFFER *err, if(callback(buf, s, &fg, &bg, &attr, err) == -1) return -1; - /* extract a regular expression if needed */ - if (object == MT_COLOR_HEADER || object == MT_COLOR_BODY || object == MT_COLOR_INDEX) { if (!MoreArgs (s)) @@ -740,7 +740,7 @@ _mutt_parse_color (BUFFER *buf, BUFFER *s, BUFFER *err, mutt_extract_token (buf, s, 0); } - if (MoreArgs (s)) + if (MoreArgs (s) && object != MT_COLOR_STATUS) { strfcpy (err->data, _("too many arguments"), err->dsize); return (-1); @@ -765,12 +765,37 @@ _mutt_parse_color (BUFFER *buf, BUFFER *s, BUFFER *err, #endif if (object == MT_COLOR_HEADER) - r = add_pattern (&ColorHdrList, buf->data, 0, fg, bg, attr, err,0); + r = add_pattern (&ColorHdrList, buf->data, 0, fg, bg, attr, err, 0, match); else if (object == MT_COLOR_BODY) - r = add_pattern (&ColorBodyList, buf->data, 1, fg, bg, attr, err, 0); + r = add_pattern (&ColorBodyList, buf->data, 1, fg, bg, attr, err, 0, match); + else if (object == MT_COLOR_STATUS && MoreArgs(s)) + { + /* 'color status fg bg' can have upto 2 arguments: + * 0 arguments: sets the default status color (handled below by else part) + * 1 argument : colorize pattern on match + * 2 arguments: colorize nth submatch of pattern + */ + mutt_extract_token (buf, s, 0); + + if (MoreArgs(s)) { + BUFFER temporary; + memset(&temporary, 0, sizeof(BUFFER)); + mutt_extract_token(&temporary, s, 0); + match = atoi(temporary.data); + FREE(&temporary.data); + } + + if (MoreArgs(s)) + { + strfcpy (err->data, _("too many arguments"), err->dsize); + return (-1); + } + + r = add_pattern (&ColorStatusList, buf->data, 1, fg, bg, attr, err, 0, match); + } else if (object == MT_COLOR_INDEX) { - r = add_pattern (&ColorIndexList, buf->data, 1, fg, bg, attr, err, 1); + r = add_pattern (&ColorIndexList, buf->data, 1, fg, bg, attr, err, 1, match); set_option (OPTFORCEREDRAWINDEX); } else if (object == MT_COLOR_QUOTED) diff --git a/curs_main.c b/curs_main.c index 8e0f52a..0613268 100644 --- a/curs_main.c +++ b/curs_main.c @@ -482,6 +482,117 @@ static void resort_index (MUTTMENU *menu) menu->redraw = REDRAW_INDEX | REDRAW_STATUS; } +void +mutt_draw_statusline(int cols, char *inbuf) +{ + int i = 0; + int cnt = 0; + int last_color = 0; + int color = 0; + int offset = 0; + int found = 0; + int null_rx = 0; + char buf[2048]; + + struct line_t { + short chunks; + struct syntax_t { + int color; + int first; + int last; + } *syntax; + } lineInfo = { 0, 0 }; + + mutt_format_string(buf, sizeof(buf), cols, cols, 0, ' ', inbuf, + mutt_strlen(inbuf), 0); + + lineInfo.syntax = safe_malloc(sizeof(struct syntax_t)); + lineInfo.syntax[0].first = -1; + lineInfo.syntax[0].last = -1; + lineInfo.syntax[0].color = ColorDefs[MT_COLOR_STATUS]; + lineInfo.chunks = 1; + + do + { + found = 0; + null_rx = 0; + COLOR_LINE *color_line = ColorStatusList; + + if (!buf[offset]) + break; + + while (color_line) + { + regmatch_t pmatch[color_line->match + 1]; + + if (regexec (&color_line->rx, buf + offset, color_line->match + 1, pmatch, + (offset ? REG_NOTBOL : 0)) == 0) + { + if (pmatch[color_line->match].rm_eo != pmatch[color_line->match].rm_so) + { + if (!found) + { + if (++(lineInfo.chunks) > 1) + safe_realloc (&(lineInfo.syntax), + (lineInfo.chunks) * sizeof (struct syntax_t)); + } + i = lineInfo.chunks - 1; + pmatch[color_line->match].rm_so += offset; + pmatch[color_line->match].rm_eo += offset; + if (!found || + pmatch[color_line->match].rm_so < (lineInfo.syntax)[i].first || + (pmatch[color_line->match].rm_so == (lineInfo.syntax)[i].first && + pmatch[color_line->match].rm_eo > (lineInfo.syntax)[i].last)) + { + (lineInfo.syntax)[i].color = color_line->pair; + (lineInfo.syntax)[i].first = pmatch[color_line->match].rm_so; + (lineInfo.syntax)[i].last = pmatch[color_line->match].rm_eo; + } + found = 1; + null_rx = 0; + } + else + null_rx = 1; /* empty regexp; don't add it, but keep looking */ + } + color_line = color_line->next; + } + + if (null_rx) + offset++; /* avoid degenerate cases */ + else + offset = (lineInfo.syntax)[i].last; + } while (found || null_rx); + + for (cnt = 0; cnt < mutt_strlen(buf); cnt++) { + color = lineInfo.syntax[0].color; + for (i = 0; i < lineInfo.chunks; i++) { + /* we assume the chunks are sorted */ + if (cnt > (lineInfo.syntax)[i].last) + continue; + if (cnt < (lineInfo.syntax)[i].first) + break; + if (cnt != (lineInfo.syntax)[i].last) { + color = (lineInfo.syntax)[i].color; + break; + } + /* don't break here, as cnt might be + * in the next chunk as well */ + } + if (color != last_color) { + attrset (color); + last_color = color; + } + addch (buf[cnt]); /* XXX more than one char at a time? */ +#if 0 + waddnstr(stdscr, tgbuf, 10); + SETCOLOR (MT_COLOR_NORMAL); + waddnstr(stdscr, tgbuf + 10, -1); +#endif + } + + safe_free(&lineInfo.syntax); +} + static const struct mapping_t IndexHelp[] = { { N_("Quit"), OP_QUIT }, { N_("Del"), OP_DELETE }, @@ -647,7 +758,7 @@ int mutt_index_menu (void) menu_status_line (buf, sizeof (buf), menu, NONULL (Status)); mutt_window_move (MuttStatusWindow, 0, 0); SETCOLOR (MT_COLOR_STATUS); - mutt_paddstr (MuttStatusWindow->cols, buf); + mutt_draw_statusline (MuttStatusWindow->cols, buf); NORMAL_COLOR; menu->redraw &= ~REDRAW_STATUS; if (option(OPTTSENABLED) && TSSupported) diff --git a/mutt_curses.h b/mutt_curses.h index 6200449..ba8aa52 100644 --- a/mutt_curses.h +++ b/mutt_curses.h @@ -137,6 +137,7 @@ enum typedef struct color_line { regex_t rx; + int match; /* which substringmap 0 for old behaviour */ char *pattern; pattern_t *color_pattern; /* compiled pattern to speed up index color calculation */ @@ -212,6 +213,7 @@ extern int ColorQuoteUsed; extern int ColorDefs[]; extern COLOR_LINE *ColorHdrList; extern COLOR_LINE *ColorBodyList; +extern COLOR_LINE *ColorStatusList; extern COLOR_LINE *ColorIndexList; void ci_init_color (void); diff --git a/pager.c b/pager.c index d7674eb..525f81c 100644 --- a/pager.c +++ b/pager.c @@ -1860,13 +1860,13 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra) size_t l2 = sizeof (buffer); hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr; mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, pager_status_window->cols, NONULL (PagerFmt), &hfi, MUTT_FORMAT_MAKEPRINT); - mutt_paddstr (pager_status_window->cols, buffer); + mutt_draw_statusline (pager_status_window->cols, buffer); } else { char bn[STRING]; snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str); - mutt_paddstr (pager_status_window->cols, bn); + mutt_draw_statusline (pager_status_window->cols, bn); } NORMAL_COLOR; if (option(OPTTSENABLED) && TSSupported) diff --git a/protos.h b/protos.h index 19d6400..c543b04 100644 --- a/protos.h +++ b/protos.h @@ -182,6 +182,7 @@ void mutt_decode_base64 (STATE *s, long len, int istext, iconv_t cd); void mutt_default_save (char *, size_t, HEADER *); void mutt_display_address (ENVELOPE *); void mutt_display_sanitize (char *); +void mutt_draw_statusline(int n, char *); void mutt_edit_content_type (HEADER *, BODY *, FILE *); void mutt_edit_file (const char *, const char *); void mutt_edit_headers (const char *, const char *, HEADER *, char *, size_t); -- 2.1.4