--- a/PATCHES
+++ a/PATCHES
@@ -0,0 +1, @@
+patch-1.5.20hg.pdmef.progress.vl.2
--- a/color.c
+++ a/color.c
@@ -96,6 +96,7 @@ static const struct mapping_t Fields[] =
{ "sidebar_new", MT_COLOR_NEW },
{ "sidebar_flagged", MT_COLOR_FLAGGED },
{ "sidebar", MT_COLOR_SIDEBAR },
+ { "progress", MT_COLOR_PROGRESS },
{ NULL, 0 }
};
--- a/curs_lib.c
+++ a/curs_lib.c
@@ -390,6 +390,52 @@ void mutt_progress_init (progress_t* progress, const char *msg,
mutt_progress_update (progress, 0, 0);
}
+static void message_bar (int percent, const char *fmt, ...)
+{
+ va_list ap;
+ char buf[STRING], buf2[STRING];
+ int w = percent * COLS / 100;
+ size_t l;
+
+ va_start (ap, fmt);
+ vsnprintf (buf, sizeof (buf), fmt, ap);
+ l = mutt_strwidth (buf);
+ va_end (ap);
+
+ mutt_format_string(buf2, sizeof (buf2),
+ 0, COLS-2, FMT_LEFT, 0, buf, sizeof (buf), 0);
+
+ move (LINES - 1, 0);
+
+ if (l < w)
+ {
+ SETCOLOR(MT_COLOR_PROGRESS);
+ addstr (buf2);
+ w -= l;
+ while (w--)
+ addch(' ');
+ SETCOLOR(MT_COLOR_NORMAL);
+ clrtoeol ();
+ mutt_refresh();
+ }
+ else
+ {
+ size_t bw;
+ char ch;
+ int off = mutt_wstr_trunc (buf2, sizeof (buf2), w, &bw);
+
+ ch = buf2[off];
+ buf2[off] = 0;
+ SETCOLOR(MT_COLOR_PROGRESS);
+ addstr (buf2);
+ buf2[off] = ch;
+ SETCOLOR(MT_COLOR_NORMAL);
+ addstr (&buf2[off]);
+ clrtoeol ();
+ mutt_refresh();
+ }
+}
+
void mutt_progress_update (progress_t* progress, long pos, int percent)
{
char posstr[SHORT_STRING];
@@ -440,16 +486,16 @@ void mutt_progress_update (progress_t* progress, long pos, int percent)
if (progress->size > 0)
{
- mutt_message ("%s %s/%s (%d%%)", progress->msg, posstr, progress->sizestr,
- percent > 0 ? percent :
- (int) (100.0 * (double) progress->pos / progress->size));
+ message_bar (percent > 0 ? percent : (int) (100.0 * (double) progress->pos / progress->size),
+ "%s %s/%s (%d%%)", progress->msg, posstr, progress->sizestr,
+ percent > 0 ? percent : (int) (100.0 * (double) progress->pos / progress->size));
}
else
{
if (percent > 0)
- mutt_message ("%s %s (%d%%)", progress->msg, posstr, percent);
+ message_bar (percent, "%s %s (%d%%)", progress->msg, posstr, percent);
else
- mutt_message ("%s %s", progress->msg, posstr);
+ mutt_message ("%s %s", progress->msg, posstr);
}
}
--- a/doc/manual.xml.head
+++ a/doc/manual.xml.head
@@ -2641,6 +2641,7 @@ specify one or the other).
markers (the +
markers at the beginning of wrapped lines in the pager)
message (informational messages)
normal
+progress (visual progress bar)
quoted (text matching $quote_regexp in the body of a message)
quoted1, quoted2, ..., quotedN (higher levels of quoting)
search (highlighting of words in the pager)
--- a/mutt_curses.h
+++ a/mutt_curses.h
@@ -128,6 +128,7 @@ enum
MT_COLOR_SIDEBAR,
MT_COLOR_UNDERLINE,
MT_COLOR_INDEX,
+ MT_COLOR_PROGRESS,
MT_COLOR_NEW,
MT_COLOR_FLAGGED,
MT_COLOR_MAX