X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/3dba9e5c9fc1d796291f92d6bf08ed88ef540637..939639fcf1dad1b8f3a85d641f41d11c49281f3c:/debian/patches/mutt-patched/sidebar?ds=inline diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar index 1792d1f..f541c23 100644 --- a/debian/patches/mutt-patched/sidebar +++ b/debian/patches/mutt-patched/sidebar @@ -1,155 +1,175 @@ +This is the sidebar patch. + +When enabled, mutt will show a list of mailboxes with (new) message counts in a +separate column on the left side of the screen. + +As this feature is still considered to be unstable, this patch is only applied +in the "mutt-patched" package. + +* Configuration variables: + + sidebar_delim (string, default "|") + + This specifies the delimiter between the sidebar (if visible) and + other screens. + + sidebar_visible (boolean, default no) + + 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.19.sidebar.20090522.txt + +* Changes made: + - 2008-08-02 myon: Refreshed patch using quilt push -f to remove hunks we do + not need (Makefile.in). + +--- a/Makefile.am ++++ b/Makefile.am +@@ -32,6 +32,7 @@ + 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 + +--- a/OPS ++++ b/OPS +@@ -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" ++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" --- a/buffy.c +++ b/buffy.c -@@ -261,7 +261,7 @@ - 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 @@ - - for (tmp = Incoming; tmp; tmp = tmp->next) - { -+ if ( tmp->new == 1 ) -+ tmp->has_new = 1; - #ifdef USE_IMAP - if (tmp->magic != M_IMAP) - #endif -@@ -353,10 +355,27 @@ - case M_MBOX: - case M_MMDF: +@@ -340,6 +340,68 @@ + return rc; + } -- if (STAT_CHECK) -+ { -+ if (STAT_CHECK || tmp->msgcount == 0) - { -- BuffyCount++; -- tmp->new = 1; -+ BUFFY b = *tmp; -+ 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); -+ if(ctx) -+ { -+ 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)) - { -@@ -366,35 +385,86 @@ - if (tmp->newly_created && - (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) - tmp->newly_created = 0; -- ++/* 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++; + } - break; - - case M_MAILDIR: ++ } ++ } ++ } ++ ++ closedir (dirp); ++} ++ + /* returns 1 if mailbox has new mail */ + static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb) + { +@@ -371,6 +433,20 @@ + return rc; + } -+ /* 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; - if (*de->d_name != '.' && - (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) - { -- /* one new and undeleted message is enough */ -- BuffyCount++; -- tmp->new = 1; -- break; -+ tmp->has_new = tmp->new = 1; -+ tmp->msgcount++; -+ tmp->msg_unread++; -+ } -+ } -+ if(tmp->msg_unread) -+ BuffyCount++; ++/* update message counts for the sidebar */ ++void buffy_mbox_update (BUFFY* mailbox) ++{ ++ CONTEXT *ctx = NULL; + -+ closedir (dirp); ++ 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); ++ } ++} + -+ /* -+ * 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 != '.') { -+ if ((p = strstr (de->d_name, ":2,"))) { -+ if (!strchr (p + 3, 'T')) { -+ tmp->msgcount++; -+ if ( !strchr (p + 3, 'S')) -+ tmp->msg_unread++; -+ if (strchr(p + 3, 'F')) -+ tmp->msg_flagged++; -+ } -+ } else -+ tmp->msgcount++; - } - } - closedir (dirp); + int mutt_buffy_check (int force) + { + BUFFY *tmp; +@@ -444,16 +520,19 @@ + { + 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: -+ { -+ DIR *dp; -+ struct dirent *de; ++ mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged); if ((tmp->new = mh_buffy (tmp->path)) > 0) BuffyCount++; -+ -+ if ((dp = opendir (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,7 +25,12 @@ - char *path; +@@ -25,7 +25,11 @@ + char path[_POSIX_PATH_MAX]; off_t size; struct buffy_t *next; + struct buffy_t *prev; short new; /* mailbox has new mail */ -+ short has_new; /* set it new if new and not read */ + int msgcount; /* total number of messages */ + int msg_unread; /* number of unread messages */ + int msg_flagged; /* number of flagged messages */ @@ -178,38 +198,25 @@ static char *Prompts[] = { -@@ -115,16 +115,16 @@ - 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 @@ - } 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 @@ +@@ -161,7 +161,7 @@ && (msg->security & ENCRYPT) && SmimeCryptAlg && *SmimeCryptAlg) { @@ -218,7 +225,7 @@ NONULL(SmimeCryptAlg)); off = 20; } -@@ -178,7 +178,7 @@ +@@ -175,7 +175,7 @@ int c; char *t; @@ -227,7 +234,7 @@ if (!chain) { -@@ -193,7 +193,7 @@ +@@ -190,7 +190,7 @@ if (t && t[0] == '0' && t[1] == '\0') t = ""; @@ -236,7 +243,7 @@ break; addstr (NONULL(t)); -@@ -245,7 +245,7 @@ +@@ -242,7 +242,7 @@ buf[0] = 0; rfc822_write_address (buf, sizeof (buf), addr, 1); @@ -245,7 +252,7 @@ mutt_paddstr (W, buf); } -@@ -255,10 +255,10 @@ +@@ -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); @@ -258,7 +265,7 @@ mutt_paddstr (W, fcc); if (WithCrypto) -@@ -269,7 +269,7 @@ +@@ -266,7 +266,7 @@ #endif SETCOLOR (MT_COLOR_STATUS); @@ -267,7 +274,7 @@ BKGDSET (MT_COLOR_STATUS); clrtoeol (); -@@ -307,7 +307,7 @@ +@@ -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); @@ -276,7 +283,7 @@ mutt_paddstr (W, buf); return 0; -@@ -552,7 +552,7 @@ +@@ -549,7 +549,7 @@ if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { mutt_str_replace (&msg->env->subject, buf); @@ -285,7 +292,7 @@ clrtoeol (); if (msg->env->subject) mutt_paddstr (W, msg->env->subject); -@@ -569,7 +569,7 @@ +@@ -566,7 +566,7 @@ { strfcpy (fcc, buf, fcclen); mutt_pretty_mailbox (fcc, fcclen); @@ -306,7 +313,7 @@ #ifdef USE_POP #include "pop.h" -@@ -536,8 +538,12 @@ +@@ -532,8 +534,12 @@ menu->redraw |= REDRAW_STATUS; if (do_buffy_notify) { @@ -321,7 +328,7 @@ } else do_buffy_notify = 1; -@@ -549,6 +555,7 @@ +@@ -545,6 +551,7 @@ if (menu->redraw & REDRAW_FULL) { menu_redraw_full (menu); @@ -329,9 +336,9 @@ mutt_show_error (); } -@@ -571,10 +578,13 @@ +@@ -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)); @@ -343,7 +350,7 @@ mutt_paddstr (COLS, buf); SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); -@@ -595,7 +605,7 @@ +@@ -591,7 +601,7 @@ menu->oldcurrent = -1; if (option (OPTARROWCURSOR)) @@ -352,15 +359,15 @@ else if (option (OPTBRAILLEFRIENDLY)) move (menu->current - menu->top + menu->offset, 0); else -@@ -1068,6 +1078,7 @@ +@@ -1089,6 +1099,7 @@ menu->redraw = REDRAW_FULL; break; + case OP_SIDEBAR_OPEN: case OP_MAIN_CHANGE_FOLDER: case OP_MAIN_NEXT_UNREAD_MAILBOX: - -@@ -1099,7 +1110,11 @@ + +@@ -1120,7 +1131,11 @@ { mutt_buffy (buf, sizeof (buf)); @@ -368,12 +375,12 @@ + 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) { -@@ -1117,6 +1132,7 @@ +@@ -1138,6 +1153,7 @@ } mutt_expand_path (buf, sizeof (buf)); @@ -381,7 +388,7 @@ if (mx_get_magic (buf) <= 0) { mutt_error (_("%s is not a mailbox."), buf); -@@ -2209,6 +2225,12 @@ +@@ -2241,6 +2257,12 @@ mutt_what_key(); break; @@ -417,7 +424,7 @@ void mutt_tag_set_flag (int flag, int bf) --- a/functions.h +++ b/functions.h -@@ -169,6 +169,11 @@ +@@ -170,6 +170,11 @@ { "decrypt-save", OP_DECRYPT_SAVE, NULL }, @@ -429,7 +436,7 @@ { NULL, 0, NULL } }; -@@ -268,6 +273,11 @@ +@@ -274,6 +279,11 @@ { "what-key", OP_WHAT_KEY, NULL }, @@ -443,7 +450,7 @@ --- a/globals.h +++ b/globals.h -@@ -116,6 +116,7 @@ +@@ -117,6 +117,7 @@ WHERE char *SendCharset; WHERE char *Sendmail; WHERE char *Shell; @@ -451,7 +458,7 @@ WHERE char *Signature; WHERE char *SimpleSearch; #if USE_SMTP -@@ -208,6 +209,9 @@ +@@ -210,6 +211,9 @@ WHERE short ScoreThresholdRead; WHERE short ScoreThresholdFlag; @@ -461,16 +468,43 @@ #ifdef USE_IMAP WHERE short ImapKeepalive; WHERE short ImapPipelineDepth; +--- a/imap/command.c ++++ b/imap/command.c +@@ -1011,6 +1011,13 @@ + 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; + } +--- a/imap/imap.c ++++ b/imap/imap.c +@@ -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_exec (idata, command, IMAP_CMD_QUEUE) < 0) + { --- a/init.h +++ b/init.h -@@ -1594,6 +1594,22 @@ - ** you may \fIunset\fP 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 }, @@ -496,48 +530,6 @@ /* mx_open_new_message() */ #define M_ADD_FROM 1 /* add a From_ line */ ---- a/Makefile.am -+++ b/Makefile.am -@@ -29,7 +29,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 crypt-mod.c crypt-mod.h -+ url.c ascii.c crypt-mod.c crypt-mod.h \ -+ sidebar.c - - nodist_mutt_SOURCES = $(BUILT_SOURCES) - ---- a/Makefile.in -+++ b/Makefile.in -@@ -84,7 +84,7 @@ - thread.$(OBJEXT) charset.$(OBJEXT) history.$(OBJEXT) \ - lib.$(OBJEXT) muttlib.$(OBJEXT) editmsg.$(OBJEXT) \ - mbyte.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \ -- crypt-mod.$(OBJEXT) -+ crypt-mod.$(OBJEXT) sidebar.$(OBJEXT) - am__objects_1 = patchlist.$(OBJEXT) - nodist_mutt_OBJECTS = $(am__objects_1) - mutt_OBJECTS = $(am_mutt_OBJECTS) $(nodist_mutt_OBJECTS) -@@ -310,7 +310,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 crypt-mod.c crypt-mod.h -+ url.c ascii.c crypt-mod.c crypt-mod.h \ -+ sidebar.c - - nodist_mutt_SOURCES = $(BUILT_SOURCES) - mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \ -@@ -342,7 +343,7 @@ - README.SSL smime.h \ - muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ - ChangeLog mkchangelog.sh mutt_idna.h \ -- snprintf.c regex.c crypt-gpgme.h hcachever.sh.in -+ snprintf.c regex.c crypt-gpgme.h sidebar.h hcachever.sh.in - - EXTRA_SCRIPTS = smime_keys - mutt_dotlock_SOURCES = mutt_dotlock.c --- a/mbox.c +++ b/mbox.c @@ -104,6 +104,7 @@ @@ -548,7 +540,7 @@ ctx->mtime = sb.st_mtime; ctx->size = sb.st_size; -@@ -259,6 +260,7 @@ +@@ -255,6 +256,7 @@ ctx->size = sb.st_size; ctx->mtime = sb.st_mtime; @@ -652,7 +644,7 @@ menu_make_entry (buf, sizeof (buf), menu, menu->current); menu_pad_string (buf, sizeof (buf)); -@@ -886,7 +888,7 @@ +@@ -884,7 +886,7 @@ if (option (OPTARROWCURSOR)) @@ -661,28 +653,50 @@ else if (option (OPTBRAILLEFRIENDLY)) move (menu->current - menu->top + menu->offset, 0); else ---- a/mutt_curses.h -+++ b/mutt_curses.h -@@ -64,6 +64,7 @@ - #undef lines - #endif /* lines */ +--- a/mh.c ++++ b/mh.c +@@ -235,13 +235,37 @@ -+#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 @@ - MT_COLOR_BOLD, - MT_COLOR_UNDERLINE, - MT_COLOR_INDEX, -+ MT_COLOR_NEW, -+ MT_COLOR_FLAGGED, - MT_COLOR_MAX - }; + 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) + { + int fd; --- a/mutt.h +++ b/mutt.h -@@ -417,6 +417,7 @@ +@@ -431,6 +431,7 @@ OPTSAVEEMPTY, OPTSAVENAME, OPTSCORE, @@ -690,7 +704,7 @@ OPTSIGDASHES, OPTSIGONTOP, OPTSORTRE, -@@ -854,6 +855,7 @@ +@@ -874,6 +875,7 @@ { char *path; FILE *fp; @@ -698,7 +712,7 @@ time_t mtime; off_t size; off_t vsize; -@@ -894,6 +896,7 @@ +@@ -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 */ @@ -706,9 +720,28 @@ /* driver hooks */ void *data; /* driver specific data */ +--- a/mutt_curses.h ++++ b/mutt_curses.h +@@ -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 @@ + MT_COLOR_BOLD, + MT_COLOR_UNDERLINE, + MT_COLOR_INDEX, ++ MT_COLOR_NEW, ++ MT_COLOR_FLAGGED, + MT_COLOR_MAX + }; + --- a/muttlib.c +++ b/muttlib.c -@@ -1217,6 +1217,8 @@ +@@ -1286,6 +1286,8 @@ pl = pw = 1; /* see if there's room to add content, else ignore */ @@ -717,7 +750,7 @@ if ((col < COLS && wlen < destlen) || soft) { int pad; -@@ -1259,6 +1261,52 @@ +@@ -1329,6 +1331,52 @@ col += wid; src += pl; } @@ -772,7 +805,7 @@ else if (ch == '|') --- a/mx.c +++ b/mx.c -@@ -626,6 +626,7 @@ +@@ -595,6 +595,7 @@ * M_APPEND open mailbox for appending * M_READONLY open mailbox in read-only mode * M_QUIET only print error messages @@ -780,7 +813,7 @@ * ctx if non-null, context struct to use */ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx) -@@ -648,6 +649,8 @@ +@@ -617,6 +618,8 @@ ctx->quiet = 1; if (flags & M_READONLY) ctx->readonly = 1; @@ -789,7 +822,7 @@ if (flags & (M_APPEND|M_NEWFOLDER)) { -@@ -752,9 +755,21 @@ +@@ -721,9 +724,21 @@ void mx_fastclose_mailbox (CONTEXT *ctx) { int i; @@ -805,23 +838,22 @@ + { + 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); ---- a/OPS -+++ b/OPS -@@ -179,3 +179,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" -+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" + /* 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/mx.h ++++ b/mx.h +@@ -61,6 +61,7 @@ + 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 *); --- a/pager.c +++ b/pager.c @@ -29,6 +29,7 @@ @@ -832,16 +864,15 @@ #include "mutt_crypt.h" -@@ -1060,6 +1061,8 @@ +@@ -1095,6 +1096,7 @@ + wchar_t wc; mbstate_t mbstate; - 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)); -@@ -1694,7 +1697,7 @@ + + if (check_attachment_marker ((char *)buf) == 0) + wrap_cols = COLS; +@@ -1745,7 +1747,7 @@ if ((redraw & REDRAW_BODY) || topline != oldtopline) { do { @@ -850,7 +881,7 @@ curline = oldtopline = topline; lines = 0; force_redraw = 0; -@@ -1707,6 +1710,7 @@ +@@ -1758,6 +1760,7 @@ &QuoteList, &q_level, &force_redraw, &SearchRE) > 0) lines++; curline++; @@ -858,7 +889,7 @@ } last_offset = lineInfo[curline].offset; } while (force_redraw); -@@ -1720,6 +1724,7 @@ +@@ -1771,6 +1774,7 @@ addch ('~'); addch ('\n'); lines++; @@ -866,34 +897,33 @@ } /* We are going to update the pager status bar, so it isn't * necessary to reset to normal color now. */ -@@ -1743,22 +1748,22 @@ +@@ -1794,21 +1798,21 @@ /* 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 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); +- mutt_paddstr (COLS, buffer); ++ mutt_paddstr (COLS-SidebarWidth, buffer); } - else if (IsMsgAttach (extra)) + else { -- 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-SidebarWidth, bn); } -- 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)) -@@ -1775,18 +1780,23 @@ +@@ -1826,18 +1830,23 @@ /* redraw the pager_index indicator, because the * flags for this message might have changed. */ menu_redraw_current (index); @@ -919,7 +949,7 @@ redraw = 0; if (option(OPTBRAILLEFRIENDLY)) { -@@ -2684,6 +2694,13 @@ +@@ -2769,6 +2778,13 @@ mutt_what_key (); break; @@ -933,34 +963,27 @@ default: ch = -1; break; ---- a/PATCHES -+++ b/PATCHES -@@ -1,3 +1,4 @@ -+patch-1.5.19.sidebar.20090522.txt - patch-1.5.18.rr.compressed.1 - patch-1.5.4.vk.pgp_verbose_mime - patch-1.5.13.cd.purge_message.3.4 --- /dev/null +++ b/sidebar.c -@@ -0,0 +1,333 @@ +@@ -0,0 +1,336 @@ +/* + * 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 @@ -1082,6 +1105,8 @@ +int draw_sidebar(int menu) { + + int lines = option(OPTHELP) ? 1 : 0; ++ lines += option(OPTSTATUSONTOP) ? 1 : 0; ++ + BUFFY *tmp; +#ifndef USE_SLANG_CURSES + attr_t attrs; @@ -1161,8 +1186,9 @@ + + if ( Incoming == 0 ) return 0; + lines = option(OPTHELP) ? 1 : 0; /* go back to the top */ ++ lines += option(OPTSTATUSONTOP) ? 1 : 0; + -+ if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) ++ if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) + calc_boundaries(menu); + if ( CurBuffy == 0 ) CurBuffy = Incoming; + @@ -1201,7 +1227,7 @@ + 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++) @@ -1282,21 +1308,21 @@ +/* + * 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 @@ -1315,59 +1341,3 @@ +void set_buffystats(CONTEXT*); + +#endif /* SIDEBAR_H */ ---- a/doc/Muttrc -+++ b/doc/Muttrc -@@ -2167,6 +2167,26 @@ - # function. - # - # -+# set sidebar_visible=no -+# -+# 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 -@@ -1513,7 +1513,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_exec (idata, command, IMAP_CMD_QUEUE) < 0) - { ---- a/imap/command.c -+++ b/imap/command.c -@@ -1009,6 +1009,13 @@ - 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; - }