diff -uNp -r mutt-5302767aa6aa.orig/Makefile.am mutt-5302767aa6aa/Makefile.am
--- mutt-5302767aa6aa.orig/Makefile.am Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/Makefile.am Sat Sep 4 20:32:59 2010
@@ -32,6 +32,7 @@ mutt_SOURCES = \
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \
status.c system.c thread.c charset.c history.c lib.c \
+ sidebar.c \
muttlib.c editmsg.c mbyte.c \
url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
diff -uNp -r mutt-5302767aa6aa.orig/OPS mutt-5302767aa6aa/OPS
--- mutt-5302767aa6aa.orig/OPS Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/OPS Sat Sep 4 20:32:59 2010
@@ -179,3 +179,8 @@ OP_WHAT_KEY "display the keycode for a key press"
OP_MAIN_SHOW_LIMIT "show currently active limit pattern"
OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread"
OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads"
+OP_SIDEBAR_SCROLL_UP "scroll the mailbox pane up 1 page"
+OP_SIDEBAR_SCROLL_DOWN "scroll the mailbox pane down 1 page"
+OP_SIDEBAR_NEXT "go down to next mailbox"
+OP_SIDEBAR_PREV "go to previous mailbox"
+OP_SIDEBAR_OPEN "open hilighted mailbox"
diff -uNp -r mutt-5302767aa6aa.orig/PATCHES mutt-5302767aa6aa/PATCHES
--- mutt-5302767aa6aa.orig/PATCHES Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/PATCHES Sat Sep 4 20:32:59 2010
@@ -0,0 +1 @@
+patch-1.5.19.sidebar.20090522.txt
diff -uNp -r mutt-5302767aa6aa.orig/buffy.c mutt-5302767aa6aa/buffy.c
--- mutt-5302767aa6aa.orig/buffy.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/buffy.c Sat Sep 4 20:32:59 2010
@@ -320,6 +320,68 @@ static int buffy_maildir_hasnew (BUFFY* mailbox)
return rc;
}
+/* update message counts for the sidebar */
+void buffy_maildir_update (BUFFY* mailbox)
+{
+ char path[_POSIX_PATH_MAX];
+ DIR *dirp;
+ struct dirent *de;
+ char *p;
+
+ mailbox->msgcount = 0;
+ mailbox->msg_unread = 0;
+ mailbox->msg_flagged = 0;
+
+ snprintf (path, sizeof (path), "%s/new", mailbox->path);
+
+ if ((dirp = opendir (path)) == NULL)
+ {
+ mailbox->magic = 0;
+ return;
+ }
+
+ while ((de = readdir (dirp)) != NULL)
+ {
+ if (*de->d_name == '.')
+ continue;
+
+ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) {
+ mailbox->new = 1;
+ mailbox->msgcount++;
+ mailbox->msg_unread++;
+ }
+ }
+
+ closedir (dirp);
+ snprintf (path, sizeof (path), "%s/cur", mailbox->path);
+
+ if ((dirp = opendir (path)) == NULL)
+ {
+ mailbox->magic = 0;
+ return;
+ }
+
+ while ((de = readdir (dirp)) != NULL)
+ {
+ if (*de->d_name == '.')
+ continue;
+
+ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) {
+ mailbox->msgcount++;
+ if ((p = strstr (de->d_name, ":2,"))) {
+ if (!strchr (p + 3, 'T')) {
+ if (!strchr (p + 3, 'S'))
+ mailbox->msg_unread++;
+ if (strchr(p + 3, 'F'))
+ mailbox->msg_flagged++;
+ }
+ }
+ }
+ }
+
+ closedir (dirp);
+}
+
/* returns 1 if mailbox has new mail */
static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
{
@@ -348,6 +410,20 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct s
return rc;
}
+/* update message counts for the sidebar */
+void buffy_mbox_update (BUFFY* mailbox)
+{
+ CONTEXT *ctx = NULL;
+
+ ctx = mx_open_mailbox(mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL);
+ if(ctx)
+ {
+ mailbox->msgcount = ctx->msgcount;
+ mailbox->msg_unread = ctx->unread;
+ mx_close_mailbox(ctx, 0);
+ }
+}
+
int mutt_buffy_check (int force)
{
BUFFY *tmp;
@@ -423,16 +499,19 @@ int mutt_buffy_check (int force)
{
case M_MBOX:
case M_MMDF:
+ buffy_mbox_update (tmp);
if (buffy_mbox_hasnew (tmp, &sb) > 0)
BuffyCount++;
break;
case M_MAILDIR:
+ buffy_maildir_update (tmp);
if (buffy_maildir_hasnew (tmp) > 0)
BuffyCount++;
break;
case M_MH:
+ mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged);
if ((tmp->new = mh_buffy (tmp->path)) > 0)
BuffyCount++;
break;
diff -uNp -r mutt-5302767aa6aa.orig/buffy.h mutt-5302767aa6aa/buffy.h
--- mutt-5302767aa6aa.orig/buffy.h Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/buffy.h Sat Sep 4 20:32:59 2010
@@ -25,7 +25,11 @@ typedef struct buffy_t
char path[_POSIX_PATH_MAX];
off_t size;
struct buffy_t *next;
+ struct buffy_t *prev;
short new; /* mailbox has new mail */
+ int msgcount; /* total number of messages */
+ int msg_unread; /* number of unread messages */
+ int msg_flagged; /* number of flagged messages */
short notified; /* user has been notified */
short magic; /* mailbox type */
short newly_created; /* mbox or mmdf just popped into existence */
diff -uNp -r mutt-5302767aa6aa.orig/color.c mutt-5302767aa6aa/color.c
--- mutt-5302767aa6aa.orig/color.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/color.c Sat Sep 4 20:32:59 2010
@@ -93,6 +93,8 @@ static struct mapping_t Fields[] =
{ "bold", MT_COLOR_BOLD },
{ "underline", MT_COLOR_UNDERLINE },
{ "index", MT_COLOR_INDEX },
+ { "sidebar_new", MT_COLOR_NEW },
+ { "sidebar_flagged", MT_COLOR_FLAGGED },
{ NULL, 0 }
};
diff -uNp -r mutt-5302767aa6aa.orig/compose.c mutt-5302767aa6aa/compose.c
--- mutt-5302767aa6aa.orig/compose.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/compose.c Sat Sep 4 20:32:59 2010
@@ -72,7 +72,7 @@ enum
#define HDR_XOFFSET 14
#define TITLE_FMT "%14s" /* Used for Prompts, which are ASCII */
-#define W (COLS - HDR_XOFFSET)
+#define W (COLS - HDR_XOFFSET - SidebarWidth)
static char *Prompts[] =
{
@@ -112,7 +112,7 @@ static void redraw_crypt_lines (HEADER *msg)
{
int off = 0;
- mvaddstr (HDR_CRYPT, 0, "Security: ");
+ mvaddstr (HDR_CRYPT, SidebarWidth, " Security: ");
if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
{
@@ -144,7 +144,7 @@ static void redraw_crypt_lines (HEADER *msg)
}
clrtoeol ();
- move (HDR_CRYPTINFO, 0);
+ move (HDR_CRYPTINFO, SidebarWidth);
clrtoeol ();
if ((WithCrypto & APPLICATION_PGP)
@@ -161,7 +161,7 @@ static void redraw_crypt_lines (HEADER *msg)
&& (msg->security & ENCRYPT)
&& SmimeCryptAlg
&& *SmimeCryptAlg) {
- mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
+ mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),
NONULL(SmimeCryptAlg));
off = 20;
}
@@ -175,7 +175,7 @@ static void redraw_mix_line (LIST *chain)
int c;
char *t;
- mvaddstr (HDR_MIX, 0, " Mix: ");
+ mvaddstr (HDR_MIX, SidebarWidth, " Mix: ");
if (!chain)
{
@@ -190,7 +190,7 @@ static void redraw_mix_line (LIST *chain)
if (t && t[0] == '0' && t[1] == '\0')
t = "<random>";
- if (c + mutt_strlen (t) + 2 >= COLS)
+ if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth)
break;
addstr (NONULL(t));
@@ -242,7 +242,7 @@ static void draw_envelope_addr (int line, ADDRESS *add
buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), addr, 1);
- mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);
+ mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]);
mutt_paddstr (W, buf);
}
@@ -252,10 +252,10 @@ static void draw_envelope (HEADER *msg, char *fcc)
}
}
#endif
- mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
+ mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
mutt_paddstr (W, NONULL (msg->env->subject));
draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
- mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]);
+ mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]);
mutt_paddstr (W, fcc);
if (WithCrypto)
@@ -266,7 +266,7 @@ static void draw_envelope (HEADER *msg, char *fcc)
#endif
SETCOLOR (MT_COLOR_STATUS);
- mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));
+ mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));
BKGDSET (MT_COLOR_STATUS);
clrtoeol ();
@@ -304,7 +304,7 @@ static int edit_address_list (int line, ADDRESS **addr
/* redraw the expanded list so the user can see the result */
buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), *addr, 1);
- move (line, HDR_XOFFSET);
+ move (line, HDR_XOFFSET+SidebarWidth);
mutt_paddstr (W, buf);
return 0;
@@ -549,7 +549,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for
if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
{
mutt_str_replace (&msg->env->subject, buf);
- move (HDR_SUBJECT, HDR_XOFFSET);
+ move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth);
clrtoeol ();
if (msg->env->subject)
mutt_paddstr (W, msg->env->subject);
@@ -566,7 +566,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for
{
strfcpy (fcc, buf, fcclen);
mutt_pretty_mailbox (fcc, fcclen);
- move (HDR_FCC, HDR_XOFFSET);
+ move (HDR_FCC, HDR_XOFFSET + SidebarWidth);
mutt_paddstr (W, fcc);
fccSet = 1;
}
diff -uNp -r mutt-5302767aa6aa.orig/curs_main.c mutt-5302767aa6aa/curs_main.c
--- mutt-5302767aa6aa.orig/curs_main.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/curs_main.c Sat Sep 4 20:32:59 2010
@@ -26,7 +26,9 @@
#include "mailbox.h"
#include "mapping.h"
#include "sort.h"
+#include "buffy.h"
#include "mx.h"
+#include "sidebar.h"
#ifdef USE_POP
#include "pop.h"
@@ -523,8 +525,12 @@ int mutt_index_menu (void)
menu->redraw |= REDRAW_STATUS;
if (do_buffy_notify)
{
- if (mutt_buffy_notify () && option (OPTBEEPNEW))
- beep ();
+ if (mutt_buffy_notify ())
+ {
+ menu->redraw |= REDRAW_FULL;
+ if (option (OPTBEEPNEW))
+ beep ();
+ }
}
else
do_buffy_notify = 1;
@@ -536,6 +542,7 @@ int mutt_index_menu (void)
if (menu->redraw & REDRAW_FULL)
{
menu_redraw_full (menu);
+ draw_sidebar(menu->menu);
mutt_show_error ();
}
@@ -558,10 +565,13 @@ int mutt_index_menu (void)
if (menu->redraw & REDRAW_STATUS)
{
+ DrawFullLine = 1;
menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
+ DrawFullLine = 0;
CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2);
SETCOLOR (MT_COLOR_STATUS);
BKGDSET (MT_COLOR_STATUS);
+ set_buffystats(Context);
mutt_paddstr (COLS, buf);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
@@ -575,7 +585,7 @@ int mutt_index_menu (void)
menu->oldcurrent = -1;
if (option (OPTARROWCURSOR))
- move (menu->current - menu->top + menu->offset, 2);
+ move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
else if (option (OPTBRAILLEFRIENDLY))
move (menu->current - menu->top + menu->offset, 0);
else
@@ -1077,6 +1087,7 @@ int mutt_index_menu (void)
menu->redraw = REDRAW_FULL;
break;
+ case OP_SIDEBAR_OPEN:
case OP_MAIN_CHANGE_FOLDER:
case OP_MAIN_NEXT_UNREAD_MAILBOX:
@@ -1108,7 +1119,11 @@ int mutt_index_menu (void)
{
mutt_buffy (buf, sizeof (buf));
- if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
+ if ( op == OP_SIDEBAR_OPEN ) {
+ if(!CurBuffy)
+ break;
+ strncpy( buf, CurBuffy->path, sizeof(buf) );
+ } else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
{
if (menu->menu == MENU_PAGER)
{
@@ -1126,6 +1141,7 @@ int mutt_index_menu (void)
}
mutt_expand_path (buf, sizeof (buf));
+ set_curbuffy(buf);
if (mx_get_magic (buf) <= 0)
{
mutt_error (_("%s is not a mailbox."), buf);
@@ -2216,6 +2232,12 @@ int mutt_index_menu (void)
mutt_what_key();
break;
+ case OP_SIDEBAR_SCROLL_UP:
+ case OP_SIDEBAR_SCROLL_DOWN:
+ case OP_SIDEBAR_NEXT:
+ case OP_SIDEBAR_PREV:
+ scroll_sidebar(op, menu->menu);
+ break;
default:
if (menu->menu == MENU_MAIN)
km_error_key (MENU_MAIN);
diff -uNp -r mutt-5302767aa6aa.orig/flags.c mutt-5302767aa6aa/flags.c
--- mutt-5302767aa6aa.orig/flags.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/flags.c Sat Sep 4 20:32:59 2010
@@ -22,8 +22,10 @@
#include "mutt.h"
#include "mutt_curses.h"
+#include "mutt_menu.h"
#include "sort.h"
#include "mx.h"
+#include "sidebar.h"
void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
{
@@ -263,6 +265,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag
*/
if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged))
h->searched = 0;
+ draw_sidebar(0);
}
void mutt_tag_set_flag (int flag, int bf)
diff -uNp -r mutt-5302767aa6aa.orig/functions.h mutt-5302767aa6aa/functions.h
--- mutt-5302767aa6aa.orig/functions.h Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/functions.h Sat Sep 4 20:32:59 2010
@@ -169,6 +169,11 @@ struct binding_t OpMain[] = { /* map: index */
{ "decrypt-save", OP_DECRYPT_SAVE, NULL },
+ { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL },
+ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL },
+ { "sidebar-next", OP_SIDEBAR_NEXT, NULL },
+ { "sidebar-prev", OP_SIDEBAR_PREV, NULL },
+ { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
{ NULL, 0, NULL }
};
@@ -272,6 +277,11 @@ struct binding_t OpPager[] = { /* map: pager */
{ "what-key", OP_WHAT_KEY, NULL },
+ { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL },
+ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL },
+ { "sidebar-next", OP_SIDEBAR_NEXT, NULL },
+ { "sidebar-prev", OP_SIDEBAR_PREV, NULL },
+ { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
{ NULL, 0, NULL }
};
diff -uNp -r mutt-5302767aa6aa.orig/globals.h mutt-5302767aa6aa/globals.h
--- mutt-5302767aa6aa.orig/globals.h Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/globals.h Sat Sep 4 20:32:59 2010
@@ -117,6 +117,7 @@ WHERE short SearchContext;
WHERE char *SendCharset;
WHERE char *Sendmail;
WHERE char *Shell;
+WHERE char *SidebarDelim;
WHERE char *Signature;
WHERE char *SimpleSearch;
#if USE_SMTP
@@ -207,6 +208,9 @@ WHERE short ScoreThresholdDelete;
WHERE short ScoreThresholdRead;
WHERE short ScoreThresholdFlag;
+WHERE struct buffy_t *CurBuffy INITVAL(0);
+WHERE short DrawFullLine INITVAL(0);
+WHERE short SidebarWidth;
#ifdef USE_IMAP
WHERE short ImapKeepalive;
WHERE short ImapPipelineDepth;
diff -uNp -r mutt-5302767aa6aa.orig/imap/command.c mutt-5302767aa6aa/imap/command.c
--- mutt-5302767aa6aa.orig/imap/command.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/imap/command.c Sat Sep 4 20:32:59 2010
@@ -1006,6 +1006,13 @@ static void cmd_parse_status (IMAP_DATA* idata, char*
opened */
status->uidnext = oldun;
+ /* Added to make the sidebar show the correct numbers */
+ if (status->messages)
+ {
+ inc->msgcount = status->messages;
+ inc->msg_unread = status->unseen;
+ }
+
FREE (&value);
return;
}
diff -uNp -r mutt-5302767aa6aa.orig/imap/imap.c mutt-5302767aa6aa/imap/imap.c
--- mutt-5302767aa6aa.orig/imap/imap.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/imap/imap.c Sat Sep 4 20:32:59 2010
@@ -1521,7 +1521,7 @@ int imap_buffy_check (int force)
imap_munge_mbox_name (munged, sizeof (munged), name);
snprintf (command, sizeof (command),
- "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT)", munged);
+ "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT MESSAGES)", munged);
if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
{
diff -uNp -r mutt-5302767aa6aa.orig/init.h mutt-5302767aa6aa/init.h
--- mutt-5302767aa6aa.orig/init.h Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/init.h Sat Sep 4 20:32:59 2010
@@ -1942,6 +1942,27 @@ struct option_t MuttVars[] = {
** not used.
** (PGP only)
*/
+ {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, "|"},
+ /*
+ ** .pp
+ ** This specifies the delimiter between the sidebar (if visible) and
+ ** other screens.
+ */
+ { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 },
+ /*
+ ** .pp
+ ** This specifies whether or not to show sidebar (left-side list of folders).
+ */
+ { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 },
+ /*
+ ** .pp
+ ** The width of the sidebar.
+ */
+ { "sidebar_sort", DT_BOOL, R_BOTH, OPTSIDEBARSORT, 0 },
+ /*
+ ** .pp
+ ** Should the sidebar be sorted.
+ */
{ "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
/*
** .pp
diff -uNp -r mutt-5302767aa6aa.orig/mailbox.h mutt-5302767aa6aa/mailbox.h
--- mutt-5302767aa6aa.orig/mailbox.h Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/mailbox.h Sat Sep 4 20:32:59 2010
@@ -27,6 +27,7 @@
#define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses
* safe_fopen() for mbox-style folders.
*/
+#define M_PEEK (1<<5) /* revert atime back after taking a look (if applicable) */
/* mx_open_new_message() */
#define M_ADD_FROM 1 /* add a From_ line */
diff -uNp -r mutt-5302767aa6aa.orig/mbox.c mutt-5302767aa6aa/mbox.c
--- mutt-5302767aa6aa.orig/mbox.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/mbox.c Sat Sep 4 20:32:59 2010
@@ -100,6 +100,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
mutt_perror (ctx->path);
return (-1);
}
+ ctx->atime = sb.st_atime;
ctx->mtime = sb.st_mtime;
ctx->size = sb.st_size;
@@ -251,6 +252,7 @@ int mbox_parse_mailbox (CONTEXT *ctx)
ctx->size = sb.st_size;
ctx->mtime = sb.st_mtime;
+ ctx->atime = sb.st_atime;
#ifdef NFS_ATTRIBUTE_HACK
if (sb.st_mtime > sb.st_atime)
diff -uNp -r mutt-5302767aa6aa.orig/menu.c mutt-5302767aa6aa/menu.c
--- mutt-5302767aa6aa.orig/menu.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/menu.c Sat Sep 4 20:32:59 2010
@@ -24,6 +24,7 @@
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mbyte.h"
+#include "sidebar.h"
#include <string.h>
#include <stdlib.h>
@@ -156,7 +157,7 @@ static void menu_pad_string (char *s, size_t n)
{
char *scratch = safe_strdup (s);
int shift = option (OPTARROWCURSOR) ? 3 : 0;
- int cols = COLS - shift;
+ int cols = COLS - shift - SidebarWidth;
mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
s[n - 1] = 0;
@@ -207,6 +208,7 @@ void menu_redraw_index (MUTTMENU *menu)
char buf[LONG_STRING];
int i;
+ draw_sidebar(1);
for (i = menu->top; i < menu->top + menu->pagelen; i++)
{
if (i < menu->max)
@@ -217,7 +219,7 @@ void menu_redraw_index (MUTTMENU *menu)
if (option (OPTARROWCURSOR))
{
attrset (menu->color (i));
- CLEARLINE (i - menu->top + menu->offset);
+ CLEARLINE_WIN (i - menu->top + menu->offset);
if (i == menu->current)
{
@@ -246,14 +248,14 @@ void menu_redraw_index (MUTTMENU *menu)
BKGDSET (MT_COLOR_INDICATOR);
}
- CLEARLINE (i - menu->top + menu->offset);
+ CLEARLINE_WIN (i - menu->top + menu->offset);
print_enriched_string (menu->color(i), (unsigned char *) buf, i != menu->current);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
}
}
else
- CLEARLINE (i - menu->top + menu->offset);
+ CLEARLINE_WIN (i - menu->top + menu->offset);
}
menu->redraw = 0;
}
@@ -268,7 +270,7 @@ void menu_redraw_motion (MUTTMENU *menu)
return;
}
- move (menu->oldcurrent + menu->offset - menu->top, 0);
+ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
@@ -283,13 +285,13 @@ void menu_redraw_motion (MUTTMENU *menu)
clrtoeol ();
menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
menu_pad_string (buf, sizeof (buf));
- move (menu->oldcurrent + menu->offset - menu->top, 3);
+ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3);
print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
SETCOLOR (MT_COLOR_NORMAL);
}
/* now draw it in the new location */
- move (menu->current + menu->offset - menu->top, 0);
+ move (menu->current + menu->offset - menu->top, SidebarWidth);
attrset (menu->color (menu->current));
ADDCOLOR (MT_COLOR_INDICATOR);
addstr ("->");
@@ -310,7 +312,7 @@ void menu_redraw_motion (MUTTMENU *menu)
attrset (menu->color (menu->current));
ADDCOLOR (MT_COLOR_INDICATOR);
BKGDSET (MT_COLOR_INDICATOR);
- CLEARLINE (menu->current - menu->top + menu->offset);
+ CLEARLINE_WIN (menu->current - menu->top + menu->offset);
print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
@@ -322,7 +324,7 @@ void menu_redraw_current (MUTTMENU *menu)
{
char buf[LONG_STRING];
- move (menu->current + menu->offset - menu->top, 0);
+ move (menu->current + menu->offset - menu->top, SidebarWidth);
menu_make_entry (buf, sizeof (buf), menu, menu->current);
menu_pad_string (buf, sizeof (buf));
@@ -875,7 +877,7 @@ int mutt_menuLoop (MUTTMENU *menu)
if (option (OPTARROWCURSOR))
- move (menu->current - menu->top + menu->offset, 2);
+ move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
else if (option (OPTBRAILLEFRIENDLY))
move (menu->current - menu->top + menu->offset, 0);
else
diff -uNp -r mutt-5302767aa6aa.orig/mh.c mutt-5302767aa6aa/mh.c
--- mutt-5302767aa6aa.orig/mh.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/mh.c Sat Sep 4 20:33:39 2010
@@ -235,11 +235,35 @@ int mh_buffy (const char *path)
if (mh_read_sequences (&mhs, path) < 0)
return 0;
+
for (i = 0; !r && i <= mhs.max; i++)
- if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN)
+ if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN) {
r = 1;
+ }
mhs_free_sequences (&mhs);
return r;
+}
+
+void mh_buffy_update (const char *path, int *msgcount, int *msg_unread, int *msg_flagged)
+{
+ int i;
+ struct mh_sequences mhs;
+ memset (&mhs, 0, sizeof (mhs));
+
+ if (mh_read_sequences (&mhs, path) < 0)
+ return;
+
+ msgcount = 0;
+ msg_unread = 0;
+ msg_flagged = 0;
+ for (i = 0; i <= mhs.max; i++)
+ msgcount++;
+ if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN) {
+ msg_unread++;
+ }
+ if (mhs_check (&mhs, i) & MH_SEQ_FLAGGED)
+ msg_flagged++;
+ mhs_free_sequences (&mhs);
}
static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
diff -uNp -r mutt-5302767aa6aa.orig/mutt.h mutt-5302767aa6aa/mutt.h
--- mutt-5302767aa6aa.orig/mutt.h Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/mutt.h Sat Sep 4 20:32:59 2010
@@ -418,6 +418,8 @@ enum
OPTSAVEEMPTY,
OPTSAVENAME,
OPTSCORE,
+ OPTSIDEBAR,
+ OPTSIDEBARSORT,
OPTSIGDASHES,
OPTSIGONTOP,
OPTSORTRE,
@@ -858,6 +859,7 @@ typedef struct _context
{
char *path;
FILE *fp;
+ time_t atime;
time_t mtime;
off_t size;
off_t vsize;
@@ -892,6 +894,7 @@ typedef struct _context
unsigned int quiet : 1; /* inhibit status messages? */
unsigned int collapsed : 1; /* are all threads collapsed? */
unsigned int closing : 1; /* mailbox is being closed */
+ unsigned int peekonly : 1; /* just taking a glance, revert atime */
/* driver hooks */
void *data; /* driver specific data */
diff -uNp -r mutt-5302767aa6aa.orig/mutt_curses.h mutt-5302767aa6aa/mutt_curses.h
--- mutt-5302767aa6aa.orig/mutt_curses.h Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/mutt_curses.h Sat Sep 4 20:32:59 2010
@@ -64,6 +64,7 @@
#undef lines
#endif /* lines */
+#define CLEARLINE_WIN(x) move(x,SidebarWidth), clrtoeol()
#define CLEARLINE(x) move(x,0), clrtoeol()
#define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x)
#define BEEP() do { if (option (OPTBEEP)) beep(); } while (0)
@@ -126,6 +127,8 @@ enum
MT_COLOR_BOLD,
MT_COLOR_UNDERLINE,
MT_COLOR_INDEX,
+ MT_COLOR_NEW,
+ MT_COLOR_FLAGGED,
MT_COLOR_MAX
};
diff -uNp -r mutt-5302767aa6aa.orig/muttlib.c mutt-5302767aa6aa/muttlib.c
--- mutt-5302767aa6aa.orig/muttlib.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/muttlib.c Sat Sep 4 20:32:59 2010
@@ -1286,6 +1286,8 @@ void mutt_FormatString (char *dest, /* output buffer
pl = pw = 1;
/* see if there's room to add content, else ignore */
+ if ( DrawFullLine )
+ {
if ((col < COLS && wlen < destlen) || soft)
{
int pad;
@@ -1329,6 +1331,52 @@ void mutt_FormatString (char *dest, /* output buffer
col += wid;
src += pl;
}
+ }
+ else
+ {
+ if ((col < COLS-SidebarWidth && wlen < destlen) || soft)
+ {
+ int pad;
+
+ /* get contents after padding */
+ mutt_FormatString (buf, sizeof (buf), 0, src + pl, callback, data, flags);
+ len = mutt_strlen (buf);
+ wid = mutt_strwidth (buf);
+
+ /* try to consume as many columns as we can, if we don't have
+ * memory for that, use as much memory as possible */
+ pad = (COLS - SidebarWidth - col - wid) / pw;
+ if (pad > 0 && wlen + (pad * pl) + len > destlen)
+ pad = ((signed)(destlen - wlen - len)) / pl;
+ if (pad > 0)
+ {
+ while (pad--)
+ {
+ memcpy (wptr, src, pl);
+ wptr += pl;
+ wlen += pl;
+ col += pw;
+ }
+ }
+ else if (soft && pad < 0)
+ {
+ /* \0-terminate dest for length computation in mutt_wstr_trunc() */
+ *wptr = 0;
+ /* make sure right part is at most as wide as display */
+ len = mutt_wstr_trunc (buf, destlen, COLS, &wid);
+ /* truncate left so that right part fits completely in */
+ wlen = mutt_wstr_trunc (dest, destlen - len, col + pad, &col);
+ wptr = dest + wlen;
+ }
+ if (len + wlen > destlen)
+ len = mutt_wstr_trunc (buf, destlen - wlen, COLS - SidebarWidth - col, NULL);
+ memcpy (wptr, buf, len);
+ wptr += len;
+ wlen += len;
+ col += wid;
+ src += pl;
+ }
+ }
break; /* skip rest of input */
}
else if (ch == '|')
diff -uNp -r mutt-5302767aa6aa.orig/mx.c mutt-5302767aa6aa/mx.c
--- mutt-5302767aa6aa.orig/mx.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/mx.c Sat Sep 4 20:32:59 2010
@@ -580,6 +580,7 @@ static int mx_open_mailbox_append (CONTEXT *ctx, int f
* M_APPEND open mailbox for appending
* M_READONLY open mailbox in read-only mode
* M_QUIET only print error messages
+ * M_PEEK revert atime where applicable
* ctx if non-null, context struct to use
*/
CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
@@ -602,6 +603,8 @@ CONTEXT *mx_open_mailbox (const char *path, int flags,
ctx->quiet = 1;
if (flags & M_READONLY)
ctx->readonly = 1;
+ if (flags & M_PEEK)
+ ctx->peekonly = 1;
if (flags & (M_APPEND|M_NEWFOLDER))
{
@@ -701,9 +704,21 @@ CONTEXT *mx_open_mailbox (const char *path, int flags,
void mx_fastclose_mailbox (CONTEXT *ctx)
{
int i;
+#ifndef BUFFY_SIZE
+ struct utimbuf ut;
+#endif
if(!ctx)
return;
+#ifndef BUFFY_SIZE
+ /* fix up the times so buffy won't get confused */
+ if (ctx->peekonly && ctx->path && ctx->mtime > ctx->atime)
+ {
+ ut.actime = ctx->atime;
+ ut.modtime = ctx->mtime;
+ utime (ctx->path, &ut);
+ }
+#endif
/* never announce that a mailbox we've just left has new mail. #3290
* XXX: really belongs in mx_close_mailbox, but this is a nice hook point */
diff -uNp -r mutt-5302767aa6aa.orig/mx.h mutt-5302767aa6aa/mx.h
--- mutt-5302767aa6aa.orig/mx.h Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/mx.h Sat Sep 4 20:33:19 2010
@@ -58,6 +58,7 @@ int mh_read_dir (CONTEXT *, const char *);
int mh_sync_mailbox (CONTEXT *, int *);
int mh_check_mailbox (CONTEXT *, int *);
int mh_buffy (const char *);
+void mh_buffy_update (const char *, int *, int *, int *);
int mh_check_empty (const char *);
int maildir_read_dir (CONTEXT *);
diff -uNp -r mutt-5302767aa6aa.orig/pager.c mutt-5302767aa6aa/pager.c
--- mutt-5302767aa6aa.orig/pager.c Wed Aug 25 00:30:49 2010
+++ mutt-5302767aa6aa/pager.c Sat Sep 4 20:32:59 2010
@@ -29,6 +29,7 @@
#include "pager.h"
#include "attach.h"
#include "mbyte.h"
+#include "sidebar.h"
#include "mutt_crypt.h"
@@ -1095,6 +1096,7 @@ static int format_line (struct line_t **lineInfo, int
wchar_t wc;
mbstate_t mbstate;
int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
+ wrap_cols -= SidebarWidth;
if (check_attachment_marker ((char *)buf) == 0)
wrap_cols = COLS;
@@ -1745,7 +1747,7 @@ mutt_pager (const char *banner, const char *fname, int
if ((redraw & REDRAW_BODY) || topline != oldtopline)
{
do {
- move (bodyoffset, 0);
+ move (bodyoffset, SidebarWidth);
curline = oldtopline = topline;
lines = 0;
force_redraw = 0;
@@ -1758,6 +1760,7 @@ mutt_pager (const char *banner, const char *fname, int
&QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
lines++;
curline++;
+ move(lines + bodyoffset, SidebarWidth);
}
last_offset = lineInfo[curline].offset;
} while (force_redraw);
@@ -1771,6 +1774,7 @@ mutt_pager (const char *banner, const char *fname, int
addch ('~');
addch ('\n');
lines++;
+ move(lines + bodyoffset, SidebarWidth);
}
/* We are going to update the pager status bar, so it isn't
* necessary to reset to normal color now. */
@@ -1794,21 +1798,21 @@ mutt_pager (const char *banner, const char *fname, int
/* print out the pager status bar */
SETCOLOR (MT_COLOR_STATUS);
BKGDSET (MT_COLOR_STATUS);
- CLEARLINE (statusoffset);
+ CLEARLINE_WIN (statusoffset);
if (IsHeader (extra) || IsMsgAttach (extra))
{
- size_t l1 = COLS * MB_LEN_MAX;
+ size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
size_t l2 = sizeof (buffer);
hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
- mutt_paddstr (COLS, buffer);
+ mutt_paddstr (COLS-SidebarWidth, buffer);
}
else
{
char bn[STRING];
snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);
- mutt_paddstr (COLS, bn);
+ mutt_paddstr (COLS-SidebarWidth, bn);
}
BKGDSET (MT_COLOR_NORMAL);
SETCOLOR (MT_COLOR_NORMAL);
@@ -1819,18 +1823,23 @@ mutt_pager (const char *banner, const char *fname, int
/* redraw the pager_index indicator, because the
* flags for this message might have changed. */
menu_redraw_current (index);
+ draw_sidebar(MENU_PAGER);
/* print out the index status bar */
menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
- move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);
+ move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SidebarWidth);
SETCOLOR (MT_COLOR_STATUS);
BKGDSET (MT_COLOR_STATUS);
- mutt_paddstr (COLS, buffer);
+ mutt_paddstr (COLS-SidebarWidth, buffer);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
}
+ /* if we're not using the index, update every time */
+ if ( index == 0 )
+ draw_sidebar(MENU_PAGER);
+
redraw = 0;
if (option(OPTBRAILLEFRIENDLY)) {
@@ -2755,6 +2764,13 @@ search_next:
case OP_WHAT_KEY:
mutt_what_key ();
break;
+
+ case OP_SIDEBAR_SCROLL_UP:
+ case OP_SIDEBAR_SCROLL_DOWN:
+ case OP_SIDEBAR_NEXT:
+ case OP_SIDEBAR_PREV:
+ scroll_sidebar(ch, MENU_PAGER);
+ break;
default:
ch = -1;
diff -uNp -r mutt-5302767aa6aa.orig/sidebar.c mutt-5302767aa6aa/sidebar.c
--- mutt-5302767aa6aa.orig/sidebar.c Thu Jan 1 01:00:00 1970
+++ mutt-5302767aa6aa/sidebar.c Sat Sep 4 20:32:59 2010
@@ -0,0 +1,362 @@
+/*
+ * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
+ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ */
+
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "mutt.h"
+#include "mutt_menu.h"
+#include "mutt_curses.h"
+#include "sidebar.h"
+#include "buffy.h"
+#include <libgen.h>
+#include "keymap.h"
+#include <stdbool.h>
+
+/*BUFFY *CurBuffy = 0;*/
+static BUFFY *TopBuffy = 0;
+static BUFFY *BottomBuffy = 0;
+static int known_lines = 0;
+
+static int quick_log10(int n)
+{
+ char string[32];
+ sprintf(string, "%d", n);
+ return strlen(string);
+}
+
+void calc_boundaries (int menu)
+{
+ BUFFY *tmp = Incoming;
+
+ if ( known_lines != LINES ) {
+ TopBuffy = BottomBuffy = 0;
+ known_lines = LINES;
+ }
+ for ( ; tmp->next != 0; tmp = tmp->next )
+ tmp->next->prev = tmp;
+
+ if (option(OPTSIDEBARSORT)) {
+ int needsort=1;
+ BUFFY *prev;
+ BUFFY *next;
+ BUFFY *tmp2;
+ while (needsort==1) {
+ needsort=0;
+ tmp = Incoming;
+ for ( ; tmp ; tmp=tmp->next ) {
+ if (tmp->next != NULL && strcmp(tmp->path, tmp->next->path) > 0) {
+ needsort=1;
+ prev = tmp->prev;
+ next = tmp->next;
+ if (prev != NULL)
+ prev->next = next;
+ else
+ Incoming = next;
+ next->prev = prev;
+ tmp2 = next->next;
+ next->next = tmp;
+ tmp->prev = next;
+ tmp->next = tmp2;
+ if (tmp2 != NULL)
+ tmp2->prev = tmp;
+ }
+ }
+ }
+ }
+
+ if ( TopBuffy == 0 && BottomBuffy == 0 )
+ TopBuffy = Incoming;
+ if ( BottomBuffy == 0 ) {
+ int count = LINES - 2 - (menu != MENU_PAGER || option(OPTSTATUSONTOP));
+ BottomBuffy = TopBuffy;
+ while ( --count && BottomBuffy->next )
+ BottomBuffy = BottomBuffy->next;
+ }
+ else if ( TopBuffy == CurBuffy->next ) {
+ int count = LINES - 2 - (menu != MENU_PAGER);
+ BottomBuffy = CurBuffy;
+ tmp = BottomBuffy;
+ while ( --count && tmp->prev)
+ tmp = tmp->prev;
+ TopBuffy = tmp;
+ }
+ else if ( BottomBuffy == CurBuffy->prev ) {
+ int count = LINES - 2 - (menu != MENU_PAGER);
+ TopBuffy = CurBuffy;
+ tmp = TopBuffy;
+ while ( --count && tmp->next )
+ tmp = tmp->next;
+ BottomBuffy = tmp;
+ }
+}
+
+char *make_sidebar_entry(char *box, int size, int new, int flagged)
+{
+ static char *entry = 0;
+ char *c;
+ int i = 0;
+ int delim_len = strlen(SidebarDelim);
+
+ c = realloc(entry, SidebarWidth - delim_len + 2);
+ if ( c ) entry = c;
+ entry[SidebarWidth - delim_len + 1] = 0;
+ for (; i < SidebarWidth - delim_len + 1; entry[i++] = ' ' );
+ i = strlen(box);
+ strncpy( entry, box, i < (SidebarWidth - delim_len + 1) ? i : (SidebarWidth - delim_len + 1) );
+
+ if (size == -1)
+ sprintf(entry + SidebarWidth - delim_len - 3, "?");
+ else if ( new ) {
+ if (flagged > 0) {
+ sprintf(
+ entry + SidebarWidth - delim_len - 5 - quick_log10(size) - quick_log10(new) - quick_log10(flagged),
+ "% d(%d)[%d]", size, new, flagged);
+ } else {
+ sprintf(
+ entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(new),
+ "% d(%d)", size, new);
+ }
+ } else if (flagged > 0) {
+ sprintf( entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(flagged), "% d[%d]", size, flagged);
+ } else {
+ sprintf( entry + SidebarWidth - delim_len - 1 - quick_log10(size), "% d", size);
+ }
+ return entry;
+}
+
+void set_curbuffy(char buf[LONG_STRING])
+{
+ BUFFY* tmp = CurBuffy = Incoming;
+
+ if (!Incoming)
+ return;
+
+ while(1) {
+ if(!strcmp(tmp->path, buf)) {
+ CurBuffy = tmp;
+ break;
+ }
+
+ if(tmp->next)
+ tmp = tmp->next;
+ else
+ break;
+ }
+}
+
+int draw_sidebar(int menu) {
+
+ int lines = option(OPTHELP) ? 1 : 0;
+ BUFFY *tmp;
+#ifndef USE_SLANG_CURSES
+ attr_t attrs;
+#endif
+ short delim_len = strlen(SidebarDelim);
+ short color_pair;
+
+ static bool initialized = false;
+ static int prev_show_value;
+ static short saveSidebarWidth;
+
+ /* initialize first time */
+ if(!initialized) {
+ prev_show_value = option(OPTSIDEBAR);
+ saveSidebarWidth = SidebarWidth;
+ if(!option(OPTSIDEBAR)) SidebarWidth = 0;
+ initialized = true;
+ }
+
+ /* save or restore the value SidebarWidth */
+ if(prev_show_value != option(OPTSIDEBAR)) {
+ if(prev_show_value && !option(OPTSIDEBAR)) {
+ saveSidebarWidth = SidebarWidth;
+ SidebarWidth = 0;
+ } else if(!prev_show_value && option(OPTSIDEBAR)) {
+ SidebarWidth = saveSidebarWidth;
+ }
+ prev_show_value = option(OPTSIDEBAR);
+ }
+
+
+// if ( SidebarWidth == 0 ) return 0;
+ if (SidebarWidth > 0 && option (OPTSIDEBAR)
+ && delim_len >= SidebarWidth) {
+ unset_option (OPTSIDEBAR);
+ /* saveSidebarWidth = SidebarWidth; */
+ if (saveSidebarWidth > delim_len) {
+ SidebarWidth = saveSidebarWidth;
+ mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
+ sleep (2);
+ } else {
+ SidebarWidth = 0;
+ mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar. Please set your sidebar_width to a sane value."));
+ sleep (4); /* the advise to set a sane value should be seen long enough */
+ }
+ saveSidebarWidth = 0;
+ return (0);
+ }
+
+ if ( SidebarWidth == 0 || !option(OPTSIDEBAR)) {
+ if (SidebarWidth > 0) {
+ saveSidebarWidth = SidebarWidth;
+ SidebarWidth = 0;
+ }
+ unset_option(OPTSIDEBAR);
+ return 0;
+ }
+
+ /* get attributes for divider */
+ SETCOLOR(MT_COLOR_STATUS);
+#ifndef USE_SLANG_CURSES
+ attr_get(&attrs, &color_pair, 0);
+#else
+ color_pair = attr_get();
+#endif
+ SETCOLOR(MT_COLOR_NORMAL);
+
+ /* draw the divider */
+
+ for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
+ move(lines, SidebarWidth - delim_len);
+ addstr(NONULL(SidebarDelim));
+#ifndef USE_SLANG_CURSES
+ mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
+#endif
+ }
+
+ if ( Incoming == 0 ) return 0;
+ lines = option(OPTHELP) ? 1 : 0; /* go back to the top */
+
+ if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 )
+ calc_boundaries(menu);
+ if ( CurBuffy == 0 ) CurBuffy = Incoming;
+
+ tmp = TopBuffy;
+
+ SETCOLOR(MT_COLOR_NORMAL);
+
+ for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); tmp = tmp->next ) {
+ if ( tmp == CurBuffy )
+ SETCOLOR(MT_COLOR_INDICATOR);
+ else if ( tmp->msg_unread > 0 )
+ SETCOLOR(MT_COLOR_NEW);
+ else if ( tmp->msg_flagged > 0 )
+ SETCOLOR(MT_COLOR_FLAGGED);
+ else
+ SETCOLOR(MT_COLOR_NORMAL);
+
+ move( lines, 0 );
+ if ( Context && !strcmp( tmp->path, Context->path ) ) {
+ tmp->msg_unread = Context->unread;
+ tmp->msgcount = Context->msgcount;
+ tmp->msg_flagged = Context->flagged;
+ }
+ // check whether Maildir is a prefix of the current folder's path
+ short maildir_is_prefix = 0;
+ if ( (strlen(tmp->path) > strlen(Maildir)) &&
+ (strncmp(Maildir, tmp->path, strlen(Maildir)) == 0) )
+ maildir_is_prefix = 1;
+ // calculate depth of current folder and generate its display name with indented spaces
+ int sidebar_folder_depth = 0;
+ char *sidebar_folder_name;
+ sidebar_folder_name = basename(tmp->path);
+ if ( maildir_is_prefix ) {
+ char *tmp_folder_name;
+ int i;
+ tmp_folder_name = tmp->path + strlen(Maildir);
+ for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) {
+ if (tmp_folder_name[i] == '/') sidebar_folder_depth++;
+ }
+ if (sidebar_folder_depth > 0) {
+ sidebar_folder_name = malloc(strlen(basename(tmp->path)) + sidebar_folder_depth + 1);
+ for (i=0; i < sidebar_folder_depth; i++)
+ sidebar_folder_name[i]=' ';
+ sidebar_folder_name[i]=0;
+ strncat(sidebar_folder_name, basename(tmp->path), strlen(basename(tmp->path)) + sidebar_folder_depth);
+ }
+ }
+ printw( "%.*s", SidebarWidth - delim_len + 1,
+ make_sidebar_entry(sidebar_folder_name, tmp->msgcount,
+ tmp->msg_unread, tmp->msg_flagged));
+ if (sidebar_folder_depth > 0)
+ free(sidebar_folder_name);
+ lines++;
+ }
+ SETCOLOR(MT_COLOR_NORMAL);
+ for ( ; lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
+ int i = 0;
+ move( lines, 0 );
+ for ( ; i < SidebarWidth - delim_len; i++ )
+ addch(' ');
+ }
+ return 0;
+}
+
+
+void set_buffystats(CONTEXT* Context)
+{
+ BUFFY *tmp = Incoming;
+ while(tmp) {
+ if(Context && !strcmp(tmp->path, Context->path)) {
+ tmp->msg_unread = Context->unread;
+ tmp->msgcount = Context->msgcount;
+ break;
+ }
+ tmp = tmp->next;
+ }
+}
+
+void scroll_sidebar(int op, int menu)
+{
+ if(!SidebarWidth) return;
+ if(!CurBuffy) return;
+
+ switch (op) {
+ case OP_SIDEBAR_NEXT:
+ if ( CurBuffy->next == NULL ) return;
+ CurBuffy = CurBuffy->next;
+ break;
+ case OP_SIDEBAR_PREV:
+ if ( CurBuffy->prev == NULL ) return;
+ CurBuffy = CurBuffy->prev;
+ break;
+ case OP_SIDEBAR_SCROLL_UP:
+ CurBuffy = TopBuffy;
+ if ( CurBuffy != Incoming ) {
+ calc_boundaries(menu);
+ CurBuffy = CurBuffy->prev;
+ }
+ break;
+ case OP_SIDEBAR_SCROLL_DOWN:
+ CurBuffy = BottomBuffy;
+ if ( CurBuffy->next ) {
+ calc_boundaries(menu);
+ CurBuffy = CurBuffy->next;
+ }
+ break;
+ default:
+ return;
+ }
+ calc_boundaries(menu);
+ draw_sidebar(menu);
+}
+
diff -uNp -r mutt-5302767aa6aa.orig/sidebar.h mutt-5302767aa6aa/sidebar.h
--- mutt-5302767aa6aa.orig/sidebar.h Thu Jan 1 01:00:00 1970
+++ mutt-5302767aa6aa/sidebar.h Sat Sep 4 20:32:59 2010
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
+ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ */
+
+#ifndef SIDEBAR_H
+#define SIDEBAR_H
+
+struct MBOX_LIST {
+ char *path;
+ int msgcount;
+ int new;
+} MBLIST;
+
+/* parameter is whether or not to go to the status line */
+/* used for omitting the last | that covers up the status bar in the index */
+int draw_sidebar(int);
+void scroll_sidebar(int, int);
+void set_curbuffy(char*);
+void set_buffystats(CONTEXT*);
+
+#endif /* SIDEBAR_H */
