[mutt] 05/11: Replace our sidebar patches with neomutt's
Faidon Liambotis
paravoid at moszumanska.debian.org
Fri May 13 15:33:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
paravoid pushed a commit to branch wip-neomutt
in repository mutt.
commit e6eed36c020edcf2206c36ff923c4f0757af1b89
Author: Faidon Liambotis <paravoid at debian.org>
Date: Thu May 5 20:44:31 2016 +0300
Replace our sidebar patches with neomutt's
This replaces all 4 of our sidebar patches (and more!). Unfortunately,
needed a tiny fix over neomutt's sidebar because of our opposite
ordering vis-a-vis 11-ifdef.
---
debian/patches/mutt-patched/sidebar-compose.patch | 38 -
.../mutt-patched/sidebar-delimnullwide.patch | 44 -
debian/patches/mutt-patched/sidebar-newonly.patch | 197 --
debian/patches/mutt-patched/sidebar.patch | 2038 --------------------
debian/patches/neomutt/09-sidebar.patch | 29 +-
debian/patches/series | 5 +-
debian/rules | 1 +
7 files changed, 17 insertions(+), 2335 deletions(-)
diff --git a/debian/patches/mutt-patched/sidebar-compose.patch b/debian/patches/mutt-patched/sidebar-compose.patch
deleted file mode 100644
index 2251392..0000000
--- a/debian/patches/mutt-patched/sidebar-compose.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Evgeni Golov <evgeni at debian.org>
-Date: Fri, 14 Mar 2014 08:54:47 +0100
-Subject: sidebar-compose
-
-draw_sidebar sets SidebarWidth to 0 when sidebar_visible is false.
-However, if you start mutt in compose mode, draw_sidebar won't be
-called until the next redraw and your header lines will be off by
-the width of the sidebar, even when you did not want a sidebar at
-all.
-
-Can be tested with:
- HOME=/ LC_ALL=C mutt -e 'unset sidebar_visible' -s test recipient
-
-Closes: #502627
----
- compose.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/compose.c b/compose.c
-index 7ff2996..42bdb46 100644
---- a/compose.c
-+++ b/compose.c
-@@ -32,6 +32,7 @@
- #include "mailbox.h"
- #include "sort.h"
- #include "charset.h"
-+#include "sidebar.h"
-
- #ifdef MIXMASTER
- #include "remailer.h"
-@@ -248,6 +249,7 @@ static void draw_envelope_addr (int line, ADDRESS *addr)
-
- static void draw_envelope (HEADER *msg, char *fcc)
- {
-+ draw_sidebar (MENU_COMPOSE);
- draw_envelope_addr (HDR_FROM, msg->env->from);
- draw_envelope_addr (HDR_TO, msg->env->to);
- draw_envelope_addr (HDR_CC, msg->env->cc);
diff --git a/debian/patches/mutt-patched/sidebar-delimnullwide.patch b/debian/patches/mutt-patched/sidebar-delimnullwide.patch
deleted file mode 100644
index cd68402..0000000
--- a/debian/patches/mutt-patched/sidebar-delimnullwide.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Evgeni Golov <evgeni at debian.org>
-Date: Fri, 25 Dec 2015 12:02:08 +0100
-Subject: sidebar-delimnullwide
-
-SidebarDelim can be NULL and strlen(NULL) is a bad idea, as it will segfault.
-Wrap it with NONULL().
-
-While at it, change strlen to mbstowcs for better utf8 support.
-
-Closes: #696145, #663883
----
- sidebar.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/sidebar.c b/sidebar.c
-index e9d9eba..b75a0e3 100644
---- a/sidebar.c
-+++ b/sidebar.c
-@@ -30,6 +30,7 @@
- #include <libgen.h>
- #include "keymap.h"
- #include <stdbool.h>
-+#include <wchar.h>
-
- /*BUFFY *CurBuffy = 0;*/
- static BUFFY *TopBuffy = 0;
-@@ -150,7 +151,7 @@ char *make_sidebar_entry(char *box, unsigned int size, unsigned int new, unsigne
- struct sidebar_entry sbe;
- int SBvisual;
-
-- SBvisual = SidebarWidth - strlen(SidebarDelim);
-+ SBvisual = SidebarWidth - mbstowcs(NULL, NONULL(SidebarDelim), 0);
- if (SBvisual < 1)
- return NULL;
-
-@@ -193,7 +194,7 @@ int draw_sidebar(int menu) {
- #ifndef USE_SLANG_CURSES
- attr_t attrs;
- #endif
-- short delim_len = strlen(SidebarDelim);
-+ short delim_len = mbstowcs(NULL, NONULL(SidebarDelim), 0);
- short color_pair;
-
- static bool initialized = false;
diff --git a/debian/patches/mutt-patched/sidebar-newonly.patch b/debian/patches/mutt-patched/sidebar-newonly.patch
deleted file mode 100644
index 2219c0a..0000000
--- a/debian/patches/mutt-patched/sidebar-newonly.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From: Steve Kemp <steve at steve.org.uk>
-Date: Tue, 4 Mar 2014 22:07:06 +0100
-Subject: sidebar-newonly
-
-patches written by Steve Kemp, it adds two new functionalities to the sidebar,
-so only the mailbox with new messages will be shown (and/or) selected
-See Debian bug http://bugs.debian.org/532510
----
- OPS | 2 ++
- curs_main.c | 2 ++
- functions.h | 4 ++++
- init.h | 6 +++++-
- mutt.h | 2 ++
- pager.c | 2 ++
- sidebar.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 7 files changed, 70 insertions(+), 3 deletions(-)
-
-diff --git a/OPS b/OPS
-index b036db9..1ed9c96 100644
---- a/OPS
-+++ b/OPS
-@@ -185,3 +185,5 @@ 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"
-+OP_SIDEBAR_NEXT_NEW "go down to next mailbox with new mail"
-+OP_SIDEBAR_PREV_NEW "go to previous mailbox with new mail"
-diff --git a/curs_main.c b/curs_main.c
-index 7583eba..3ad22c4 100644
---- a/curs_main.c
-+++ b/curs_main.c
-@@ -2429,6 +2429,8 @@ int mutt_index_menu (void)
- case OP_SIDEBAR_SCROLL_DOWN:
- case OP_SIDEBAR_NEXT:
- case OP_SIDEBAR_PREV:
-+ case OP_SIDEBAR_NEXT_NEW:
-+ case OP_SIDEBAR_PREV_NEW:
- scroll_sidebar(op, menu->menu);
- break;
- default:
-diff --git a/functions.h b/functions.h
-index ef8937a..363b4d5 100644
---- a/functions.h
-+++ b/functions.h
-@@ -174,6 +174,8 @@ const struct binding_t OpMain[] = { /* map: index */
- { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL },
- { "sidebar-next", OP_SIDEBAR_NEXT, NULL },
- { "sidebar-prev", OP_SIDEBAR_PREV, NULL },
-+ { "sidebar-next-new", OP_SIDEBAR_NEXT_NEW, NULL},
-+ { "sidebar-prev-new", OP_SIDEBAR_PREV_NEW, NULL},
- { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
- { NULL, 0, NULL }
- };
-@@ -283,6 +285,8 @@ const struct binding_t OpPager[] = { /* map: pager */
- { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL },
- { "sidebar-next", OP_SIDEBAR_NEXT, NULL },
- { "sidebar-prev", OP_SIDEBAR_PREV, NULL },
-+ { "sidebar-next-new", OP_SIDEBAR_NEXT_NEW, NULL},
-+ { "sidebar-prev-new", OP_SIDEBAR_PREV_NEW, NULL},
- { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
- { NULL, 0, NULL }
- };
-diff --git a/init.h b/init.h
-index 2e7371c..b7aff80 100644
---- a/init.h
-+++ b/init.h
-@@ -2108,7 +2108,11 @@ struct option_t MuttVars[] = {
- ** .pp
- ** Should folders be indented in the sidebar.
- */
--
-+ {"sidebar_newmail_only", DT_BOOL, R_BOTH, OPTSIDEBARNEWMAILONLY, 0 },
-+ /*
-+ ** .pp
-+ ** Show only new mail in the sidebar.
-+ */
- { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
- /*
- ** .pp
-diff --git a/mutt.h b/mutt.h
-index 91e58e9..2a9f1e0 100644
---- a/mutt.h
-+++ b/mutt.h
-@@ -538,6 +538,8 @@ enum
- OPTDONTHANDLEPGPKEYS, /* (pseudo) used to extract PGP keys */
- OPTIGNOREMACROEVENTS, /* (pseudo) don't process macro/push/exec events while set */
-
-+ OPTSIDEBARNEWMAILONLY,
-+
- OPTMAX
- };
-
-diff --git a/pager.c b/pager.c
-index 676fd39..9a2b269 100644
---- a/pager.c
-+++ b/pager.c
-@@ -2808,6 +2808,8 @@ search_next:
- case OP_SIDEBAR_SCROLL_DOWN:
- case OP_SIDEBAR_NEXT:
- case OP_SIDEBAR_PREV:
-+ case OP_SIDEBAR_NEXT_NEW:
-+ case OP_SIDEBAR_PREV_NEW:
- scroll_sidebar(ch, MENU_PAGER);
- break;
-
-diff --git a/sidebar.c b/sidebar.c
-index b75a0e3..c298599 100644
---- a/sidebar.c
-+++ b/sidebar.c
-@@ -297,8 +297,21 @@ int draw_sidebar(int menu) {
- SETCOLOR(MT_COLOR_NEW);
- else if ( tmp->msg_flagged > 0 )
- SETCOLOR(MT_COLOR_FLAGGED);
-- else
-- SETCOLOR(MT_COLOR_NORMAL);
-+ else {
-+ /* make sure the path is either:
-+ 1. Containing new mail.
-+ 2. The inbox.
-+ 3. The current box.
-+ */
-+ if ((option (OPTSIDEBARNEWMAILONLY)) &&
-+ ( (tmp->msg_unread <= 0) &&
-+ ( tmp != Incoming ) &&
-+ Context &&
-+ ( strcmp( tmp->path, Context->path ) != 0 ) ) )
-+ continue;
-+ else
-+ SETCOLOR(MT_COLOR_NORMAL);
-+ }
-
- move( lines, 0 );
- if ( Context && Context->path &&
-@@ -358,6 +371,29 @@ int draw_sidebar(int menu) {
- return 0;
- }
-
-+BUFFY * exist_next_new()
-+{
-+ BUFFY *tmp = CurBuffy;
-+ if(tmp == NULL) return NULL;
-+ while (tmp->next != NULL)
-+ {
-+ tmp = tmp->next;
-+ if(tmp->msg_unread) return tmp;
-+ }
-+ return NULL;
-+}
-+
-+BUFFY * exist_prev_new()
-+{
-+ BUFFY *tmp = CurBuffy;
-+ if(tmp == NULL) return NULL;
-+ while (tmp->prev != NULL)
-+ {
-+ tmp = tmp->prev;
-+ if(tmp->msg_unread) return tmp;
-+ }
-+ return NULL;
-+}
-
- void set_buffystats(CONTEXT* Context)
- {
-@@ -376,18 +412,33 @@ void set_buffystats(CONTEXT* Context)
-
- void scroll_sidebar(int op, int menu)
- {
-+ BUFFY *tmp;
- if(!SidebarWidth) return;
- if(!CurBuffy) return;
-
- switch (op) {
- case OP_SIDEBAR_NEXT:
-+ if (!option (OPTSIDEBARNEWMAILONLY)) {
- if ( CurBuffy->next == NULL ) return;
- CurBuffy = CurBuffy->next;
- break;
-+ }
-+ case OP_SIDEBAR_NEXT_NEW:
-+ if ( (tmp = exist_next_new()) == NULL)
-+ return;
-+ else CurBuffy = tmp;
-+ break;
- case OP_SIDEBAR_PREV:
-+ if (!option (OPTSIDEBARNEWMAILONLY)) {
- if ( CurBuffy->prev == NULL ) return;
- CurBuffy = CurBuffy->prev;
- break;
-+ }
-+ case OP_SIDEBAR_PREV_NEW:
-+ if ( (tmp = exist_prev_new()) == NULL)
-+ return;
-+ else CurBuffy = tmp;
-+ break;
- case OP_SIDEBAR_SCROLL_UP:
- CurBuffy = TopBuffy;
- if ( CurBuffy != Incoming ) {
diff --git a/debian/patches/mutt-patched/sidebar.patch b/debian/patches/mutt-patched/sidebar.patch
deleted file mode 100644
index 54bb94e..0000000
--- a/debian/patches/mutt-patched/sidebar.patch
+++ /dev/null
@@ -1,2038 +0,0 @@
-From: Antonio Radici <antonio at debian.org>
-Date: Sat, 19 Sep 2015 13:19:55 +0200
-Subject: sidebar
-
-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_folderindent (boolean, default no)
-
- Should folders be indented in the sidebar.
-
- sidebar_format (string, default "%B%?F? [%F]?%* %?N?%N/?%4S")
-
- Format string for the sidebar. The sequences `%N', `%F' and `%S'
- will be replaced by the number of new or flagged messages or the total
- size of them mailbox. `%B' will be replaced with the name of the mailbox.
- The `%!' sequence will be expanded to `!' if there is one flagged message;
- to `!!' if there are two flagged messages; and to `n!' for n flagged
- messages, n>2.
-
- sidebar_indentstr (string, default " ")
-
- This specifies the string that is used to indent items
- with sidebar_folderindent= yes
-
- sidebar_shortpath (boolean, default no)
-
- Should the sidebar shorten the path showed.
-
- sidebar_sort (boolean, default no)
-
- This specifies whether or not to sort the sidebar alphabetically.
-
- 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/mutt-sidebar/
- - http://lunar-linux.org/~tchan/mutt/patch-1.5.24.sidebar.20151111.txt
-
-* Changes made:
- - 2008-08-02 myon: Refreshed patch using quilt push -f to remove hunks we do
- not need (Makefile.in).
-
- - 2014-03-04 evgeni: refresh sidebar patch with the version from OpenBSD
- Source:
- ftp://ftp.openbsd.org/pub/OpenBSD/distfiles/mutt/sidebar-1.5.22.diff1.gz
-
- - 2015-12-24 evgeni: refresh sidebar patch to the 20151111 version
-
-Signed-off-by: Evgeni Golov <evgeni at debian.org>
-Signed-off-by: Matteo F. Vescovi <mfv at debian.org>
----
- Makefile.am | 1 +
- OPS | 5 +
- buffy.c | 152 ++++++++++++++++++++-
- buffy.h | 6 +
- color.c | 2 +
- compose.c | 26 ++--
- configure.ac | 2 +
- curs_main.c | 37 +++++-
- doc/Muttrc | 20 +++
- flags.c | 3 +
- functions.h | 10 ++
- globals.h | 6 +
- handler.c | 30 ++++-
- imap/command.c | 7 +
- imap/imap.c | 2 +-
- init.h | 48 +++++++
- mailbox.h | 1 +
- main.c | 11 +-
- mbox.c | 2 +
- menu.c | 20 +--
- mh.c | 26 ++++
- mutt.h | 6 +
- mutt_curses.h | 3 +
- mutt_menu.h | 1 +
- muttlib.c | 48 +++++++
- mx.c | 24 +++-
- mx.h | 1 +
- pager.c | 42 +++++-
- pattern.c | 38 ++++++
- protos.h | 7 +
- sidebar.c | 410 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- sidebar.h | 36 +++++
- 32 files changed, 992 insertions(+), 41 deletions(-)
- create mode 100644 sidebar.c
- create mode 100644 sidebar.h
-
-diff --git a/Makefile.am b/Makefile.am
-index 9475381..c593f4f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -33,6 +33,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 mutt_idna.c \
- url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
-
-diff --git a/OPS b/OPS
-index 02cea8e..b036db9 100644
---- a/OPS
-+++ b/OPS
-@@ -180,3 +180,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 --git a/buffy.c b/buffy.c
-index c713d16..d34e6f5 100644
---- a/buffy.c
-+++ b/buffy.c
-@@ -161,6 +161,49 @@ void mutt_buffy_cleanup (const char *buf, struct stat *st)
- }
- }
-
-+static int buffy_compare_name(const void *a, const void *b) {
-+ const BUFFY *b1 = * (BUFFY * const *) a;
-+ const BUFFY *b2 = * (BUFFY * const *) b;
-+
-+ return mutt_strcoll(b1->path, b2->path);
-+}
-+
-+static BUFFY *buffy_sort(BUFFY *b)
-+{
-+ BUFFY *tmp = b;
-+ int buffycount = 0;
-+ BUFFY **ary;
-+ int i;
-+
-+ if (!option(OPTSIDEBARSORT))
-+ return b;
-+
-+ for (; tmp != NULL; tmp = tmp->next)
-+ buffycount++;
-+
-+ ary = (BUFFY **) safe_calloc(buffycount, sizeof (*ary));
-+
-+ tmp = b;
-+ for (i = 0; tmp != NULL; tmp = tmp->next, i++) {
-+ ary[i] = tmp;
-+ }
-+
-+ qsort(ary, buffycount, sizeof(*ary), buffy_compare_name);
-+
-+ for (i = 0; i < buffycount - 1; i++) {
-+ ary[i]->next = ary[i+1];
-+ }
-+ ary[buffycount - 1]->next = NULL;
-+ for (i = 1; i < buffycount; i++) {
-+ ary[i]->prev = ary[i-1];
-+ }
-+ ary[0]->prev = NULL;
-+
-+ tmp = ary[0];
-+ free(ary);
-+ return tmp;
-+}
-+
- BUFFY *mutt_find_mailbox (const char *path)
- {
- BUFFY *tmp = NULL;
-@@ -196,9 +239,13 @@ void mutt_update_mailbox (BUFFY * b)
- static BUFFY *buffy_new (const char *path)
- {
- BUFFY* buffy;
-+ char rp[PATH_MAX];
-+ char *r;
-
- buffy = (BUFFY *) safe_calloc (1, sizeof (BUFFY));
- strfcpy (buffy->path, path, sizeof (buffy->path));
-+ r = realpath(path, rp);
-+ strfcpy (buffy->realpath, r ? rp : path, sizeof (buffy->realpath));
- buffy->next = NULL;
- buffy->magic = 0;
-
-@@ -243,8 +290,8 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
- p = realpath (buf, f1);
- for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
- {
-- q = realpath ((*tmp)->path, f2);
-- if (mutt_strcmp (p ? p : buf, q ? q : (*tmp)->path) == 0)
-+ q = (*tmp)->realpath;
-+ if (mutt_strcmp (p ? p : buf, q) == 0)
- {
- dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path));
- break;
-@@ -282,6 +329,7 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
- else
- (*tmp)->size = 0;
- }
-+ Incoming = buffy_sort(Incoming);
- return 0;
- }
-
-@@ -306,6 +354,11 @@ static int buffy_maildir_dir_hasnew(BUFFY* mailbox, const char *dir_name)
- return 0;
- }
-
-+ if (option(OPTSIDEBAR) && mailbox->msg_unread > 0) {
-+ mailbox->new = 1;
-+ return 1;
-+ }
-+
- if ((dirp = opendir (path)) == NULL)
- {
- mailbox->magic = 0;
-@@ -357,6 +410,73 @@ static int buffy_maildir_hasnew (BUFFY* mailbox)
-
- return 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;
-+
-+ if(!option(OPTSIDEBAR))
-+ return;
-+
-+ 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++;
-+ }
-+ }
-+ }
-+ }
-+
-+ mailbox->sb_last_checked = time(NULL);
-+ closedir (dirp);
-+}
-+
- /* returns 1 if mailbox has new mail */
- static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
- {
-@@ -368,7 +488,7 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
- 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 ((!option(OPTSIDEBAR) && statcheck) || (option(OPTSIDEBAR) && mailbox->msg_unread > 0))
- {
- if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
- {
-@@ -388,6 +508,27 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
- return rc;
- }
-
-+/* update message counts for the sidebar */
-+void buffy_mbox_update (BUFFY* mailbox, struct stat *sb)
-+{
-+ CONTEXT *ctx = NULL;
-+
-+ if(!option(OPTSIDEBAR))
-+ return;
-+ if(mailbox->sb_last_checked > sb->st_mtime && mailbox->msgcount != 0)
-+ return; /* no check necessary */
-+
-+ 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;
-+ mailbox->msg_flagged = ctx->flagged;
-+ mailbox->sb_last_checked = time(NULL);
-+ mx_close_mailbox(ctx, 0);
-+ }
-+}
-+
- int mutt_buffy_check (int force)
- {
- BUFFY *tmp;
-@@ -461,17 +602,20 @@ int mutt_buffy_check (int force)
- {
- case M_MBOX:
- case M_MMDF:
-+ buffy_mbox_update (tmp, &sb);
- 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(tmp);
-+ mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged, &tmp->sb_last_checked);
-+ mh_buffy(tmp);
- if (tmp->new)
- BuffyCount++;
- break;
-diff --git a/buffy.h b/buffy.h
-index 9aa8e51..03c37df 100644
---- a/buffy.h
-+++ b/buffy.h
-@@ -23,13 +23,19 @@
- typedef struct buffy_t
- {
- char path[_POSIX_PATH_MAX];
-+ char realpath[_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 */
- time_t last_visited; /* time of last exit from this mailbox */
-+ time_t sb_last_checked; /* time of last buffy check from sidebar */
- }
- BUFFY;
-
-diff --git a/color.c b/color.c
-index 6e29603..3731c37 100644
---- a/color.c
-+++ b/color.c
-@@ -94,6 +94,8 @@ static const struct mapping_t Fields[] =
- { "underline", MT_COLOR_UNDERLINE },
- { "index", MT_COLOR_INDEX },
- { "prompt", MT_COLOR_PROMPT },
-+ { "sidebar_new", MT_COLOR_NEW },
-+ { "sidebar_flagged", MT_COLOR_FLAGGED },
- { NULL, 0 }
- };
-
-diff --git a/compose.c b/compose.c
-index 6af817f..7ff2996 100644
---- a/compose.c
-+++ b/compose.c
-@@ -72,7 +72,7 @@ enum
-
- #define HDR_XOFFSET 10
- #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
--#define W (COLS - HDR_XOFFSET)
-+#define W (COLS - HDR_XOFFSET - SidebarWidth)
-
- static const char * const Prompts[] =
- {
-@@ -110,7 +110,7 @@ static void snd_entry (char *b, size_t blen, MUTTMENU *menu, int num)
-
- static void redraw_crypt_lines (HEADER *msg)
- {
-- mvaddstr (HDR_CRYPT, 0, "Security: ");
-+ mvaddstr (HDR_CRYPT, SidebarWidth, "Security: ");
-
- if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
- {
-@@ -145,7 +145,7 @@ static void redraw_crypt_lines (HEADER *msg)
- addstr (_(" (OppEnc mode)"));
-
- clrtoeol ();
-- move (HDR_CRYPTINFO, 0);
-+ move (HDR_CRYPTINFO, SidebarWidth);
- clrtoeol ();
-
- if ((WithCrypto & APPLICATION_PGP)
-@@ -162,7 +162,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));
- }
- }
-@@ -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 *addr)
-
- 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)
- draw_envelope_addr (HDR_TO, msg->env->to);
- draw_envelope_addr (HDR_CC, msg->env->cc);
- draw_envelope_addr (HDR_BCC, msg->env->bcc);
-- 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"));
- clrtoeol ();
-
- NORMAL_COLOR;
-@@ -302,7 +302,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;
-@@ -564,7 +564,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */
- 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);
- if (msg->env->subject)
- mutt_paddstr (W, msg->env->subject);
- else
-@@ -582,7 +582,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */
- {
- 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 --git a/configure.ac b/configure.ac
-index 6c579dd..8c833fa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1306,6 +1306,8 @@ if test $mutt_cv_langinfo_yesexpr = yes; then
- AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ])
- fi
-
-+AC_CHECK_FUNCS(fmemopen open_memstream)
-+
- dnl Documentation tools
- have_openjade="no"
- AC_PATH_PROG([OSPCAT], [ospcat], [none])
-diff --git a/curs_main.c b/curs_main.c
-index f418f67..7583eba 100644
---- a/curs_main.c
-+++ b/curs_main.c
-@@ -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"
-@@ -672,20 +674,31 @@ 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_STATUS;
-+ if (option (OPTBEEPNEW))
-+ beep ();
-+ }
- }
- else
- do_buffy_notify = 1;
- }
-
-+ if(option(OPTSIDEBAR))
-+ menu->redraw |= REDRAW_SIDEBAR;
-+
- if (op != -1)
- mutt_curs_set (0);
-
- if (menu->redraw & REDRAW_FULL)
- {
- menu_redraw_full (menu);
-+ draw_sidebar(menu->menu);
- mutt_show_error ();
-+ } else if(menu->redraw & REDRAW_SIDEBAR) {
-+ draw_sidebar(menu->menu);
-+ menu->redraw &= ~REDRAW_SIDEBAR;
- }
-
- if (menu->menu == MENU_MAIN)
-@@ -707,9 +720,12 @@ int mutt_index_menu (void)
-
- if (menu->redraw & REDRAW_STATUS)
- {
-+ DrawFullLine = 1;
- menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
-+ DrawFullLine = 0;
- move (option (OPTSTATUSONTOP) ? 0 : LINES-2, 0);
- SETCOLOR (MT_COLOR_STATUS);
-+ set_buffystats(Context);
- mutt_paddstr (COLS, buf);
- NORMAL_COLOR;
- menu->redraw &= ~REDRAW_STATUS;
-@@ -729,7 +745,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
-@@ -1170,6 +1186,7 @@ int mutt_index_menu (void)
- break;
-
- CHECK_MSGCOUNT;
-+ CHECK_VISIBLE;
- CHECK_READONLY;
- {
- int oldvcount = Context->vcount;
-@@ -1229,6 +1246,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:
-
-@@ -1260,7 +1278,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)
- {
-@@ -1278,6 +1300,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);
-@@ -2402,6 +2425,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 --git a/doc/Muttrc b/doc/Muttrc
-index c8689d0..01272c7 100644
---- a/doc/Muttrc
-+++ b/doc/Muttrc
-@@ -657,6 +657,26 @@ attachments -I message/external-body
- # $crypt_autosign, $crypt_replysign and $smime_is_default.
- #
- #
-+# 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
-diff --git a/flags.c b/flags.c
-index 5309bb7..8776b18 100644
---- a/flags.c
-+++ b/flags.c
-@@ -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)
- {
-@@ -290,6 +292,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
- */
- 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 --git a/functions.h b/functions.h
-index 26171a0..ef8937a 100644
---- a/functions.h
-+++ b/functions.h
-@@ -170,6 +170,11 @@ const 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 }
- };
-
-@@ -274,6 +279,11 @@ const 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 --git a/globals.h b/globals.h
-index 241758d..92de9db 100644
---- a/globals.h
-+++ b/globals.h
-@@ -118,6 +118,9 @@ WHERE short SearchContext;
- WHERE char *SendCharset;
- WHERE char *Sendmail;
- WHERE char *Shell;
-+WHERE char *SidebarDelim;
-+WHERE char *SidebarFormat;
-+WHERE char *SidebarIndentStr;
- WHERE char *Signature;
- WHERE char *SimpleSearch;
- #if USE_SMTP
-@@ -215,6 +218,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 --git a/handler.c b/handler.c
-index 4944d49..d7fde34 100644
---- a/handler.c
-+++ b/handler.c
-@@ -1603,6 +1603,11 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
-
- fseeko (s->fpin, b->offset, 0);
-
-+#ifdef HAVE_FMEMOPEN
-+ char *temp;
-+ size_t tempsize;
-+#endif
-+
- /* see if we need to decode this part before processing it */
- if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE ||
- b->encoding == ENCUUENCODED || plaintext ||
-@@ -1618,6 +1623,14 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
- {
- /* decode to a tempfile, saving the original destination */
- fp = s->fpout;
-+#ifdef HAVE_FMEMOPEN
-+ if ((s->fpout = open_memstream(&temp, &tempsize)) == NULL)
-+ {
-+ mutt_error _("Unable to open memory stream!");
-+ dprint (1, (debugfile, "Can't open memory stream.\n"));
-+ return -1;
-+ }
-+#else
- mutt_mktemp (tempfile, sizeof (tempfile));
- if ((s->fpout = safe_fopen (tempfile, "w")) == NULL)
- {
-@@ -1625,6 +1638,7 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
- dprint (1, (debugfile, "Can't open %s.\n", tempfile));
- return -1;
- }
-+#endif
- /* decoding the attachment changes the size and offset, so save a copy
- * of the "real" values now, and restore them after processing
- */
-@@ -1653,9 +1667,19 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
- /* restore final destination and substitute the tempfile for input */
- s->fpout = fp;
- fp = s->fpin;
-+#ifdef HAVE_FMEMOPEN
-+ if(tempsize)
-+ s->fpin = fmemopen(temp, tempsize, "r");
-+ else /* fmemopen cannot handle zero-length buffers */
-+ s->fpin = safe_fopen ("/dev/null", "r");
-+ if(s->fpin == NULL) {
-+ mutt_perror("failed to re-open memstream!");
-+ return (-1);
-+ }
-+#else
- s->fpin = fopen (tempfile, "r");
- unlink (tempfile);
--
-+#endif
- /* restore the prefix */
- s->prefix = savePrefix;
- }
-@@ -1680,6 +1704,10 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
-
- /* restore the original source stream */
- safe_fclose (&s->fpin);
-+#ifdef HAVE_FMEMOPEN
-+ if(tempsize)
-+ FREE(&temp);
-+#endif
- s->fpin = fp;
- }
- }
-diff --git a/imap/command.c b/imap/command.c
-index d99a99a..5068fca 100644
---- a/imap/command.c
-+++ b/imap/command.c
-@@ -1016,6 +1016,13 @@ static void cmd_parse_status (IMAP_DATA* idata, char* s)
- 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 --git a/imap/imap.c b/imap/imap.c
-index a8476a4..5dab152 100644
---- a/imap/imap.c
-+++ b/imap/imap.c
-@@ -1541,7 +1541,7 @@ int imap_buffy_check (int force)
-
- imap_munge_mbox_name (idata, 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 --git a/init.h b/init.h
-index 246020b..2e7371c 100644
---- a/init.h
-+++ b/init.h
-@@ -2061,6 +2061,54 @@ struct option_t MuttVars[] = {
- ** not used.
- ** (PGP only)
- */
-+ {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, UL "|"},
-+ /*
-+ ** .pp
-+ ** This specifies the delimiter between the sidebar (if visible) and
-+ ** other screens.
-+ */
-+ {"sidebar_indentstr", DT_STR, R_BOTH, UL &SidebarIndentStr, UL " "},
-+ /*
-+ ** .pp
-+ ** This specifies the string that is used to indent items
-+ ** with sidebar_folderindent= yes
-+ */
-+ { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 },
-+ /*
-+ ** .pp
-+ ** This specifies whether or not to show sidebar (left-side list of folders).
-+ */
-+ { "sidebar_sort", DT_BOOL, R_BOTH, OPTSIDEBARSORT, 0 },
-+ /*
-+ ** .pp
-+ ** This specifies whether or not to sort the sidebar alphabetically.
-+ */
-+ { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 },
-+ /*
-+ ** .pp
-+ ** The width of the sidebar.
-+ */
-+ { "sidebar_shortpath", DT_BOOL, R_BOTH, OPTSIDEBARSHORTPATH, 0 },
-+ /*
-+ ** .pp
-+ ** Should the sidebar shorten the path showed.
-+ */
-+ {"sidebar_format", DT_STR, R_NONE, UL &SidebarFormat, UL "%B%?F? [%F]?%* %?N?%N/?%4S"},
-+ /*
-+ ** .pp
-+ ** Format string for the sidebar. The sequences `%N', `%F' and `%S'
-+ ** will be replaced by the number of new or flagged messages or the total
-+ ** size of them mailbox. `%B' will be replaced with the name of the mailbox.
-+ ** The `%!' sequence will be expanded to `!' if there is one flagged message;
-+ ** to `!!' if there are two flagged messages; and to `n!' for n flagged
-+ ** messages, n>2.
-+ */
-+ { "sidebar_folderindent", DT_BOOL, R_BOTH, OPTSIDEBARFOLDERINDENT, 0 },
-+ /*
-+ ** .pp
-+ ** Should folders be indented in the sidebar.
-+ */
-+
- { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
- /*
- ** .pp
-diff --git a/mailbox.h b/mailbox.h
-index 2b2c9a1..000503d 100644
---- a/mailbox.h
-+++ b/mailbox.h
-@@ -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<<0) /* add a From_ line */
-diff --git a/main.c b/main.c
-index 0b60d85..0e11dc5 100644
---- a/main.c
-+++ b/main.c
-@@ -50,6 +50,7 @@
- #include <unistd.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#include <limits.h>
- #include <sys/utsname.h>
-
- #ifdef HAVE_GETOPT_H
-@@ -563,7 +564,7 @@ init_extended_keys();
-
- int main (int argc, char **argv)
- {
-- char folder[_POSIX_PATH_MAX] = "";
-+ char folder[PATH_MAX] = "";
- char *subject = NULL;
- char *includeFile = NULL;
- char *draftFile = NULL;
-@@ -1204,6 +1205,13 @@ int main (int argc, char **argv)
- strfcpy (folder, NONULL(Spoolfile), sizeof (folder));
- mutt_expand_path (folder, sizeof (folder));
-
-+ {
-+ char tmpfolder[PATH_MAX];
-+ strfcpy (tmpfolder, folder, sizeof (tmpfolder));
-+ if(!realpath(tmpfolder, folder))
-+ strfcpy (folder, tmpfolder, sizeof (tmpfolder));
-+ }
-+
- mutt_str_replace (&CurrentFolder, folder);
- mutt_str_replace (&LastFolder, folder);
-
-@@ -1226,6 +1234,7 @@ int main (int argc, char **argv)
- if((Context = mx_open_mailbox (folder, ((flags & M_RO) || option (OPTREADONLY)) ? M_READONLY : 0, NULL))
- || !explicit_folder)
- {
-+ set_curbuffy(folder);
- mutt_index_menu ();
- if (Context)
- FREE (&Context);
-diff --git a/mbox.c b/mbox.c
-index 9ff8512..e2818a5 100644
---- a/mbox.c
-+++ b/mbox.c
-@@ -104,6 +104,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;
-
-@@ -255,6 +256,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 --git a/menu.c b/menu.c
-index 4b13e7c..379b94c 100644
---- a/menu.c
-+++ b/menu.c
-@@ -24,6 +24,7 @@
- #include "mutt_curses.h"
- #include "mutt_menu.h"
- #include "mbyte.h"
-+#include "sidebar.h"
-
- char* SearchBuffers[MENU_MAX];
-
-@@ -184,7 +185,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;
-@@ -237,6 +238,7 @@ void menu_redraw_index (MUTTMENU *menu)
- int do_color;
- int attr;
-
-+ draw_sidebar(1);
- for (i = menu->top; i < menu->top + menu->pagelen; i++)
- {
- if (i < menu->max)
-@@ -247,7 +249,7 @@ void menu_redraw_index (MUTTMENU *menu)
- menu_pad_string (buf, sizeof (buf));
-
- ATTRSET(attr);
-- move(i - menu->top + menu->offset, 0);
-+ move(i - menu->top + menu->offset, SidebarWidth);
- do_color = 1;
-
- if (i == menu->current)
-@@ -270,7 +272,7 @@ void menu_redraw_index (MUTTMENU *menu)
- else
- {
- NORMAL_COLOR;
-- CLEARLINE(i - menu->top + menu->offset);
-+ CLEARLINE_WIN (i - menu->top + menu->offset);
- }
- }
- NORMAL_COLOR;
-@@ -287,7 +289,7 @@ void menu_redraw_motion (MUTTMENU *menu)
- return;
- }
-
-- move (menu->oldcurrent + menu->offset - menu->top, 0);
-+ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
- ATTRSET(menu->color (menu->oldcurrent));
-
- if (option (OPTARROWCURSOR))
-@@ -299,13 +301,13 @@ void menu_redraw_motion (MUTTMENU *menu)
- {
- 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);
- }
-
- /* now draw it in the new location */
- SETCOLOR(MT_COLOR_INDICATOR);
-- mvaddstr(menu->current + menu->offset - menu->top, 0, "->");
-+ mvaddstr(menu->current + menu->offset - menu->top, SidebarWidth, "->");
- }
- else
- {
-@@ -318,7 +320,7 @@ void menu_redraw_motion (MUTTMENU *menu)
- menu_make_entry (buf, sizeof (buf), menu, menu->current);
- menu_pad_string (buf, sizeof (buf));
- SETCOLOR(MT_COLOR_INDICATOR);
-- move(menu->current - menu->top + menu->offset, 0);
-+ move(menu->current - menu->top + menu->offset, SidebarWidth);
- print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
- }
- menu->redraw &= REDRAW_STATUS;
-@@ -330,7 +332,7 @@ void menu_redraw_current (MUTTMENU *menu)
- char buf[LONG_STRING];
- int attr = menu->color (menu->current);
-
-- 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));
-
-@@ -882,7 +884,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 --git a/mh.c b/mh.c
-index bc87660..3121fca 100644
---- a/mh.c
-+++ b/mh.c
-@@ -295,6 +295,32 @@ void mh_buffy(BUFFY *b)
- mhs_free_sequences (&mhs);
- }
-
-+void mh_buffy_update (const char *path, int *msgcount, int *msg_unread, int *msg_flagged, time_t *sb_last_checked)
-+{
-+ int i;
-+ struct mh_sequences mhs;
-+ memset (&mhs, 0, sizeof (mhs));
-+
-+ if(!option(OPTSIDEBAR))
-+ return;
-+
-+ 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);
-+ *sb_last_checked = time(NULL);
-+}
-+
- static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
- {
- int fd;
-diff --git a/mutt.h b/mutt.h
-index 26f260e..91e58e9 100644
---- a/mutt.h
-+++ b/mutt.h
-@@ -441,6 +441,10 @@ enum
- OPTSAVEEMPTY,
- OPTSAVENAME,
- OPTSCORE,
-+ OPTSIDEBAR,
-+ OPTSIDEBARSHORTPATH,
-+ OPTSIDEBARSORT,
-+ OPTSIDEBARFOLDERINDENT,
- OPTSIGDASHES,
- OPTSIGONTOP,
- OPTSORTRE,
-@@ -887,6 +891,7 @@ typedef struct _context
- {
- char *path;
- FILE *fp;
-+ time_t atime;
- time_t mtime;
- off_t size;
- off_t vsize;
-@@ -927,6 +932,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 --git a/mutt_curses.h b/mutt_curses.h
-index 93d9aea..888aa1c 100644
---- 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)
-@@ -124,6 +125,8 @@ enum
- MT_COLOR_UNDERLINE,
- MT_COLOR_INDEX,
- MT_COLOR_PROMPT,
-+ MT_COLOR_NEW,
-+ MT_COLOR_FLAGGED,
- MT_COLOR_MAX
- };
-
-diff --git a/mutt_menu.h b/mutt_menu.h
-index bbcd722..4999748 100644
---- a/mutt_menu.h
-+++ b/mutt_menu.h
-@@ -34,6 +34,7 @@
- #define REDRAW_FULL (1<<5)
- #define REDRAW_BODY (1<<6)
- #define REDRAW_SIGWINCH (1<<7)
-+#define REDRAW_SIDEBAR (1<<8)
-
- #define M_MODEFMT "-- Mutt: %s"
-
-diff --git a/muttlib.c b/muttlib.c
-index 53cb4a3..3c4e768 100644
---- a/muttlib.c
-+++ b/muttlib.c
-@@ -1282,6 +1282,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;
-@@ -1325,6 +1327,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 --git a/mx.c b/mx.c
-index be2d0e9..16fcdf4 100644
---- a/mx.c
-+++ b/mx.c
-@@ -595,6 +595,7 @@ static int mx_open_mailbox_append (CONTEXT *ctx, int flags)
- * 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)
-@@ -617,6 +618,8 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
- ctx->quiet = 1;
- if (flags & M_READONLY)
- ctx->readonly = 1;
-+ if (flags & M_PEEK)
-+ ctx->peekonly = 1;
-
- if (flags & (M_APPEND|M_NEWFOLDER))
- {
-@@ -721,13 +724,26 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
- 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 */
-- mutt_buffy_setnotified(ctx->path);
-+ if(!ctx->peekonly)
-+ mutt_buffy_setnotified(ctx->path);
-
- if (ctx->mx_close)
- ctx->mx_close (ctx);
-@@ -739,6 +755,8 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
- mutt_clear_threads (ctx);
- for (i = 0; i < ctx->msgcount; i++)
- mutt_free_header (&ctx->hdrs[i]);
-+ ctx->msgcount -= ctx->deleted;
-+ set_buffystats(ctx);
- FREE (&ctx->hdrs);
- FREE (&ctx->v2r);
- #ifdef USE_COMPRESSED
-@@ -895,6 +913,10 @@ int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
- if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->read
- && !(ctx->hdrs[i]->flagged && option (OPTKEEPFLAGGED)))
- read_msgs++;
-+ if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->read)
-+ ctx->unread--;
-+ if (ctx->hdrs[i]->deleted && ctx->hdrs[i]->flagged)
-+ ctx->flagged--;
- }
-
- if (read_msgs && quadoption (OPT_MOVE) != M_NO)
-diff --git a/mx.h b/mx.h
-index d926cf6..ab398cb 100644
---- a/mx.h
-+++ b/mx.h
-@@ -60,6 +60,7 @@ void mbox_reset_atime (CONTEXT *, struct stat *);
- int mh_read_dir (CONTEXT *, const char *);
- int mh_sync_mailbox (CONTEXT *, int *);
- int mh_check_mailbox (CONTEXT *, int *);
-+void mh_buffy_update (const char *, int *, int *, int *, time_t *);
- int mh_check_empty (const char *);
-
- int maildir_read_dir (CONTEXT *);
-diff --git a/pager.c b/pager.c
-index b9f72c2..676fd39 100644
---- a/pager.c
-+++ b/pager.c
-@@ -29,6 +29,7 @@
- #include "pager.h"
- #include "attach.h"
- #include "mbyte.h"
-+#include "sidebar.h"
-
- #include "mutt_crypt.h"
-
-@@ -1096,6 +1097,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
- 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;
-@@ -1573,6 +1575,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
-
- int bodyoffset = 1; /* offset of first line of real text */
- int statusoffset = 0; /* offset for the status bar */
-+ int statuswidth;
- int helpoffset = LINES - 2; /* offset for the help bar. */
- int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
-
-@@ -1747,7 +1750,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
- if ((redraw & REDRAW_BODY) || topline != oldtopline)
- {
- do {
-- move (bodyoffset, 0);
-+ move (bodyoffset, SidebarWidth);
- curline = oldtopline = topline;
- lines = 0;
- force_redraw = 0;
-@@ -1760,6 +1763,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
- &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
- lines++;
- curline++;
-+ move(lines + bodyoffset, SidebarWidth);
- }
- last_offset = lineInfo[curline].offset;
- } while (force_redraw);
-@@ -1772,6 +1776,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
- addch ('~');
- addch ('\n');
- lines++;
-+ move(lines + bodyoffset, SidebarWidth);
- }
- NORMAL_COLOR;
-
-@@ -1789,29 +1794,39 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
- hfi.ctx = Context;
- hfi.pager_progress = pager_progress_str;
-
-+ statuswidth = COLS - (option(OPTSTATUSONTOP) && PagerIndexLines > 0 ? SidebarWidth : 0);
-+
- if (last_pos < sb.st_size - 1)
- snprintf(pager_progress_str, sizeof(pager_progress_str), OFF_T_FMT "%%", (100 * last_offset / sb.st_size));
- else
- strfcpy(pager_progress_str, (topline == 0) ? "all" : "end", sizeof(pager_progress_str));
-
- /* print out the pager status bar */
-- move (statusoffset, 0);
-+ move (statusoffset, SidebarWidth);
- SETCOLOR (MT_COLOR_STATUS);
-+ if(option(OPTSTATUSONTOP) && PagerIndexLines > 0) {
-+ CLEARLINE_WIN (statusoffset);
-+ } else {
-+ CLEARLINE (statusoffset);
-+ DrawFullLine = 1; /* for mutt_make_string_info */
-+ }
-
- if (IsHeader (extra) || IsMsgAttach (extra))
- {
-- size_t l1 = COLS * MB_LEN_MAX;
-+ size_t l1 = statuswidth * 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 (statuswidth, buffer);
- }
- else
- {
- char bn[STRING];
- snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);
-- mutt_paddstr (COLS, bn);
-+ mutt_paddstr (statuswidth, bn);
- }
-+ if(!option(OPTSTATUSONTOP) || PagerIndexLines == 0)
-+ DrawFullLine = 0; /* reset */
- NORMAL_COLOR;
- if (option(OPTTSENABLED) && TSSupported)
- {
-@@ -1827,16 +1842,22 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
- /* 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)),
-+ (option(OPTSTATUSONTOP) ? 0: SidebarWidth));
- SETCOLOR (MT_COLOR_STATUS);
-- mutt_paddstr (COLS, buffer);
-+ mutt_paddstr (COLS - (option(OPTSTATUSONTOP) ? 0 : SidebarWidth), buffer);
- NORMAL_COLOR;
- }
-
-+ /* if we're not using the index, update every time */
-+ if ( index == 0 )
-+ draw_sidebar(MENU_PAGER);
-+
- redraw = 0;
-
- if (option(OPTBRAILLEFRIENDLY)) {
-@@ -2783,6 +2804,13 @@ search_next:
- 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;
- break;
-diff --git a/pattern.c b/pattern.c
-index aeef591..406fd84 100644
---- a/pattern.c
-+++ b/pattern.c
-@@ -154,6 +154,10 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
- HEADER *h = ctx->hdrs[msgno];
- char *buf;
- size_t blen;
-+#ifdef HAVE_FMEMOPEN
-+ char *temp;
-+ size_t tempsize;
-+#endif
-
- if ((msg = mx_open_message (ctx, msgno)) != NULL)
- {
-@@ -163,12 +167,20 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
- memset (&s, 0, sizeof (s));
- s.fpin = msg->fp;
- s.flags = M_CHARCONV;
-+#ifdef HAVE_FMEMOPEN
-+ if((s.fpout = open_memstream(&temp, &tempsize)) == NULL)
-+ {
-+ mutt_perror ("Error opening memstream");
-+ return (0);
-+ }
-+#else
- mutt_mktemp (tempfile, sizeof (tempfile));
- if ((s.fpout = safe_fopen (tempfile, "w+")) == NULL)
- {
- mutt_perror (tempfile);
- return (0);
- }
-+#endif
-
- if (pat->op != M_BODY)
- mutt_copy_header (msg->fp, h, s.fpout, CH_FROM | CH_DECODE, NULL);
-@@ -184,7 +196,11 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
- if (s.fpout)
- {
- safe_fclose (&s.fpout);
-+#ifdef HAVE_FMEMOPEN
-+ FREE(&temp);
-+#else
- unlink (tempfile);
-+#endif
- }
- return (0);
- }
-@@ -193,11 +209,28 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
- mutt_body_handler (h->content, &s);
- }
-
-+#ifdef HAVE_FMEMOPEN
-+ fclose(s.fpout);
-+ lng = tempsize;
-+
-+ if(tempsize) {
-+ if ((fp = fmemopen(temp, tempsize, "r")) == NULL) {
-+ mutt_perror ("Error re-opening memstream");
-+ return (0);
-+ }
-+ } else { /* fmemopen cannot handle empty buffers */
-+ if ((fp = safe_fopen ("/dev/null", "r")) == NULL) {
-+ mutt_perror ("Error opening /dev/null");
-+ return (0);
-+ }
-+ }
-+#else
- fp = s.fpout;
- fflush (fp);
- fseek (fp, 0, 0);
- fstat (fileno (fp), &st);
- lng = (long) st.st_size;
-+#endif
- }
- else
- {
-@@ -244,7 +277,12 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
- if (option (OPTTHOROUGHSRC))
- {
- safe_fclose (&fp);
-+#ifdef HAVE_FMEMOPEN
-+ if(tempsize)
-+ FREE (&temp);
-+#else
- unlink (tempfile);
-+#endif
- }
- }
-
-diff --git a/protos.h b/protos.h
-index 98a207a..5c83f82 100644
---- a/protos.h
-+++ b/protos.h
-@@ -36,6 +36,13 @@ struct hdr_format_info
- const char *pager_progress;
- };
-
-+struct sidebar_entry {
-+ char box[SHORT_STRING];
-+ unsigned int size;
-+ unsigned int new;
-+ unsigned int flagged;
-+};
-+
- void mutt_make_string_info (char *, size_t, const char *, struct hdr_format_info *, format_flag);
-
- int mutt_extract_token (BUFFER *, BUFFER *, int);
-diff --git a/sidebar.c b/sidebar.c
-new file mode 100644
-index 0000000..e9d9eba
---- /dev/null
-+++ b/sidebar.c
-@@ -0,0 +1,410 @@
-+/*
-+ * Copyright (C) ????-2004 Justin Hibbits <jrh29 at po.cwru.edu>
-+ * Copyright (C) 2004 Thomer M. Gil <mutt at 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;
-+
-+void calc_boundaries() {
-+
-+ BUFFY *tmp = Incoming;
-+
-+ int count = LINES - 2 - (option(OPTHELP) ? 1 : 0);
-+
-+ if ( known_lines != LINES ) {
-+ TopBuffy = BottomBuffy = 0;
-+ known_lines = LINES;
-+ }
-+ for ( ; tmp->next != 0; tmp = tmp->next )
-+ tmp->next->prev = tmp;
-+
-+ if ( TopBuffy == 0 && BottomBuffy == 0 )
-+ TopBuffy = Incoming;
-+ if ( BottomBuffy == 0 ) {
-+ BottomBuffy = TopBuffy;
-+ while ( --count && BottomBuffy->next )
-+ BottomBuffy = BottomBuffy->next;
-+ }
-+ else if ( TopBuffy == CurBuffy->next ) {
-+ BottomBuffy = CurBuffy;
-+ tmp = BottomBuffy;
-+ while ( --count && tmp->prev)
-+ tmp = tmp->prev;
-+ TopBuffy = tmp;
-+ }
-+ else if ( BottomBuffy == CurBuffy->prev ) {
-+ TopBuffy = CurBuffy;
-+ tmp = TopBuffy;
-+ while ( --count && tmp->next )
-+ tmp = tmp->next;
-+ BottomBuffy = tmp;
-+ }
-+}
-+
-+static const char *
-+sidebar_format_str (char *dest,
-+ size_t destlen,
-+ size_t col,
-+ char op,
-+ const char *src,
-+ const char *prefix,
-+ const char *ifstring,
-+ const char *elsestring,
-+ unsigned long data,
-+ format_flag flags)
-+{
-+/* casting from unsigned long - srsly?! */
-+struct sidebar_entry *sbe = (struct sidebar_entry *) data;
-+unsigned int optional;
-+char fmt[SHORT_STRING], buf[SHORT_STRING];
-+
-+optional = flags & M_FORMAT_OPTIONAL;
-+
-+switch(op) {
-+ case 'F':
-+ if(!optional) {
-+ snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-+ snprintf (dest, destlen, fmt, sbe->flagged);
-+ } else if(sbe->flagged == 0) {
-+ optional = 0;
-+ }
-+ break;
-+
-+ case '!':
-+ if(sbe->flagged == 0)
-+ mutt_format_s(dest, destlen, prefix, "");
-+ if(sbe->flagged == 1)
-+ mutt_format_s(dest, destlen, prefix, "!");
-+ if(sbe->flagged == 2)
-+ mutt_format_s(dest, destlen, prefix, "!!");
-+ if(sbe->flagged > 2) {
-+ snprintf (buf, sizeof (buf), "%d!", sbe->flagged);
-+ mutt_format_s(dest, destlen, prefix, buf);
-+ }
-+ break;
-+
-+ case 'S':
-+ if(!optional) {
-+ snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-+ snprintf (dest, destlen, fmt, sbe->size);
-+ } else if (sbe->size == 0) {
-+ optional = 0;
-+ }
-+ break;
-+
-+ case 'N':
-+ if(!optional) {
-+ snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-+ snprintf (dest, destlen, fmt, sbe->new);
-+ } else if(sbe->new == 0) {
-+ optional = 0;
-+ }
-+ break;
-+
-+ case 'B':
-+ mutt_format_s(dest, destlen, prefix, sbe->box);
-+ break;
-+ }
-+
-+ if(optional)
-+ mutt_FormatString (dest, destlen, col, ifstring, sidebar_format_str, (unsigned long) sbe, flags);
-+ else if (flags & M_FORMAT_OPTIONAL)
-+ mutt_FormatString (dest, destlen, col, elsestring, sidebar_format_str, (unsigned long) sbe, flags);
-+
-+ return (src);
-+}
-+
-+char *make_sidebar_entry(char *box, unsigned int size, unsigned int new, unsigned int flagged) {
-+ static char *entry = 0;
-+ struct sidebar_entry sbe;
-+ int SBvisual;
-+
-+ SBvisual = SidebarWidth - strlen(SidebarDelim);
-+ if (SBvisual < 1)
-+ return NULL;
-+
-+ sbe.new = new;
-+ sbe.flagged = flagged;
-+ sbe.size = size;
-+ strncpy(sbe.box, box, 31);
-+
-+ safe_realloc(&entry, SBvisual + 2);
-+ entry[SBvisual + 1] = '\0';
-+
-+ mutt_FormatString (entry, SBvisual+1, 0, SidebarFormat, sidebar_format_str, (unsigned long) &sbe, 0);
-+
-+ return entry;
-+}
-+
-+void set_curbuffy(char buf[LONG_STRING])
-+{
-+ BUFFY* tmp = CurBuffy = Incoming;
-+
-+ if (!Incoming)
-+ return;
-+
-+ while(1) {
-+ if(!strcmp(tmp->path, buf) || !strcmp(tmp->realpath, buf)) {
-+ CurBuffy = tmp;
-+ break;
-+ }
-+
-+ if(tmp->next)
-+ tmp = tmp->next;
-+ else
-+ break;
-+ }
-+}
-+
-+int draw_sidebar(int menu) {
-+
-+ 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;
-+ int lines = 0;
-+ int SidebarHeight;
-+
-+ if(option(OPTSTATUSONTOP) || option(OPTHELP))
-+ lines++; /* either one will occupy the first line */
-+
-+ /* 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)) {
-+ mutt_buffy_check(1); /* we probably have bad or no numbers */
-+ 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 */
-+
-+ SidebarHeight = LINES - 1;
-+ if(option(OPTHELP) || !option(OPTSTATUSONTOP))
-+ SidebarHeight--;
-+
-+ for ( ; lines < SidebarHeight; 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 = 0;
-+ if(option(OPTSTATUSONTOP) || option(OPTHELP))
-+ lines++; /* either one will occupy the first line */
-+
-+ 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 < SidebarHeight; 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 && Context->path &&
-+ (!strcmp(tmp->path, Context->path)||
-+ !strcmp(tmp->realpath, 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 = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + 1);
-+ if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) {
-+ char *tmp_folder_name;
-+ int i;
-+ tmp_folder_name = tmp->path + strlen(Maildir) + 1;
-+ for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) {
-+ if (tmp_folder_name[i] == '/' || tmp_folder_name[i] == '.') sidebar_folder_depth++;
-+ }
-+ if (sidebar_folder_depth > 0) {
-+ if (option(OPTSIDEBARSHORTPATH)) {
-+ tmp_folder_name = strrchr(tmp->path, '.');
-+ if (tmp_folder_name == NULL)
-+ tmp_folder_name = mutt_basename(tmp->path);
-+ else
-+ tmp_folder_name++;
-+ }
-+ else
-+ tmp_folder_name = tmp->path + strlen(Maildir) + 1;
-+ sidebar_folder_name = malloc(strlen(tmp_folder_name) + sidebar_folder_depth*strlen(NONULL(SidebarIndentStr)) + 1);
-+ sidebar_folder_name[0]=0;
-+ for (i=0; i < sidebar_folder_depth; i++)
-+ strncat(sidebar_folder_name, NONULL(SidebarIndentStr), strlen(NONULL(SidebarIndentStr)));
-+ strncat(sidebar_folder_name, tmp_folder_name, strlen(tmp_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);
-+ for ( ; lines < SidebarHeight; 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) ||
-+ !strcmp(tmp->realpath, Context->path))) {
-+ tmp->msg_unread = Context->unread;
-+ tmp->msgcount = Context->msgcount;
-+ tmp->msg_flagged = Context->flagged;
-+ 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 --git a/sidebar.h b/sidebar.h
-new file mode 100644
-index 0000000..d195f11
---- /dev/null
-+++ b/sidebar.h
-@@ -0,0 +1,36 @@
-+/*
-+ * Copyright (C) ????-2004 Justin Hibbits <jrh29 at po.cwru.edu>
-+ * Copyright (C) 2004 Thomer M. Gil <mutt at 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 */
diff --git a/debian/patches/neomutt/09-sidebar.patch b/debian/patches/neomutt/09-sidebar.patch
index 6371a66..95ada40 100644
--- a/debian/patches/neomutt/09-sidebar.patch
+++ b/debian/patches/neomutt/09-sidebar.patch
@@ -2334,22 +2334,9 @@ diff -urN mutt-1.6.1/main.c mutt-1.6.1-sidebar/main.c
+#ifdef USE_SIDEBAR
+#include "sidebar.h"
+#endif
+ #include "version.h"
#ifdef USE_SASL
- #include "mutt_sasl.h"
-@@ -485,6 +488,12 @@
- "-USE_HCACHE "
- #endif
-
-+#ifdef USE_SIDEBAR
-+ "+USE_SIDEBAR "
-+#else
-+ "-USE_SIDEBAR "
-+#endif
-+
- );
-
- #ifdef ISPELL
@@ -557,7 +566,11 @@
int main (int argc, char **argv)
@@ -4314,3 +4301,17 @@ diff -urN mutt-1.6.1/sort.h mutt-1.6.1-sidebar/sort.h
/* FIXME: This one does not belong to here */
WHERE short PgpSortKeys INITVAL (SORT_ADDRESS);
+--- a/version.c
++++ b/version.c
+@@ -286,6 +286,11 @@ static struct compile_options comp_opts[
+ #else
+ { "USE_SETGID", 0 },
+ #endif
++#ifdef USE_SIDEBAR
++ { "USE_SIDEBAR", 1 },
++#else
++ { "USE_SIDEBAR", 0 },
++#endif
+ #ifdef USE_SMTP
+ { "USE_SMTP", 1 },
+ #else
diff --git a/debian/patches/series b/debian/patches/series
index 35d393e..af8ffca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,9 +22,6 @@ upstream/771125-CVE-2014-9116-jessie.patch
upstream/path_max.patch
upstream/809802_timeout_hook.patch
__separator__mutt.org.patch
-mutt-patched/sidebar.patch
-mutt-patched/sidebar-delimnullwide.patch
+neomutt/09-sidebar.patch
mutt-patched/multiple-fcc.patch
-mutt-patched/sidebar-newonly.patch
-mutt-patched/sidebar-compose.patch
mutt-patched/nntp.patch
diff --git a/debian/rules b/debian/rules
index 84c10f4..7fc7c45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,6 +102,7 @@ ifeq ($(BUILD_PATCHED),yes)
cd $(objdir)-patched && \
env CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
../configure $(confflags) \
+ --enable-sidebar \
--enable-nntp
echo '#include "config-debian.h"' >> $(objdir)-patched/config.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git
More information about the pkg-mutt-commits
mailing list