X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/91c74c8a7bf33aae93699087e0747cb9eb502b62..9275549093fd4bae96f4119e7b66dd3cc6478e78:/debian/patches/mutt-patched/sidebar diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar index 4c51309..c48148f 100644 --- a/debian/patches/mutt-patched/sidebar +++ b/debian/patches/mutt-patched/sidebar @@ -1,4 +1,3 @@ -# vim:ft=diff: This is the sidebar patch. When enabled, mutt will show a list of mailboxes with (new) message counts in a @@ -19,176 +18,151 @@ in the "mutt-patched" package. This specifies whether or not to show sidebar (left-side list of folders). sidebar_width (integer, default 0) - +- The width of the sidebar. * Patch source: - http://www.lunar-linux.org/index.php?page=mutt-sidebar - - http://lunar-linux.org/~tchan/mutt/patch-1.5.18.sidebar.20080517.txt + - http://lunar-linux.org/~tchan/mutt/patch-1.5.19.sidebar.20090522.txt * Changes made: - - Fixed conflict with maildir-mtime patch [myon] + - 2008-08-02 myon: Refreshed patch using quilt push -f to remove hunks we do + not need (Makefile.in). -== END PATCH --- a/buffy.c +++ b/buffy.c -@@ -261,7 +261,7 @@ int mutt_buffy_check (int force) - char path[_POSIX_PATH_MAX]; - struct stat contex_sb; - time_t t; -- -+ CONTEXT *ctx; - #ifdef USE_IMAP - /* update postponed count as well, on force */ - if (force) -@@ -296,6 +296,8 @@ int mutt_buffy_check (int force) - - for (tmp = Incoming; tmp; tmp = tmp->next) +@@ -312,6 +312,10 @@ + return 0; + } + ++ mailbox->msgcount = 0; ++ mailbox->msg_unread = 0; ++ mailbox->msg_flagged = 0; ++ + while ((de = readdir (dirp)) != NULL) { -+ if ( tmp->new == 1 ) -+ tmp->has_new = 1; - #ifdef USE_IMAP - if (tmp->magic != M_IMAP) - #endif -@@ -353,30 +355,51 @@ int mutt_buffy_check (int force) - case M_MBOX: - case M_MMDF: + if (*de->d_name == '.') +@@ -329,7 +333,9 @@ + continue; + } + /* one new and undeleted message is enough */ +- mailbox->new = 1; ++ mailbox->has_new = mailbox->new = 1; ++ mailbox->msgcount++; ++ mailbox->msg_unread++; + rc = 1; + break; + } +@@ -337,6 +343,34 @@ -- if (STAT_CHECK) -+ { -+ if (STAT_CHECK || tmp->msgcount == 0) - { -- BuffyCount++; -- tmp->new = 1; -+ BUFFY b = *tmp; + closedir (dirp); + ++ /* ++ * count read messages (for folderlist (sidebar) we also need to count ++ * messages in cur so that we the total number of messages ++ */ ++ snprintf (path, sizeof (path), "%s/cur", mailbox->path); ++ if ((dirp = opendir (path)) == NULL) ++ { ++ mailbox->magic = 0; ++ } ++ while ((de = readdir (dirp)) != NULL) ++ { ++ char *p; ++ if (*de->d_name != '.') { ++ if ((p = strstr (de->d_name, ":2,"))) { ++ if (!strchr (p + 3, 'T')) { ++ mailbox->msgcount++; ++ if ( !strchr (p + 3, 'S')) ++ mailbox->msg_unread++; ++ if (strchr(p + 3, 'F')) ++ mailbox->msg_flagged++; ++ } ++ } else ++ mailbox->msgcount++; ++ } ++ } ++ ++ closedir (dirp); ++ + return rc; + } + +@@ -345,14 +379,33 @@ + { + int rc = 0; + int statcheck; ++ CONTEXT *ctx; + + if (option (OPTCHECKMBOXSIZE)) + statcheck = sb->st_size > mailbox->size; + else + statcheck = sb->st_mtime > sb->st_atime + || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime); +- if (statcheck) ++ if (statcheck || mailbox->msgcount == 0) + { ++ BUFFY b = *mailbox; + int msgcount = 0; + int msg_unread = 0; + /* parse the mailbox, to see how much mail there is */ -+ ctx = mx_open_mailbox( tmp->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL); ++ ctx = mx_open_mailbox( mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL); + if(ctx) + { -+ msgcount = ctx->msgcount; ++ msgcount = ctx->msgcount; + msg_unread = ctx->unread; + mx_close_mailbox(ctx, 0); + } -+ *tmp = b; -+ tmp->msgcount = msgcount; -+ tmp->msg_unread = msg_unread; -+ if(STAT_CHECK) { -+ tmp->has_new = tmp->new = 1; -+ BuffyCount++; -+ } - } - else if (option(OPTCHECKMBOXSIZE)) - { - /* some other program has deleted mail from the folder */ - tmp->size = (long) sb.st_size; - } -- if (tmp->newly_created && -- (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) -- tmp->newly_created = 0; -- -- break; -+ if (tmp->newly_created && -+ (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) -+ tmp->newly_created = 0; -+ } -+ break; - - case M_MAILDIR: - -+ /* count new message */ - snprintf (path, sizeof (path), "%s/new", tmp->path); - if ((dirp = opendir (path)) == NULL) - { - tmp->magic = 0; - break; - } -+ tmp->msgcount = 0; -+ tmp->msg_unread = 0; -+ tmp->msg_flagged = 0; - while ((de = readdir (dirp)) != NULL) - { - char *p; -@@ -385,12 +408,36 @@ int mutt_buffy_check (int force) - { - if (!tmp->new) - { -- /* one new and undeleted message is enough */ -- BuffyCount++; -- tmp->new = 1; -- -- if (! option (OPTMAILDIRMTIME)) /* prevent stat calls */ -- break; -+ tmp->has_new = tmp->new = 1; -+ tmp->msgcount++; -+ tmp->msg_unread++; -+ } -+ } -+ if(tmp->msg_unread) -+ BuffyCount++; -+ -+ closedir (dirp); -+ -+ /* -+ * count read messages (for folderlist (sidebar) we also need to count -+ * messages in cur so that we the total number of messages -+ */ -+ snprintf (path, sizeof (path), "%s/cur", tmp->path); -+ if ((dirp = opendir (path)) == NULL) -+ { -+ tmp->magic = 0; -+ break; -+ } -+ while ((de = readdir (dirp)) != NULL) -+ { -+ char *p; -+ if (*de->d_name != '.' && -+ (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) -+ { -+ tmp->msgcount++; -+ if (p && strchr(p + 3, 'F')) { -+ tmp->msg_flagged++; -+ } - } - snprintf (path, sizeof (path), "%s/new/%s", tmp->path, de->d_name); - if (!stat (path, &smd) && smd.st_mtime > tmp->mtime) -@@ -403,8 +450,25 @@ int mutt_buffy_check (int force) - break; - - case M_MH: -- if ((tmp->new = mh_buffy (tmp->path)) > 0) -- BuffyCount++; -+ { -+ DIR *dp; -+ struct dirent *de; -+ if ((tmp->new = mh_buffy (tmp->path)) > 0) -+ BuffyCount++; -+ -+ if ((dp = opendir (path)) == NULL) -+ break; -+ tmp->msgcount = 0; -+ while ((de = readdir (dp))) ++ *mailbox = b; ++ mailbox->msgcount = msgcount; ++ mailbox->msg_unread = msg_unread; ++ if(statcheck) + { -+ if (mh_valid_message (de->d_name)) -+ { -+ tmp->msgcount++; -+ tmp->has_new = tmp->new = 1; -+ } -+ } -+ closedir (dp); ++ mailbox->has_new = mailbox->new = 1; + } + if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited) + { + rc = 1; +@@ -374,9 +427,11 @@ + int mutt_buffy_check (int force) + { + BUFFY *tmp; ++ struct dirent *de, *dp; + struct stat sb; + struct stat contex_sb; + time_t t; ++ CONTEXT *ctx; + + sb.st_size=0; + contex_sb.st_dev=0; +@@ -456,6 +511,20 @@ + case M_MH: + if ((tmp->new = mh_buffy (tmp->path)) > 0) + BuffyCount++; ++ ++ if ((dp = opendir (tmp->path)) == NULL) ++ break; ++ tmp->msgcount = 0; ++ while ((de = readdir (dp))) ++ { ++ if (mh_valid_message (de->d_name)) ++ { ++ tmp->msgcount++; ++ tmp->has_new = tmp->new = 1; ++ } ++ } ++ closedir (dp); ++ break; } } --- a/buffy.h +++ b/buffy.h -@@ -25,8 +25,13 @@ typedef struct buffy_t - char *path; - long size; +@@ -25,7 +25,12 @@ + char path[_POSIX_PATH_MAX]; + off_t size; struct buffy_t *next; + struct buffy_t *prev; - time_t mtime; /* for maildirs...time of newest entry */ short new; /* mailbox has new mail */ + short has_new; /* set it new if new and not read */ + int msgcount; /* total number of messages */ @@ -199,7 +173,7 @@ in the "mutt-patched" package. short newly_created; /* mbox or mmdf just popped into existence */ --- a/color.c +++ b/color.c -@@ -93,6 +93,8 @@ static struct mapping_t Fields[] = +@@ -93,6 +93,8 @@ { "bold", MT_COLOR_BOLD }, { "underline", MT_COLOR_UNDERLINE }, { "index", MT_COLOR_INDEX }, @@ -210,7 +184,7 @@ in the "mutt-patched" package. --- a/compose.c +++ b/compose.c -@@ -72,7 +72,7 @@ enum +@@ -72,7 +72,7 @@ #define HDR_XOFFSET 10 #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */ @@ -219,38 +193,25 @@ in the "mutt-patched" package. static char *Prompts[] = { -@@ -115,16 +115,16 @@ static void redraw_crypt_lines (HEADER * - if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME)) - { - if (!msg->security) -- mvaddstr (HDR_CRYPT, 0, "Security: "); -+ mvaddstr (HDR_CRYPT, SidebarWidth, "Security: "); - else if (msg->security & APPLICATION_SMIME) -- mvaddstr (HDR_CRYPT, 0, " S/MIME: "); -+ mvaddstr (HDR_CRYPT, SidebarWidth, " S/MIME: "); - else if (msg->security & APPLICATION_PGP) -- mvaddstr (HDR_CRYPT, 0, " PGP: "); -+ mvaddstr (HDR_CRYPT, SidebarWidth, " PGP: "); +@@ -112,7 +112,7 @@ + { + int off = 0; + +- mvaddstr (HDR_CRYPT, 0, "Security: "); ++ mvaddstr (HDR_CRYPT, SidebarWidth, "Security: "); + + if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) + { +@@ -144,7 +144,7 @@ } - else if ((WithCrypto & APPLICATION_SMIME)) -- mvaddstr (HDR_CRYPT, 0, " S/MIME: "); -+ mvaddstr (HDR_CRYPT, SidebarWidth, " S/MIME: "); - else if ((WithCrypto & APPLICATION_PGP)) -- mvaddstr (HDR_CRYPT, 0, " PGP: "); -+ mvaddstr (HDR_CRYPT, SidebarWidth, " PGP: "); - else - return; -@@ -148,7 +148,7 @@ static void redraw_crypt_lines (HEADER * - } clrtoeol (); - - move (HDR_CRYPTINFO, 0); + move (HDR_CRYPTINFO, SidebarWidth); clrtoeol (); + if ((WithCrypto & APPLICATION_PGP) - && msg->security & APPLICATION_PGP && msg->security & SIGN) -@@ -164,7 +164,7 @@ static void redraw_crypt_lines (HEADER * +@@ -161,7 +161,7 @@ && (msg->security & ENCRYPT) && SmimeCryptAlg && *SmimeCryptAlg) { @@ -259,7 +220,7 @@ in the "mutt-patched" package. NONULL(SmimeCryptAlg)); off = 20; } -@@ -178,7 +178,7 @@ static void redraw_mix_line (LIST *chain +@@ -175,7 +175,7 @@ int c; char *t; @@ -268,7 +229,7 @@ in the "mutt-patched" package. if (!chain) { -@@ -193,7 +193,7 @@ static void redraw_mix_line (LIST *chain +@@ -190,7 +190,7 @@ if (t && t[0] == '0' && t[1] == '\0') t = ""; @@ -277,7 +238,7 @@ in the "mutt-patched" package. break; addstr (NONULL(t)); -@@ -245,7 +245,7 @@ static void draw_envelope_addr (int line +@@ -242,7 +242,7 @@ buf[0] = 0; rfc822_write_address (buf, sizeof (buf), addr, 1); @@ -286,7 +247,7 @@ in the "mutt-patched" package. mutt_paddstr (W, buf); } -@@ -255,10 +255,10 @@ static void draw_envelope (HEADER *msg, +@@ -252,10 +252,10 @@ draw_envelope_addr (HDR_TO, msg->env->to); draw_envelope_addr (HDR_CC, msg->env->cc); draw_envelope_addr (HDR_BCC, msg->env->bcc); @@ -299,7 +260,7 @@ in the "mutt-patched" package. mutt_paddstr (W, fcc); if (WithCrypto) -@@ -269,7 +269,7 @@ static void draw_envelope (HEADER *msg, +@@ -266,7 +266,7 @@ #endif SETCOLOR (MT_COLOR_STATUS); @@ -308,7 +269,7 @@ in the "mutt-patched" package. BKGDSET (MT_COLOR_STATUS); clrtoeol (); -@@ -307,7 +307,7 @@ static int edit_address_list (int line, +@@ -304,7 +304,7 @@ /* redraw the expanded list so the user can see the result */ buf[0] = 0; rfc822_write_address (buf, sizeof (buf), *addr, 1); @@ -317,7 +278,7 @@ in the "mutt-patched" package. mutt_paddstr (W, buf); return 0; -@@ -553,7 +553,7 @@ int mutt_compose_menu (HEADER *msg, /* +@@ -549,7 +549,7 @@ if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { mutt_str_replace (&msg->env->subject, buf); @@ -326,10 +287,10 @@ in the "mutt-patched" package. clrtoeol (); if (msg->env->subject) mutt_paddstr (W, msg->env->subject); -@@ -570,7 +570,7 @@ int mutt_compose_menu (HEADER *msg, /* +@@ -566,7 +566,7 @@ { - strfcpy (fcc, buf, _POSIX_PATH_MAX); - mutt_pretty_mailbox (fcc); + strfcpy (fcc, buf, fcclen); + mutt_pretty_mailbox (fcc, fcclen); - move (HDR_FCC, HDR_XOFFSET); + move (HDR_FCC, HDR_XOFFSET + SidebarWidth); mutt_paddstr (W, fcc); @@ -337,15 +298,17 @@ in the "mutt-patched" package. } --- a/curs_main.c +++ b/curs_main.c -@@ -29,6 +29,7 @@ +@@ -26,7 +26,9 @@ + #include "mailbox.h" + #include "mapping.h" #include "sort.h" - #include "buffy.h" ++#include "buffy.h" #include "mx.h" +#include "sidebar.h" #ifdef USE_POP #include "pop.h" -@@ -544,8 +545,12 @@ int mutt_index_menu (void) +@@ -532,8 +534,12 @@ menu->redraw |= REDRAW_STATUS; if (do_buffy_notify) { @@ -360,7 +323,7 @@ in the "mutt-patched" package. } else do_buffy_notify = 1; -@@ -557,6 +562,7 @@ int mutt_index_menu (void) +@@ -545,6 +551,7 @@ if (menu->redraw & REDRAW_FULL) { menu_redraw_full (menu); @@ -368,9 +331,9 @@ in the "mutt-patched" package. mutt_show_error (); } -@@ -579,10 +585,13 @@ int mutt_index_menu (void) +@@ -567,10 +574,13 @@ - if (menu->redraw & REDRAW_STATUS) + if (menu->redraw & REDRAW_STATUS) { + DrawFullLine = 1; menu_status_line (buf, sizeof (buf), menu, NONULL (Status)); @@ -382,7 +345,7 @@ in the "mutt-patched" package. mutt_paddstr (COLS, buf); SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); -@@ -603,7 +612,7 @@ int mutt_index_menu (void) +@@ -591,7 +601,7 @@ menu->oldcurrent = -1; if (option (OPTARROWCURSOR)) @@ -391,15 +354,15 @@ in the "mutt-patched" package. else if (option (OPTBRAILLEFRIENDLY)) move (menu->current - menu->top + menu->offset, 0); else -@@ -1072,6 +1081,7 @@ int mutt_index_menu (void) +@@ -1089,6 +1099,7 @@ menu->redraw = REDRAW_FULL; break; + case OP_SIDEBAR_OPEN: case OP_MAIN_CHANGE_FOLDER: case OP_MAIN_NEXT_UNREAD_MAILBOX: - -@@ -1103,7 +1113,11 @@ int mutt_index_menu (void) + +@@ -1120,7 +1131,11 @@ { mutt_buffy (buf, sizeof (buf)); @@ -407,12 +370,12 @@ in the "mutt-patched" package. + if ( op == OP_SIDEBAR_OPEN ) { + if(!CurBuffy) + break; -+ strncpy( buf, CurBuffy->path, sizeof(buf) ); ++ strncpy( buf, CurBuffy->path, sizeof(buf) ); + } else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1) { if (menu->menu == MENU_PAGER) { -@@ -1121,6 +1135,7 @@ int mutt_index_menu (void) +@@ -1138,6 +1153,7 @@ } mutt_expand_path (buf, sizeof (buf)); @@ -420,7 +383,7 @@ in the "mutt-patched" package. if (mx_get_magic (buf) <= 0) { mutt_error (_("%s is not a mailbox."), buf); -@@ -2213,6 +2228,12 @@ int mutt_index_menu (void) +@@ -2241,6 +2257,12 @@ mutt_what_key(); break; @@ -444,9 +407,9 @@ in the "mutt-patched" package. #include "mx.h" +#include "sidebar.h" - #ifdef USE_IMAP - #include "imap_private.h" -@@ -294,6 +296,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE + void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx) + { +@@ -290,6 +292,7 @@ */ if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged)) h->searched = 0; @@ -456,7 +419,7 @@ in the "mutt-patched" package. void mutt_tag_set_flag (int flag, int bf) --- a/functions.h +++ b/functions.h -@@ -169,6 +169,11 @@ struct binding_t OpMain[] = { /* map: in +@@ -170,6 +170,11 @@ { "decrypt-save", OP_DECRYPT_SAVE, NULL }, @@ -468,9 +431,9 @@ in the "mutt-patched" package. { NULL, 0, NULL } }; -@@ -267,6 +272,11 @@ struct binding_t OpPager[] = { /* map: p - { "decrypt-save", OP_DECRYPT_SAVE, NULL }, +@@ -274,6 +279,11 @@ + { "what-key", OP_WHAT_KEY, NULL }, + { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL }, + { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL }, @@ -482,7 +445,7 @@ in the "mutt-patched" package. --- a/globals.h +++ b/globals.h -@@ -116,6 +116,7 @@ WHERE char *Realname; +@@ -117,6 +117,7 @@ WHERE char *SendCharset; WHERE char *Sendmail; WHERE char *Shell; @@ -490,7 +453,7 @@ in the "mutt-patched" package. WHERE char *Signature; WHERE char *SimpleSearch; #if USE_SMTP -@@ -212,6 +213,9 @@ WHERE short ScoreThresholdDelete; +@@ -210,6 +211,9 @@ WHERE short ScoreThresholdRead; WHERE short ScoreThresholdFlag; @@ -499,17 +462,17 @@ in the "mutt-patched" package. +WHERE short SidebarWidth; #ifdef USE_IMAP WHERE short ImapKeepalive; - #endif + WHERE short ImapPipelineDepth; --- a/init.h +++ b/init.h -@@ -1532,6 +1532,22 @@ struct option_t MuttVars[] = { - ** you may unset this setting. - ** (Crypto only) +@@ -1965,6 +1965,22 @@ + ** not used. + ** (PGP only) */ + {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, "|"}, + /* + ** .pp -+ ** This specifies the delimiter between the sidebar (if visible) and ++ ** This specifies the delimiter between the sidebar (if visible) and + ** other screens. + */ + { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 }, @@ -537,19 +500,19 @@ in the "mutt-patched" package. #define M_ADD_FROM 1 /* add a From_ line */ --- a/Makefile.am +++ b/Makefile.am -@@ -29,7 +29,8 @@ mutt_SOURCES = \ +@@ -33,7 +33,8 @@ score.c send.c sendlib.c signal.c sort.c \ status.c system.c thread.c charset.c history.c lib.c \ muttlib.c editmsg.c mbyte.c \ -- url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h -+ url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h \ -+ sidebar.c +- url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c ++ url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c \ ++ sidebar.c nodist_mutt_SOURCES = $(BUILT_SOURCES) --- a/mbox.c +++ b/mbox.c -@@ -104,6 +104,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx) +@@ -104,6 +104,7 @@ mutt_perror (ctx->path); return (-1); } @@ -557,7 +520,7 @@ in the "mutt-patched" package. ctx->mtime = sb.st_mtime; ctx->size = sb.st_size; -@@ -259,6 +260,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) +@@ -255,6 +256,7 @@ ctx->size = sb.st_size; ctx->mtime = sb.st_mtime; @@ -573,9 +536,9 @@ in the "mutt-patched" package. #include "mbyte.h" +#include "sidebar.h" - #ifdef USE_IMAP - #include "imap.h" -@@ -158,7 +159,7 @@ void menu_pad_string (char *s, size_t n) + #include + #include +@@ -156,7 +157,7 @@ { char *scratch = safe_strdup (s); int shift = option (OPTARROWCURSOR) ? 3 : 0; @@ -584,7 +547,7 @@ in the "mutt-patched" package. mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1); s[n - 1] = 0; -@@ -209,6 +210,7 @@ void menu_redraw_index (MUTTMENU *menu) +@@ -207,6 +208,7 @@ char buf[LONG_STRING]; int i; @@ -592,7 +555,7 @@ in the "mutt-patched" package. for (i = menu->top; i < menu->top + menu->pagelen; i++) { if (i < menu->max) -@@ -219,7 +221,7 @@ void menu_redraw_index (MUTTMENU *menu) +@@ -217,7 +219,7 @@ if (option (OPTARROWCURSOR)) { attrset (menu->color (i)); @@ -601,7 +564,7 @@ in the "mutt-patched" package. if (i == menu->current) { -@@ -248,14 +250,14 @@ void menu_redraw_index (MUTTMENU *menu) +@@ -246,14 +248,14 @@ BKGDSET (MT_COLOR_INDICATOR); } @@ -618,7 +581,7 @@ in the "mutt-patched" package. } menu->redraw = 0; } -@@ -270,7 +272,7 @@ void menu_redraw_motion (MUTTMENU *menu) +@@ -268,7 +270,7 @@ return; } @@ -627,7 +590,7 @@ in the "mutt-patched" package. SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); -@@ -285,13 +287,13 @@ void menu_redraw_motion (MUTTMENU *menu) +@@ -283,13 +285,13 @@ clrtoeol (); menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent); menu_pad_string (buf, sizeof (buf)); @@ -643,7 +606,7 @@ in the "mutt-patched" package. attrset (menu->color (menu->current)); ADDCOLOR (MT_COLOR_INDICATOR); addstr ("->"); -@@ -312,7 +314,7 @@ void menu_redraw_motion (MUTTMENU *menu) +@@ -310,7 +312,7 @@ attrset (menu->color (menu->current)); ADDCOLOR (MT_COLOR_INDICATOR); BKGDSET (MT_COLOR_INDICATOR); @@ -652,7 +615,7 @@ in the "mutt-patched" package. print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0); SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); -@@ -324,7 +326,7 @@ void menu_redraw_current (MUTTMENU *menu +@@ -322,7 +324,7 @@ { char buf[LONG_STRING]; @@ -661,7 +624,7 @@ in the "mutt-patched" package. menu_make_entry (buf, sizeof (buf), menu, menu->current); menu_pad_string (buf, sizeof (buf)); -@@ -871,7 +873,7 @@ int mutt_menuLoop (MUTTMENU *menu) +@@ -884,7 +886,7 @@ if (option (OPTARROWCURSOR)) @@ -680,7 +643,7 @@ in the "mutt-patched" package. #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 +@@ -126,6 +127,8 @@ MT_COLOR_BOLD, MT_COLOR_UNDERLINE, MT_COLOR_INDEX, @@ -691,7 +654,7 @@ in the "mutt-patched" package. --- a/mutt.h +++ b/mutt.h -@@ -437,6 +437,7 @@ enum +@@ -431,6 +431,7 @@ OPTSAVEEMPTY, OPTSAVENAME, OPTSCORE, @@ -699,7 +662,7 @@ in the "mutt-patched" package. OPTSIGDASHES, OPTSIGONTOP, OPTSORTRE, -@@ -874,6 +875,7 @@ typedef struct _context +@@ -874,6 +875,7 @@ { char *path; FILE *fp; @@ -707,7 +670,7 @@ in the "mutt-patched" package. time_t mtime; off_t size; off_t vsize; -@@ -914,6 +916,7 @@ typedef struct _context +@@ -914,6 +916,7 @@ unsigned int quiet : 1; /* inhibit status messages? */ unsigned int collapsed : 1; /* are all threads collapsed? */ unsigned int closing : 1; /* mailbox is being closed */ @@ -717,7 +680,7 @@ in the "mutt-patched" package. void *data; /* driver specific data */ --- a/muttlib.c +++ b/muttlib.c -@@ -1205,6 +1205,8 @@ void mutt_FormatString (char *dest, /* +@@ -1286,6 +1286,8 @@ pl = pw = 1; /* see if there's room to add content, else ignore */ @@ -726,7 +689,7 @@ in the "mutt-patched" package. if ((col < COLS && wlen < destlen) || soft) { int pad; -@@ -1247,6 +1249,52 @@ void mutt_FormatString (char *dest, /* +@@ -1329,6 +1331,52 @@ col += wid; src += pl; } @@ -781,7 +744,7 @@ in the "mutt-patched" package. else if (ch == '|') --- a/mx.c +++ b/mx.c -@@ -626,6 +626,7 @@ static int mx_open_mailbox_append (CONTE +@@ -595,6 +595,7 @@ * M_APPEND open mailbox for appending * M_READONLY open mailbox in read-only mode * M_QUIET only print error messages @@ -789,7 +752,7 @@ in the "mutt-patched" package. * ctx if non-null, context struct to use */ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx) -@@ -648,6 +649,8 @@ CONTEXT *mx_open_mailbox (const char *pa +@@ -617,6 +618,8 @@ ctx->quiet = 1; if (flags & M_READONLY) ctx->readonly = 1; @@ -798,7 +761,7 @@ in the "mutt-patched" package. if (flags & (M_APPEND|M_NEWFOLDER)) { -@@ -752,9 +755,21 @@ CONTEXT *mx_open_mailbox (const char *pa +@@ -721,9 +724,21 @@ void mx_fastclose_mailbox (CONTEXT *ctx) { int i; @@ -814,15 +777,15 @@ in the "mutt-patched" package. + { + ut.actime = ctx->atime; + ut.modtime = ctx->mtime; -+ utime (ctx->path, &ut); ++ utime (ctx->path, &ut); + } +#endif - if (ctx->mx_close) - ctx->mx_close (ctx); + /* 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 */ --- a/OPS +++ b/OPS -@@ -179,3 +179,8 @@ OP_WHAT_KEY "display the keycode for a k +@@ -180,3 +180,8 @@ 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" @@ -833,24 +796,23 @@ in the "mutt-patched" package. +OP_SIDEBAR_OPEN "open hilighted mailbox" --- a/pager.c +++ b/pager.c -@@ -30,6 +30,7 @@ +@@ -29,6 +29,7 @@ #include "pager.h" #include "attach.h" #include "mbyte.h" +#include "sidebar.h" - void set_xterm_title_bar(char *title); - void set_xterm_icon_name(char *name); -@@ -1069,6 +1070,8 @@ static int format_line (struct line_t ** - mbstate_t mbstate; + #include "mutt_crypt.h" + +@@ -1099,6 +1100,7 @@ + if (check_attachment_marker ((char *)buf) == 0) + wrap_cols = COLS; - int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap); -+ + wrap_cols -= SidebarWidth; - /* FIXME: this should come from lineInfo */ memset(&mbstate, 0, sizeof(mbstate)); -@@ -1702,7 +1705,7 @@ mutt_pager (const char *banner, const ch + +@@ -1745,7 +1747,7 @@ if ((redraw & REDRAW_BODY) || topline != oldtopline) { do { @@ -859,7 +821,7 @@ in the "mutt-patched" package. curline = oldtopline = topline; lines = 0; force_redraw = 0; -@@ -1715,6 +1718,7 @@ mutt_pager (const char *banner, const ch +@@ -1758,6 +1760,7 @@ &QuoteList, &q_level, &force_redraw, &SearchRE) > 0) lines++; curline++; @@ -867,7 +829,7 @@ in the "mutt-patched" package. } last_offset = lineInfo[curline].offset; } while (force_redraw); -@@ -1728,6 +1732,7 @@ mutt_pager (const char *banner, const ch +@@ -1771,6 +1774,7 @@ addch ('~'); addch ('\n'); lines++; @@ -875,34 +837,30 @@ in the "mutt-patched" package. } /* We are going to update the pager status bar, so it isn't * necessary to reset to normal color now. */ -@@ -1751,22 +1756,22 @@ mutt_pager (const char *banner, const ch +@@ -1794,11 +1798,11 @@ /* print out the pager status bar */ SETCOLOR (MT_COLOR_STATUS); BKGDSET (MT_COLOR_STATUS); - CLEARLINE (statusoffset); + CLEARLINE_WIN (statusoffset); - if (IsHeader (extra)) + + if (IsHeader (extra) || IsMsgAttach (extra)) { - size_t l1 = COLS * MB_LEN_MAX; -+ size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX; ++ size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX; size_t l2 = sizeof (buffer); - hfi.hdr = extra->hdr; + hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr; mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT); - } - else if (IsMsgAttach (extra)) +@@ -1808,7 +1812,7 @@ { -- size_t l1 = COLS * MB_LEN_MAX; -+ size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX; - size_t l2 = sizeof (buffer); - hfi.hdr = extra->bdy->hdr; - mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT); + char bn[STRING]; + snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str); +- mutt_paddstr (COLS, bn); ++ mutt_paddstr (COLS, IsHeader (extra) || IsMsgAttach (extra) ? buffer : banner); } -- mutt_paddstr (COLS, IsHeader (extra) || IsMsgAttach (extra) ? buffer : banner); -+ mutt_paddstr (COLS-SidebarWidth, IsHeader (extra) || IsMsgAttach (extra) ? buffer : banner); BKGDSET (MT_COLOR_NORMAL); SETCOLOR (MT_COLOR_NORMAL); - if (option(OPTXTERMSETTITLES)) -@@ -1783,18 +1788,23 @@ mutt_pager (const char *banner, const ch +@@ -1826,18 +1830,23 @@ /* redraw the pager_index indicator, because the * flags for this message might have changed. */ menu_redraw_current (index); @@ -928,9 +886,9 @@ in the "mutt-patched" package. redraw = 0; if (option(OPTBRAILLEFRIENDLY)) { -@@ -2673,6 +2683,13 @@ search_next: - redraw = REDRAW_FULL; - break; +@@ -2769,6 +2778,13 @@ + mutt_what_key (); + break; + case OP_SIDEBAR_SCROLL_UP: + case OP_SIDEBAR_SCROLL_DOWN: @@ -944,25 +902,25 @@ in the "mutt-patched" package. break; --- /dev/null +++ b/sidebar.c -@@ -0,0 +1,328 @@ +@@ -0,0 +1,333 @@ +/* + * Copyright (C) ????-2004 Justin Hibbits + * Copyright (C) 2004 Thomer M. Gil -+ * ++ * + * 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 @@ -1084,8 +1042,6 @@ in the "mutt-patched" package. +int draw_sidebar(int menu) { + + int lines = option(OPTHELP) ? 1 : 0; -+ int sidebar_folder_depth; -+ char *sidebar_folder_name; + BUFFY *tmp; +#ifndef USE_SLANG_CURSES + attr_t attrs; @@ -1166,7 +1122,7 @@ in the "mutt-patched" package. + if ( Incoming == 0 ) return 0; + lines = option(OPTHELP) ? 1 : 0; /* go back to the top */ + -+ if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) ++ if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) + calc_boundaries(menu); + if ( CurBuffy == 0 ) CurBuffy = Incoming; + @@ -1190,28 +1146,35 @@ in the "mutt-patched" package. + tmp->msgcount = Context->msgcount; + tmp->msg_flagged = Context->flagged; + } -+ sidebar_folder_depth = 0; -+ sidebar_folder_name = ""; // ... just in case -+ if ( strlen(tmp->path) > strlen(Maildir) ) { -+ int i; -+ char *tmp_folder_name; -+ 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); ++ // 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); ++ } + } -+ } else sidebar_folder_name = "INBOX"; -+ 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); ++ 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); @@ -1279,21 +1242,21 @@ in the "mutt-patched" package. +/* + * Copyright (C) ????-2004 Justin Hibbits + * Copyright (C) 2004 Thomer M. Gil -+ * ++ * + * 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 @@ -1314,8 +1277,8 @@ in the "mutt-patched" package. +#endif /* SIDEBAR_H */ --- a/doc/Muttrc +++ b/doc/Muttrc -@@ -2085,6 +2085,26 @@ attachments -I message/external-body - # function. +@@ -657,6 +657,26 @@ + # $crypt_autosign, $crypt_replysign and $smime_is_default. # # +# set sidebar_visible=no @@ -1323,38 +1286,38 @@ in the "mutt-patched" package. +# Name: sidebar_visible +# Type: boolean +# Default: no -+# -+# ++# ++# +# This specifies whether or not to show sidebar (left-side list of folders). -+# -+# ++# ++# +# set sidebar_width=0 +# +# Name: sidebar_width +# Type: number +# Default: 0 -+# -+# ++# ++# +# The width of the sidebar. -+# -+# ++# ++# # set crypt_autosign=no # # Name: crypt_autosign --- a/imap/imap.c +++ b/imap/imap.c -@@ -1484,7 +1484,7 @@ int imap_buffy_check (int force) +@@ -1527,7 +1527,7 @@ 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_cmd_queue (idata, command) < 0) + if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0) { --- a/imap/command.c +++ b/imap/command.c -@@ -911,6 +911,13 @@ static void cmd_parse_status (IMAP_DATA* +@@ -1011,6 +1011,13 @@ opened */ status->uidnext = oldun; @@ -1368,7 +1331,3 @@ in the "mutt-patched" package. FREE (&value); return; } ---- a/PATCHES -+++ b/PATCHES -@@ -0,0 +1 @@ -+patch-1.5.18.sidebar.20080517.txt