OpenPKG Specs: mutt/mutt.patch.sidebar@a2c6460cfb16 (annotated)

mutt/mutt.patch.sidebar@a2c6460cfb16 (annotated)

mutt/mutt.patch.sidebar

Mon, 28 Jan 2013 17:37:18 +0100

author: Michael Schloh von Bennewitz <michael@schloh.com>
date: Mon, 28 Jan 2013 17:37:18 +0100
changeset 758: a2c6460cfb16
permissions: -rw-r--r--

Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.

 The Mutt "sidebar" patch as taken over by Debian for Mutt 1.5.21
 but with the patches for Makefile.in applied again.
 Index: Makefile.am
 --- Makefile.am.orig	2010-08-24 18:34:21.000000000 +0200
 +++ Makefile.am	2011-01-17 19:33:57.000000000 +0100
@@ -33,7 +33,7 @@
  	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 safe_asprintf.c
 +	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c sidebar.c
  nodist_mutt_SOURCES = $(BUILT_SOURCES)
 Index: Makefile.in
 --- Makefile.in.orig	2010-08-25 18:31:48.000000000 +0200
 +++ Makefile.in	2011-01-17 19:33:57.000000000 +0100
@@ -85,7 +85,7 @@
  	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
  	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
  	editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
 -	ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT)
 +	ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT) sidebar.$(OBJEXT)
  am__objects_1 =
  am__objects_2 = patchlist.$(OBJEXT) $(am__objects_1)
  nodist_mutt_OBJECTS = $(am__objects_2)
@@ -359,7 +359,7 @@
  	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 safe_asprintf.c
 +	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c sidebar.c
  nodist_mutt_SOURCES = $(BUILT_SOURCES)
  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
@@ -391,7 +391,7 @@
  	README.SSL smime.h group.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
 Index: OPS
 --- OPS.orig	2010-03-01 18:56:19.000000000 +0100
 +++ OPS	2011-01-17 19:33:15.000000000 +0100
@@ -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"
 Index: buffy.c
 --- buffy.c.orig	2010-09-13 19:19:55.000000000 +0200
 +++ buffy.c	2011-01-17 19:33:15.000000000 +0100
@@ -312,6 +312,10 @@
      return 0;
    }
 +  mailbox->msgcount = 0;
 +  mailbox->msg_unread = 0;
 +  mailbox->msg_flagged = 0;
 +
    while ((de = readdir (dirp)) != NULL)
    {
      if (*de->d_name == '.')
@@ -329,7 +333,9 @@
  	  continue;
        }
        /* one new and undeleted message is enough */
 -      mailbox->new = 1;
 +      mailbox->has_new = mailbox->new = 1;
 +      mailbox->msgcount++;
 +      mailbox->msg_unread++;
        rc = 1;
        break;
      }
@@ -337,6 +343,32 @@
    closedir (dirp);
 +  /*
 +   * count read messages (for folderlist (sidebar) we also need to count
 +   * messages in cur so that we the total number of messages
 +   */
 +  snprintf (path, sizeof (path), "%s/cur", mailbox->path);
 +  if ((dirp = opendir (path)) == NULL)
 +  {
 +    mailbox->magic = 0;
 +  }
 +  while ((de = readdir (dirp)) != NULL)
 +  {
 +    char *p;
 +    if (*de->d_name != '.') {
 +      if ((p = strstr (de->d_name, ":2,"))) {
 +        if (!strchr (p + 3, 'T')) {
 +          mailbox->msgcount++;
 +          if ( !strchr (p + 3, 'S'))
 +            mailbox->msg_unread++;
 +          if (strchr(p + 3, 'F'))
 +            mailbox->msg_flagged++;
 +        }
 +      } else
 +        mailbox->msgcount++;
 +    }
 +  }
 +
    return rc;
  }
@@ -345,14 +377,33 @@
  {
    int rc = 0;
    int statcheck;
 +  CONTEXT *ctx;
    if (option (OPTCHECKMBOXSIZE))
      statcheck = sb->st_size > mailbox->size;
    else
      statcheck = sb->st_mtime > sb->st_atime
        || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);
 -  if (statcheck)
 +  if (statcheck || mailbox->msgcount == 0)
    {
 +	  BUFFY b = *mailbox;
 + 	  int msgcount = 0;
 + 	  int msg_unread = 0;
 + 	  /* parse the mailbox, to see how much mail there is */
 + 	  ctx = mx_open_mailbox( mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL);
 + 	  if(ctx)
 + 	  {
 +        msgcount = ctx->msgcount;
 + 	    msg_unread = ctx->unread;
 + 	    mx_close_mailbox(ctx, 0);
 + 	  }
 + 	  *mailbox = b;
 + 	  mailbox->msgcount = msgcount;
 + 	  mailbox->msg_unread = msg_unread;
 + 	  if(statcheck)
 +      {
 + 	    mailbox->has_new = mailbox->new = 1;
 +      }
      if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
      {
        rc = 1;
@@ -374,9 +425,11 @@
  int mutt_buffy_check (int force)
  {
    BUFFY *tmp;
 +  struct dirent *de, *dp;
    struct stat sb;
    struct stat contex_sb;
    time_t t;
 +  CONTEXT *ctx;
    sb.st_size=0;
    contex_sb.st_dev=0;
@@ -456,6 +509,20 @@
        case M_MH:
  	if ((tmp->new = mh_buffy (tmp->path)) > 0)
  	  BuffyCount++;
 +
 +  if ((dp = opendir (tmp->path)) == NULL)
 +    break;
 +  tmp->msgcount = 0;
 +  while ((de = readdir (dp)))
 +  {
 +    if (mh_valid_message (de->d_name))
 +    {
 +      tmp->msgcount++;
 +      tmp->has_new = tmp->new = 1;
 +    }
 +  }
 +  closedir (dp);
 +
  	break;
        }
      }
 Index: buffy.h
 --- buffy.h.orig	2010-09-13 19:19:55.000000000 +0200
 +++ buffy.h	2011-01-17 19:33:15.000000000 +0100
@@ -25,7 +25,12 @@
    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 */
    short notified;		/* user has been notified */
    short magic;			/* mailbox type */
    short newly_created;		/* mbox or mmdf just popped into existence */
 Index: color.c
 --- color.c.orig	2009-05-15 19:18:23.000000000 +0200
 +++ color.c	2011-01-17 19:33:15.000000000 +0100
@@ -93,6 +93,8 @@
    { "bold",		MT_COLOR_BOLD },
    { "underline",	MT_COLOR_UNDERLINE },
    { "index",		MT_COLOR_INDEX },
 +  { "sidebar_new",	MT_COLOR_NEW },
 +  { "sidebar_flagged",	MT_COLOR_FLAGGED },
    { NULL,		0 }
  };
 Index: compose.c
 --- compose.c.orig	2010-04-14 20:50:19.000000000 +0200
 +++ compose.c	2011-01-17 19:33:15.000000000 +0100
@@ -72,7 +72,7 @@
  #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 char *Prompts[] =
  {
@@ -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 @@
    }
    clrtoeol ();
 -  move (HDR_CRYPTINFO, 0);
 +  move (HDR_CRYPTINFO, SidebarWidth);
    clrtoeol ();
    if ((WithCrypto & APPLICATION_PGP)
@@ -161,7 +161,7 @@
        && (msg->security & ENCRYPT)
        && SmimeCryptAlg
        && *SmimeCryptAlg) {
 -      mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
 +      mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),
  		NONULL(SmimeCryptAlg));
        off = 20;
    }
@@ -175,7 +175,7 @@
    int c;
    char *t;
 -  mvaddstr (HDR_MIX, 0,     "     Mix: ");
 +  mvaddstr (HDR_MIX, SidebarWidth,     "     Mix: ");
    if (!chain)
    {
@@ -190,7 +190,7 @@
      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 @@
    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 @@
    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 @@
  #endif
    SETCOLOR (MT_COLOR_STATUS);
 -  mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));
 +  mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));
    BKGDSET (MT_COLOR_STATUS);
    clrtoeol ();
@@ -304,7 +304,7 @@
    /* redraw the expanded list so the user can see the result */
    buf[0] = 0;
    rfc822_write_address (buf, sizeof (buf), *addr, 1);
 -  move (line, HDR_XOFFSET);
 +  move (line, HDR_XOFFSET+SidebarWidth);
    mutt_paddstr (W, buf);
    return 0;
@@ -549,7 +549,7 @@
  	if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
  	{
  	  mutt_str_replace (&msg->env->subject, buf);
 -	  move (HDR_SUBJECT, HDR_XOFFSET);
 +	  move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth);
  	  clrtoeol ();
  	  if (msg->env->subject)
  	    mutt_paddstr (W, msg->env->subject);
@@ -566,7 +566,7 @@
  	{
  	  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;
  	}
 Index: curs_main.c
 --- curs_main.c.orig	2010-09-13 19:19:55.000000000 +0200
 +++ curs_main.c	2011-01-17 19:33:15.000000000 +0100
@@ -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"
@@ -519,8 +521,12 @@
         menu->redraw |= REDRAW_STATUS;
       if (do_buffy_notify)
       {
 -       if (mutt_buffy_notify () && option (OPTBEEPNEW))
 - 	beep ();
 +       if (mutt_buffy_notify ())
 +       {
 +         menu->redraw |= REDRAW_FULL;
 +         if (option (OPTBEEPNEW))
 +           beep ();
 +       }
       }
       else
         do_buffy_notify = 1;
@@ -532,6 +538,7 @@
      if (menu->redraw & REDRAW_FULL)
      {
        menu_redraw_full (menu);
 +      draw_sidebar(menu->menu);
        mutt_show_error ();
      }
@@ -554,10 +561,13 @@
        if (menu->redraw & REDRAW_STATUS)
        {
 +        DrawFullLine = 1;
  	menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
 +        DrawFullLine = 0;
  	CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2);
  	SETCOLOR (MT_COLOR_STATUS);
          BKGDSET (MT_COLOR_STATUS);
 +        set_buffystats(Context);
  	mutt_paddstr (COLS, buf);
  	SETCOLOR (MT_COLOR_NORMAL);
          BKGDSET (MT_COLOR_NORMAL);
@@ -571,7 +581,7 @@
  	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
@@ -1069,6 +1079,7 @@
  	  menu->redraw = REDRAW_FULL;
  	break;
 +      case OP_SIDEBAR_OPEN:
        case OP_MAIN_CHANGE_FOLDER:
        case OP_MAIN_NEXT_UNREAD_MAILBOX:
@@ -1100,7 +1111,11 @@
  	{
  	  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)
  	    {
@@ -1118,6 +1133,7 @@
  	}
  	mutt_expand_path (buf, sizeof (buf));
 +        set_curbuffy(buf);
  	if (mx_get_magic (buf) <= 0)
  	{
  	  mutt_error (_("%s is not a mailbox."), buf);
@@ -2208,6 +2224,12 @@
  	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);
 Index: doc/Muttrc
 --- doc/Muttrc.orig	2010-09-15 19:07:19.000000000 +0200
 +++ doc/Muttrc	2011-01-17 19:33:15.000000000 +0100
@@ -657,6 +657,26 @@
  # $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
 Index: flags.c
 --- flags.c.orig	2009-01-04 00:27:10.000000000 +0100
 +++ flags.c	2011-01-17 19:33:15.000000000 +0100
@@ -22,8 +22,10 @@
  #include "mutt.h"
  #include "mutt_curses.h"
 +#include "mutt_menu.h"
  #include "sort.h"
  #include "mx.h"
 +#include "sidebar.h"
  void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
  {
@@ -263,6 +265,7 @@
     */
    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)
 Index: functions.h
 --- functions.h.orig	2010-08-24 18:34:21.000000000 +0200
 +++ functions.h	2011-01-17 19:33:15.000000000 +0100
@@ -169,6 +169,11 @@
    { "decrypt-save",		OP_DECRYPT_SAVE,		NULL },
 + { "sidebar-scroll-up",	OP_SIDEBAR_SCROLL_UP, NULL },
 + { "sidebar-scroll-down",	OP_SIDEBAR_SCROLL_DOWN, NULL },
 + { "sidebar-next",		OP_SIDEBAR_NEXT, NULL },
 + { "sidebar-prev",		OP_SIDEBAR_PREV, NULL },
 + { "sidebar-open",		OP_SIDEBAR_OPEN, NULL },
    { NULL,			0,				NULL }
  };
@@ -272,6 +277,11 @@
    { "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 }
  };
 Index: globals.h
 --- globals.h.orig	2009-08-25 21:08:52.000000000 +0200
 +++ globals.h	2011-01-17 19:33:15.000000000 +0100
@@ -117,6 +117,7 @@
  WHERE char *SendCharset;
  WHERE char *Sendmail;
  WHERE char *Shell;
 +WHERE char *SidebarDelim;
  WHERE char *Signature;
  WHERE char *SimpleSearch;
  #if USE_SMTP
@@ -207,6 +208,9 @@
  WHERE short 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;
 Index: imap/command.c
 --- imap/command.c.orig	2010-09-15 17:39:31.000000000 +0200
 +++ imap/command.c	2011-01-17 19:33:15.000000000 +0100
@@ -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;
        }
 Index: imap/imap.c
 --- imap/imap.c.orig	2009-08-25 21:08:52.000000000 +0200
 +++ imap/imap.c	2011-01-17 19:33:15.000000000 +0100
@@ -1521,7 +1521,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)
      {
 Index: init.h
 --- init.h.orig	2010-09-15 17:39:31.000000000 +0200
 +++ init.h	2011-01-17 19:33:15.000000000 +0100
@@ -1953,6 +1953,22 @@
    ** not used.
    ** (PGP only)
    */
 +  {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, "|"},
 +  /*
 +  ** .pp
 +  ** This specifies the delimiter between the sidebar (if visible) and
 +  ** other screens.
 +  */
 +  { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 },
 +  /*
 +  ** .pp
 +  ** This specifies whether or not to show sidebar (left-side list of folders).
 +  */
 +  { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 },
 +  /*
 +  ** .pp
 +  ** The width of the sidebar.
 +  */
    { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
    /*
    ** .pp
 Index: mailbox.h
 --- mailbox.h.orig	2009-04-30 19:33:48.000000000 +0200
 +++ mailbox.h	2011-01-17 19:33:15.000000000 +0100
@@ -27,6 +27,7 @@
  #define M_NEWFOLDER	(1<<4) /* create a new folder - same as M_APPEND, but uses
  				* safe_fopen() for mbox-style folders.
  				*/
 +#define M_PEEK		(1<<5) /* revert atime back after taking a look (if applicable) */
  /* mx_open_new_message() */
  #define M_ADD_FROM	1	/* add a From_ line */
 Index: mbox.c
 --- mbox.c.orig	2010-09-13 19:19:55.000000000 +0200
 +++ mbox.c	2011-01-17 19:33:15.000000000 +0100
@@ -100,6 +100,7 @@
      mutt_perror (ctx->path);
      return (-1);
    }
 +  ctx->atime = sb.st_atime;
    ctx->mtime = sb.st_mtime;
    ctx->size = sb.st_size;
@@ -251,6 +252,7 @@
    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)
 Index: menu.c
 --- menu.c.orig	2010-08-25 18:31:40.000000000 +0200
 +++ menu.c	2011-01-17 19:33:15.000000000 +0100
@@ -24,6 +24,7 @@
  #include "mutt_curses.h"
  #include "mutt_menu.h"
  #include "mbyte.h"
 +#include "sidebar.h"
  #include <string.h>
  #include <stdlib.h>
@@ -156,7 +157,7 @@
  {
    char *scratch = safe_strdup (s);
    int shift = option (OPTARROWCURSOR) ? 3 : 0;
 -  int cols = COLS - shift;
 +  int cols = COLS - shift - SidebarWidth;
    mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
    s[n - 1] = 0;
@@ -207,6 +208,7 @@
    char buf[LONG_STRING];
    int i;
 +  draw_sidebar(1);
    for (i = menu->top; i < menu->top + menu->pagelen; i++)
    {
      if (i < menu->max)
@@ -217,7 +219,7 @@
        if (option (OPTARROWCURSOR))
        {
          attrset (menu->color (i));
 -	CLEARLINE (i - menu->top + menu->offset);
 +	CLEARLINE_WIN (i - menu->top + menu->offset);
  	if (i == menu->current)
  	{
@@ -246,14 +248,14 @@
  	  BKGDSET (MT_COLOR_INDICATOR);
  	}
 -	CLEARLINE (i - menu->top + menu->offset);
 +	CLEARLINE_WIN (i - menu->top + menu->offset);
  	print_enriched_string (menu->color(i), (unsigned char *) buf, i != menu->current);
          SETCOLOR (MT_COLOR_NORMAL);
          BKGDSET (MT_COLOR_NORMAL);
        }
      }
      else
 -      CLEARLINE (i - menu->top + menu->offset);
 +      CLEARLINE_WIN (i - menu->top + menu->offset);
    }
    menu->redraw = 0;
  }
@@ -268,7 +270,7 @@
      return;
    }
 -  move (menu->oldcurrent + menu->offset - menu->top, 0);
 +  move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
    SETCOLOR (MT_COLOR_NORMAL);
    BKGDSET (MT_COLOR_NORMAL);
@@ -283,13 +285,13 @@
        clrtoeol ();
        menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
        menu_pad_string (buf, sizeof (buf));
 -      move (menu->oldcurrent + menu->offset - menu->top, 3);
 +      move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3);
        print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
        SETCOLOR (MT_COLOR_NORMAL);
      }
      /* now draw it in the new location */
 -    move (menu->current + menu->offset - menu->top, 0);
 +    move (menu->current + menu->offset - menu->top, SidebarWidth);
      attrset (menu->color (menu->current));
      ADDCOLOR (MT_COLOR_INDICATOR);
      addstr ("->");
@@ -310,7 +312,7 @@
      attrset (menu->color (menu->current));
      ADDCOLOR (MT_COLOR_INDICATOR);
      BKGDSET (MT_COLOR_INDICATOR);
 -    CLEARLINE (menu->current - menu->top + menu->offset);
 +    CLEARLINE_WIN (menu->current - menu->top + menu->offset);
      print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
      SETCOLOR (MT_COLOR_NORMAL);
      BKGDSET (MT_COLOR_NORMAL);
@@ -322,7 +324,7 @@
  {
    char buf[LONG_STRING];
 -  move (menu->current + menu->offset - menu->top, 0);
 +  move (menu->current + menu->offset - menu->top, SidebarWidth);
    menu_make_entry (buf, sizeof (buf), menu, menu->current);
    menu_pad_string (buf, sizeof (buf));
@@ -875,7 +877,7 @@
      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
 Index: mutt.h
 --- mutt.h.orig	2010-09-13 19:19:55.000000000 +0200
 +++ mutt.h	2011-01-17 19:33:15.000000000 +0100
@@ -419,6 +419,7 @@
    OPTSAVEEMPTY,
    OPTSAVENAME,
    OPTSCORE,
 +  OPTSIDEBAR,
    OPTSIGDASHES,
    OPTSIGONTOP,
    OPTSORTRE,
@@ -859,6 +860,7 @@
  {
    char *path;
    FILE *fp;
 +  time_t atime;
    time_t mtime;
    off_t size;
    off_t vsize;
@@ -893,6 +895,7 @@
    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 */
 Index: mutt_curses.h
 --- mutt_curses.h.orig	2008-03-19 21:07:57.000000000 +0100
 +++ mutt_curses.h	2011-01-17 19:33:15.000000000 +0100
@@ -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
  };
 Index: muttlib.c
 --- muttlib.c.orig	2010-08-25 18:31:40.000000000 +0200
 +++ muttlib.c	2011-01-17 19:33:15.000000000 +0100
@@ -1286,6 +1286,8 @@
  	  pl = pw = 1;
  	/* see if there's room to add content, else ignore */
 +        if ( DrawFullLine )
 +        {
  	if ((col < COLS && wlen < destlen) || soft)
  	{
  	  int pad;
@@ -1329,6 +1331,52 @@
  	  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 == '|')
 Index: mx.c
 --- mx.c.orig	2010-09-13 19:19:55.000000000 +0200
 +++ mx.c	2011-01-17 19:33:15.000000000 +0100
@@ -580,6 +580,7 @@
   *		M_APPEND	open mailbox for appending
   *		M_READONLY	open mailbox in read-only mode
   *		M_QUIET		only print error messages
 + *		M_PEEK		revert atime where applicable
   *	ctx	if non-null, context struct to use
   */
  CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
@@ -602,6 +603,8 @@
      ctx->quiet = 1;
    if (flags & M_READONLY)
      ctx->readonly = 1;
 +  if (flags & M_PEEK)
 +    ctx->peekonly = 1;
    if (flags & (M_APPEND|M_NEWFOLDER))
    {
@@ -701,9 +704,21 @@
  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 */
 Index: pager.c
 --- pager.c.orig	2010-08-25 18:31:40.000000000 +0200
 +++ pager.c	2011-01-17 19:33:15.000000000 +0100
@@ -29,6 +29,7 @@
  #include "pager.h"
  #include "attach.h"
  #include "mbyte.h"
 +#include "sidebar.h"
  #include "mutt_crypt.h"
@@ -1099,6 +1100,7 @@
    if (check_attachment_marker ((char *)buf) == 0)
      wrap_cols = COLS;
 +  wrap_cols -= SidebarWidth;
    /* FIXME: this should come from lineInfo */
    memset(&mbstate, 0, sizeof(mbstate));
@@ -1745,7 +1747,7 @@
      if ((redraw & REDRAW_BODY) || topline != oldtopline)
      {
        do {
 -	move (bodyoffset, 0);
 +	move (bodyoffset, SidebarWidth);
  	curline = oldtopline = topline;
  	lines = 0;
  	force_redraw = 0;
@@ -1758,6 +1760,7 @@
  			    &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
  	    lines++;
  	  curline++;
 +  	  move(lines + bodyoffset, SidebarWidth);
  	}
  	last_offset = lineInfo[curline].offset;
        } while (force_redraw);
@@ -1771,6 +1774,7 @@
  	  addch ('~');
  	addch ('\n');
  	lines++;
 +  	move(lines + bodyoffset, SidebarWidth);
        }
        /* We are going to update the pager status bar, so it isn't
         * necessary to reset to normal color now. */
@@ -1794,11 +1798,11 @@
        /* print out the pager status bar */
        SETCOLOR (MT_COLOR_STATUS);
        BKGDSET (MT_COLOR_STATUS);
 -      CLEARLINE (statusoffset);
 +      CLEARLINE_WIN (statusoffset);
        if (IsHeader (extra) || IsMsgAttach (extra))
        {
 -	size_t l1 = COLS * MB_LEN_MAX;
 + 	size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
  	size_t l2 = sizeof (buffer);
  	hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
  	mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
@@ -1808,7 +1812,7 @@
        {
  	char bn[STRING];
  	snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);
 -	mutt_paddstr (COLS, bn);
 +        mutt_paddstr (COLS, IsHeader (extra) || IsMsgAttach (extra) ?  buffer : banner);
        }
        BKGDSET (MT_COLOR_NORMAL);
        SETCOLOR (MT_COLOR_NORMAL);
@@ -1819,18 +1823,23 @@
        /* redraw the pager_index indicator, because the
         * flags for this message might have changed. */
        menu_redraw_current (index);
 +      draw_sidebar(MENU_PAGER);
        /* print out the index status bar */
        menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
 -      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);
 +      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SidebarWidth);
        SETCOLOR (MT_COLOR_STATUS);
        BKGDSET (MT_COLOR_STATUS);
 -      mutt_paddstr (COLS, buffer);
 +      mutt_paddstr (COLS-SidebarWidth, buffer);
        SETCOLOR (MT_COLOR_NORMAL);
        BKGDSET (MT_COLOR_NORMAL);
      }
 +    /* if we're not using the index, update every time */
 +    if ( index == 0 )
 +      draw_sidebar(MENU_PAGER);
 +
      redraw = 0;
      if (option(OPTBRAILLEFRIENDLY)) {
@@ -2756,6 +2765,13 @@
  	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;
 Index: sidebar.c
 --- sidebar.c.orig	2011-01-17 19:33:15.000000000 +0100
 +++ sidebar.c	2011-01-17 19:33:15.000000000 +0100
@@ -0,0 +1,333 @@
 +/*
 + * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
 + * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
 + *
 + *     This program is free software; you can redistribute it and/or modify
 + *     it under the terms of the GNU General Public License as published by
 + *     the Free Software Foundation; either version 2 of the License, or
 + *     (at your option) any later version.
 + *
 + *     This program is distributed in the hope that it will be useful,
 + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
 + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + *     GNU General Public License for more details.
 + *
 + *     You should have received a copy of the GNU General Public License
 + *     along with this program; if not, write to the Free Software
 + *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 + */
 +
 +
 +#if HAVE_CONFIG_H
 +# include "config.h"
 +#endif
 +
 +#include "mutt.h"
 +#include "mutt_menu.h"
 +#include "mutt_curses.h"
 +#include "sidebar.h"
 +#include "buffy.h"
 +#include <libgen.h>
 +#include "keymap.h"
 +#include <stdbool.h>
 +
 +/*BUFFY *CurBuffy = 0;*/
 +static BUFFY *TopBuffy = 0;
 +static BUFFY *BottomBuffy = 0;
 +static int known_lines = 0;
 +
 +static int quick_log10(int n)
 +{
 +        char string[32];
 +        sprintf(string, "%d", n);
 +        return strlen(string);
 +}
 +
 +void calc_boundaries (int menu)
 +{
 +	BUFFY *tmp = Incoming;
 +
 +	if ( known_lines != LINES ) {
 +		TopBuffy = BottomBuffy = 0;
 +		known_lines = LINES;
 +	}
 +	for ( ; tmp->next != 0; tmp = tmp->next )
 +		tmp->next->prev = tmp;
 +
 +	if ( TopBuffy == 0 && BottomBuffy == 0 )
 +		TopBuffy = Incoming;
 +	if ( BottomBuffy == 0 ) {
 +		int count = LINES - 2 - (menu != MENU_PAGER || option(OPTSTATUSONTOP));
 +		BottomBuffy = TopBuffy;
 +		while ( --count && BottomBuffy->next )
 +			BottomBuffy = BottomBuffy->next;
 +	}
 +	else if ( TopBuffy == CurBuffy->next ) {
 +		int count = LINES - 2 - (menu != MENU_PAGER);
 +		BottomBuffy = CurBuffy;
 +		tmp = BottomBuffy;
 +		while ( --count && tmp->prev)
 +			tmp = tmp->prev;
 +		TopBuffy = tmp;
 +	}
 +	else if ( BottomBuffy == CurBuffy->prev ) {
 +		int count = LINES - 2 - (menu != MENU_PAGER);
 +		TopBuffy = CurBuffy;
 +		tmp = TopBuffy;
 +		while ( --count && tmp->next )
 +			tmp = tmp->next;
 +		BottomBuffy = tmp;
 +	}
 +}
 +
 +char *make_sidebar_entry(char *box, int size, int new, int flagged)
 +{
 +	static char *entry = 0;
 +	char *c;
 +	int i = 0;
 +	int delim_len = strlen(SidebarDelim);
 +
 +	c = realloc(entry, SidebarWidth - delim_len + 2);
 +	if ( c ) entry = c;
 +	entry[SidebarWidth - delim_len + 1] = 0;
 +	for (; i < SidebarWidth - delim_len + 1; entry[i++] = ' ' );
 +	i = strlen(box);
 +	strncpy( entry, box, i < (SidebarWidth - delim_len + 1) ? i : (SidebarWidth - delim_len + 1) );
 +
 +        if (size == -1)
 +                sprintf(entry + SidebarWidth - delim_len - 3, "?");
 +        else if ( new ) {
 +          if (flagged > 0) {
 +              sprintf(
 +		        entry + SidebarWidth - delim_len - 5 - quick_log10(size) - quick_log10(new) - quick_log10(flagged),
 +		        "% d(%d)[%d]", size, new, flagged);
 +          } else {
 +              sprintf(
 +                      entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(new),
 +                      "% d(%d)", size, new);
 +          }
 +        } else if (flagged > 0) {
 +              sprintf( entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(flagged), "% d[%d]", size, flagged);
 +        } else {
 +              sprintf( entry + SidebarWidth - delim_len - 1 - quick_log10(size), "% d", size);
 +        }
 +	return entry;
 +}
 +
 +void set_curbuffy(char buf[LONG_STRING])
 +{
 +  BUFFY* tmp = CurBuffy = Incoming;
 +
 +  if (!Incoming)
 +    return;
 +
 +  while(1) {
 +    if(!strcmp(tmp->path, buf)) {
 +      CurBuffy = tmp;
 +      break;
 +    }
 +
 +    if(tmp->next)
 +      tmp = tmp->next;
 +    else
 +      break;
 +  }
 +}
 +
 +int draw_sidebar(int menu) {
 +
 +	int lines = option(OPTHELP) ? 1 : 0;
 +	BUFFY *tmp;
 +#ifndef USE_SLANG_CURSES
 +        attr_t attrs;
 +#endif
 +        short delim_len = strlen(SidebarDelim);
 +        short color_pair;
 +
 +        static bool initialized = false;
 +        static int prev_show_value;
 +        static short saveSidebarWidth;
 +
 +        /* initialize first time */
 +        if(!initialized) {
 +                prev_show_value = option(OPTSIDEBAR);
 +                saveSidebarWidth = SidebarWidth;
 +                if(!option(OPTSIDEBAR)) SidebarWidth = 0;
 +                initialized = true;
 +        }
 +
 +        /* save or restore the value SidebarWidth */
 +        if(prev_show_value != option(OPTSIDEBAR)) {
 +                if(prev_show_value && !option(OPTSIDEBAR)) {
 +                        saveSidebarWidth = SidebarWidth;
 +                        SidebarWidth = 0;
 +                } else if(!prev_show_value && option(OPTSIDEBAR)) {
 +                        SidebarWidth = saveSidebarWidth;
 +                }
 +                prev_show_value = option(OPTSIDEBAR);
 +        }
 +
 +
 +//	if ( SidebarWidth == 0 ) return 0;
 +       if (SidebarWidth > 0 && option (OPTSIDEBAR)
 +           && delim_len >= SidebarWidth) {
 +         unset_option (OPTSIDEBAR);
 +         /* saveSidebarWidth = SidebarWidth; */
 +         if (saveSidebarWidth > delim_len) {
 +           SidebarWidth = saveSidebarWidth;
 +           mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
 +           sleep (2);
 +         } else {
 +           SidebarWidth = 0;
 +           mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar. Please set your sidebar_width to a sane value."));
 +           sleep (4); /* the advise to set a sane value should be seen long enough */
 +         }
 +         saveSidebarWidth = 0;
 +         return (0);
 +       }
 +
 +    if ( SidebarWidth == 0 || !option(OPTSIDEBAR)) {
 +      if (SidebarWidth > 0) {
 +        saveSidebarWidth = SidebarWidth;
 +        SidebarWidth = 0;
 +      }
 +      unset_option(OPTSIDEBAR);
 +      return 0;
 +    }
 +
 +        /* get attributes for divider */
 +	SETCOLOR(MT_COLOR_STATUS);
 +#ifndef USE_SLANG_CURSES
 +        attr_get(&attrs, &color_pair, 0);
 +#else
 +        color_pair = attr_get();
 +#endif
 +	SETCOLOR(MT_COLOR_NORMAL);
 +
 +	/* draw the divider */
 +
 +	for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
 +		move(lines, SidebarWidth - delim_len);
 +		addstr(NONULL(SidebarDelim));
 +#ifndef USE_SLANG_CURSES
 +                mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
 +#endif
 +	}
 +
 +	if ( Incoming == 0 ) return 0;
 +	lines = option(OPTHELP) ? 1 : 0; /* go back to the top */
 +
 +	if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 )
 +		calc_boundaries(menu);
 +	if ( CurBuffy == 0 ) CurBuffy = Incoming;
 +
 +	tmp = TopBuffy;
 +
 +	SETCOLOR(MT_COLOR_NORMAL);
 +
 +	for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); tmp = tmp->next ) {
 +		if ( tmp == CurBuffy )
 +			SETCOLOR(MT_COLOR_INDICATOR);
 +		else if ( tmp->msg_unread > 0 )
 +			SETCOLOR(MT_COLOR_NEW);
 +		else if ( tmp->msg_flagged > 0 )
 +		        SETCOLOR(MT_COLOR_FLAGGED);
 +		else
 +			SETCOLOR(MT_COLOR_NORMAL);
 +
 +		move( lines, 0 );
 +		if ( Context && !strcmp( tmp->path, Context->path ) ) {
 +			tmp->msg_unread = Context->unread;
 +			tmp->msgcount = Context->msgcount;
 +			tmp->msg_flagged = Context->flagged;
 +		}
 +		// check whether Maildir is a prefix of the current folder's path
 +		short maildir_is_prefix = 0;
 +		if ( (strlen(tmp->path) > strlen(Maildir)) &&
 +			(strncmp(Maildir, tmp->path, strlen(Maildir)) == 0) )
 +        		maildir_is_prefix = 1;
 +		// calculate depth of current folder and generate its display name with indented spaces
 +		int sidebar_folder_depth = 0;
 +		char *sidebar_folder_name;
 +		sidebar_folder_name = basename(tmp->path);
 +		if ( maildir_is_prefix ) {
 +			char *tmp_folder_name;
 +			int i;
 +			tmp_folder_name = tmp->path + strlen(Maildir);
 +			for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) {
 +				if (tmp_folder_name[i] == '/') sidebar_folder_depth++;
 +			}
 +			if (sidebar_folder_depth > 0) {
 +				sidebar_folder_name = malloc(strlen(basename(tmp->path)) + sidebar_folder_depth + 1);
 +				for (i=0; i < sidebar_folder_depth; i++)
 +					sidebar_folder_name[i]=' ';
 +				sidebar_folder_name[i]=0;
 +				strncat(sidebar_folder_name, basename(tmp->path), strlen(basename(tmp->path)) + sidebar_folder_depth);
 +			}
 +		}
 +		printw( "%.*s", SidebarWidth - delim_len + 1,
 +			make_sidebar_entry(sidebar_folder_name, tmp->msgcount,
 +			tmp->msg_unread, tmp->msg_flagged));
 +		if (sidebar_folder_depth > 0)
 +		        free(sidebar_folder_name);
 +		lines++;
 +	}
 +	SETCOLOR(MT_COLOR_NORMAL);
 +	for ( ; lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
 +		int i = 0;
 +		move( lines, 0 );
 +		for ( ; i < SidebarWidth - delim_len; i++ )
 +			addch(' ');
 +	}
 +	return 0;
 +}
 +
 +
 +void set_buffystats(CONTEXT* Context)
 +{
 +        BUFFY *tmp = Incoming;
 +        while(tmp) {
 +                if(Context && !strcmp(tmp->path, Context->path)) {
 +			tmp->msg_unread = Context->unread;
 +			tmp->msgcount = Context->msgcount;
 +                        break;
 +                }
 +                tmp = tmp->next;
 +        }
 +}
 +
 +void scroll_sidebar(int op, int menu)
 +{
 +        if(!SidebarWidth) return;
 +        if(!CurBuffy) return;
 +
 +	switch (op) {
 +		case OP_SIDEBAR_NEXT:
 +			if ( CurBuffy->next == NULL ) return;
 +			CurBuffy = CurBuffy->next;
 +			break;
 +		case OP_SIDEBAR_PREV:
 +			if ( CurBuffy->prev == NULL ) return;
 +			CurBuffy = CurBuffy->prev;
 +			break;
 +		case OP_SIDEBAR_SCROLL_UP:
 +			CurBuffy = TopBuffy;
 +			if ( CurBuffy != Incoming ) {
 +				calc_boundaries(menu);
 +				CurBuffy = CurBuffy->prev;
 +			}
 +			break;
 +		case OP_SIDEBAR_SCROLL_DOWN:
 +			CurBuffy = BottomBuffy;
 +			if ( CurBuffy->next ) {
 +				calc_boundaries(menu);
 +				CurBuffy = CurBuffy->next;
 +			}
 +			break;
 +		default:
 +			return;
 +	}
 +	calc_boundaries(menu);
 +	draw_sidebar(menu);
 +}
 +
 Index: sidebar.h
 --- sidebar.h.orig	2011-01-17 19:33:15.000000000 +0100
 +++ sidebar.h	2011-01-17 19:33:15.000000000 +0100
@@ -0,0 +1,36 @@
 +/*
 + * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
 + * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
 + *
 + *     This program is free software; you can redistribute it and/or modify
 + *     it under the terms of the GNU General Public License as published by
 + *     the Free Software Foundation; either version 2 of the License, or
 + *     (at your option) any later version.
 + *
 + *     This program is distributed in the hope that it will be useful,
 + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
 + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + *     GNU General Public License for more details.
 + *
 + *     You should have received a copy of the GNU General Public License
 + *     along with this program; if not, write to the Free Software
 + *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 + */
 +
 +#ifndef SIDEBAR_H
 +#define SIDEBAR_H
 +
 +struct MBOX_LIST {
 +	char *path;
 +	int msgcount;
 +	int new;
 +} MBLIST;
 +
 +/* parameter is whether or not to go to the status line */
 +/* used for omitting the last | that covers up the status bar in the index */
 +int draw_sidebar(int);
 +void scroll_sidebar(int, int);
 +void set_curbuffy(char*);
 +void set_buffystats(CONTEXT*);
 +
 +#endif /* SIDEBAR_H */
 ==============================================================================
 Fix drawing of sidebar delimiter with the intended
 attributes of the "status" bar --rse 20070906
 Index: sidebar.c
 --- sidebar.c.orig	2007-11-04 15:05:17 +0100
 +++ sidebar.c	2007-11-04 15:05:17 +0100
@@ -186,23 +186,14 @@
        return 0;
      }
 -        /* get attributes for divider */
 -	SETCOLOR(MT_COLOR_STATUS);
 -#ifndef USE_SLANG_CURSES
 -        attr_get(&attrs, &color_pair, 0);
 -#else
 -        color_pair = attr_get();
 -#endif
 -	SETCOLOR(MT_COLOR_NORMAL);
  	/* draw the divider */
  	for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
 +		SETCOLOR(MT_COLOR_STATUS);
  		move(lines, SidebarWidth - delim_len);
  		addstr(NONULL(SidebarDelim));
 -#ifndef USE_SLANG_CURSES
 -                mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
 -#endif
 +		SETCOLOR(MT_COLOR_NORMAL);
  	}
  	if ( Incoming == 0 ) return 0;

OpenPKG Specs / annotate

mutt/mutt.patch.sidebar@a2c6460cfb16 (annotated)

mutt/mutt.patch.sidebar