X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=c352913b345261e7b73b2970f400bee29b671507;hp=4a648aa072f23ac9f43b49c259fd13689fb0d95c;hb=1b7e35d0720400f2566023146257c0a3bf89ce87;hpb=079e3129829f02ec9fa6e31c45d1b57deb63f663

diff --git a/sidebar.c b/sidebar.c
index 4a648aa..c352913 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -1,123 +1,106 @@
 /*
+ * Copyright notice from original mutt:
  * 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.
- */ 
-
-
+ *
+ * Parts were written/modified by:
+ * Rocco Rutte <pdmef@cs.tu-berlin.de>
+ * Nico Golde <nico@ngolde.de>
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
 
 #include "mutt.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "sidebar.h"
 #include "buffy.h"
-#include <libgen.h>
 #include "keymap.h"
+
+#include "lib/mem.h"
+#include "lib/str.h"
+#include "lib/intl.h"
+
+#include <libgen.h>
 #include <ctype.h>
 
-/*BUFFY *CurBuffy = 0;*/
-static BUFFY *TopBuffy = 0;
-static BUFFY *BottomBuffy = 0;
+static int TopBuffy = 0;
+static int CurBuffy = 0;
 static int known_lines = 0;
 static short initialized = 0;
 static int prev_show_value;
 static short saveSidebarWidth;
 static char *entry = 0;
 
-static int quick_log10(int n)
-{
+/* computes how many digets a number has;
+ * FIXME move out to library?
+ */
+static int quick_log10 (int n) {
   int len = 0;
-  for (; n > 9; len++, n /= 10)
-    ;
+
+  for (; n > 9; len++, n /= 10);
   return (++len);
 }
 
-/* CurBuffy should contain a valid buffy 
- * mailbox before calling this function!!! */
+/* computes first entry to be shown */
 void calc_boundaries (int menu)
 {
-  BUFFY *tmp = Incoming;
-  int position;
-  int i,count, mailbox_position;
+  int lines = 0;
 
+  if (list_empty(Incoming))
+    return;
   /* correct known_lines if it has changed because of a window resize */
-  if ( known_lines != LINES ) {
+  if (known_lines != LINES)
     known_lines = LINES;
-  }
-  /* fix all the prev links on all the mailboxes
-   * FIXME move this over to buffy.c where it belongs */
-  for ( ; tmp->next != 0; tmp = tmp->next )
-    tmp->next->prev = tmp;
-
-  /* calculate the position of the current mailbox */
-  position = 1;
-  tmp = Incoming;
-  while (tmp != CurBuffy)
-  {
-    position++;
-    tmp = tmp->next;
-  }
-  /* calculate the size of the screen we can use */
-  count = LINES - 2 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
-  /* calculate the position of the current mailbox on the screen */
-  mailbox_position = position%count;
-  if (mailbox_position == 0) mailbox_position=count;
-  /* determine topbuffy */
-  TopBuffy = CurBuffy;
-  for(i = mailbox_position; i >1; i--) TopBuffy = TopBuffy->prev;
-  /* determine bottombuffy */
-  BottomBuffy = CurBuffy;
-  for(i = mailbox_position; i < count && BottomBuffy->next; i++)
-    BottomBuffy = BottomBuffy->next;
+  lines = LINES - 2 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
+  TopBuffy = CurBuffy - (CurBuffy % lines);
+  if (TopBuffy < 0)
+    TopBuffy = 0;
 }
 
-static char * shortened_hierarchy(char * box) {
+static char *shortened_hierarchy (char *box)
+{
   int dots = 0;
-  char * last_dot;
-  int i,j;
-  char * new_box;
-  for (i=0;i<strlen(box);++i) {
-    if (box[i] == '.') ++dots;
-    else if (isupper (box[i])) 
+  char *last_dot;
+  int i, j;
+  char *new_box;
+
+  for (i = 0; i < mutt_strlen (box); ++i) {
+    if (box[i] == '.')
+      ++dots;
+    else if (isupper (box[i]))
       return (safe_strdup (box));
   }
-  last_dot = strrchr(box,'.');
+  last_dot = strrchr (box, '.');
   if (last_dot) {
     ++last_dot;
-    new_box = safe_malloc(strlen(last_dot)+2*dots+1);
+    new_box = safe_malloc (mutt_strlen (last_dot) + 2 * dots + 1);
     new_box[0] = box[0];
-    for (i=1,j=1;i<strlen(box);++i) {
+    for (i = 1, j = 1; i < mutt_strlen (box); ++i) {
       if (box[i] == '.') {
         new_box[j++] = '.';
         new_box[j] = 0;
-        if (&box[i+1] != last_dot) {
-          new_box[j++] = box[i+1];
+        if (&box[i + 1] != last_dot) {
+          new_box[j++] = box[i + 1];
           new_box[j] = 0;
-        } else {
-          strcat(&new_box[j],last_dot);
+        }
+        else {
+          strcat (&new_box[j], last_dot);
           break;
         }
       }
     }
     return new_box;
   }
-  return safe_strdup(box);
+  return safe_strdup (box);
 }
 
-char *make_sidebar_entry(char *box, int size, int new, int flagged)
+/* print single item
+ * FIXME this is completely fucked up right now
+ */
+char *make_sidebar_entry (char *box, int size, int new, int flagged)
 {
   int i = 0, dlen, max, shortened = 0;
   int offset;
@@ -125,288 +108,325 @@ char *make_sidebar_entry(char *box, int size, int new, int flagged)
   if (SidebarWidth > COLS)
     SidebarWidth = COLS;
 
-  dlen = mutt_strlen(SidebarDelim);
+  dlen = mutt_strlen (SidebarDelim);
   max = SidebarWidth - dlen - 1;
 
-  safe_realloc(&entry, SidebarWidth + 1);
+  safe_realloc (&entry, SidebarWidth + 1);
   entry[SidebarWidth] = 0;
-  for (; i < SidebarWidth; entry[i++] = ' ' );
+  for (; i < SidebarWidth; entry[i++] = ' ');
 #if USE_IMAP
-  if (ImapHomeNamespace && strlen(ImapHomeNamespace)>0) {
-    if (strncmp(box,ImapHomeNamespace,strlen(ImapHomeNamespace))==0 && strcmp(box,ImapHomeNamespace)!=0) {
-      box+=strlen(ImapHomeNamespace)+1;
+  if (ImapHomeNamespace && mutt_strlen (ImapHomeNamespace) > 0) {
+    if (strncmp (box, ImapHomeNamespace, mutt_strlen (ImapHomeNamespace)) == 0
+        && mutt_strcmp (box, ImapHomeNamespace) != 0) {
+      box += mutt_strlen (ImapHomeNamespace) + 1;
     }
   }
 #endif
-  max -= quick_log10(size);
+  max -= quick_log10 (size);
   if (new)
-    max -= quick_log10(new) + 2;
+    max -= quick_log10 (new) + 2;
   if (flagged > 0)
-    max -= quick_log10(flagged) + 2;
-  if (option(OPTSHORTENHIERARCHY) && mutt_strlen(box) > max) {
-    box = shortened_hierarchy(box);
+    max -= quick_log10 (flagged) + 2;
+  if (option (OPTSHORTENHIERARCHY) && mutt_strlen (box) > max) {
+    box = shortened_hierarchy (box);
     shortened = 1;
   }
-  i = strlen(box);
-  strncpy( entry, box, i < SidebarWidth - dlen ? i :SidebarWidth - dlen);
-
-  if ( new ) {
-    if (flagged>0) {
-      offset = SidebarWidth - 5 - quick_log10(size) - dlen - quick_log10(new) - quick_log10(flagged);
-      if (offset<0) offset = 0;
-      snprintf(entry + offset, SidebarWidth - dlen - offset + 1,
-              "% d(%d)[%d]", size, new, flagged);
-    } else {
-      offset = SidebarWidth - 3 - quick_log10(size) - dlen - quick_log10(new);
-      if (offset<0) offset = 0;
-      snprintf(entry + offset, SidebarWidth - dlen - offset + 1,
-              "% d(%d)", size, new);
+  i = mutt_strlen (box);
+  strncpy (entry, box, i < SidebarWidth - dlen ? i : SidebarWidth - dlen);
+
+  if (new) {
+    if (flagged > 0) {
+      offset =
+        SidebarWidth - 5 - quick_log10 (size) - dlen - quick_log10 (new) -
+        quick_log10 (flagged);
+      if (offset < 0)
+        offset = 0;
+      snprintf (entry + offset, SidebarWidth - dlen - offset + 1,
+                "% d(%d)[%d]", size, new, flagged);
+    }
+    else {
+      offset =
+        SidebarWidth - 3 - quick_log10 (size) - dlen - quick_log10 (new);
+      if (offset < 0)
+        offset = 0;
+      snprintf (entry + offset, SidebarWidth - dlen - offset + 1,
+                "% d(%d)", size, new);
+    }
+  }
+  else {
+    if (flagged > 0) {
+      offset =
+        SidebarWidth - 3 - quick_log10 (size) - dlen - quick_log10 (flagged);
+      if (offset < 0)
+        offset = 0;
+      snprintf (entry + offset, SidebarWidth - dlen - offset + 1,
+                "% d[%d]", size, flagged);
     }
-  } else {
-    if (flagged>0) {
-      offset = SidebarWidth - 3 - quick_log10(size) - dlen - quick_log10(flagged);
-      if (offset<0) offset = 0;
-      snprintf( entry + offset, SidebarWidth - dlen - offset + 1,
-              "% d[%d]", size,flagged);
-    } else {
-      offset = SidebarWidth - 1 - quick_log10(size) - dlen;
-      if (offset<0) offset = 0;
-      snprintf( entry + offset, SidebarWidth - dlen - offset + 1,
-              "% d", size);
+    else {
+      offset = SidebarWidth - 1 - quick_log10 (size) - dlen;
+      if (offset < 0)
+        offset = 0;
+      snprintf (entry + offset, SidebarWidth - dlen - offset + 1,
+                "% d", size);
     }
   }
 
-  if (option(OPTSHORTENHIERARCHY) && shortened) {
-    free(box);
+  if (option (OPTSHORTENHIERARCHY) && shortened) {
+    free (box);
   }
   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;
-    }
+/* returns folder name of currently 
+ * selected folder for <sidebar-open>
+ */
+const char* sidebar_get_current (void) {
+  if (list_empty(Incoming))
+    return (NULL);
+  return ((char*) ((BUFFY*) Incoming->data[CurBuffy])->path);
+}
 
-    if(tmp->next)
-      tmp = tmp->next;
-    else
-      break;
-  }
+/* internally sets item to buf */
+void sidebar_set_current (const char* buf) {
+  int i = buffy_lookup (buf);
+  if (i >= 0)
+    CurBuffy = i;
 }
 
-void set_buffystats (CONTEXT* Context)
-{
-  BUFFY* tmp = Incoming;
-  if (!Context)
+/* fix counters for a context
+ * FIXME since ctx must not be of our business, move it elsewhere
+ */
+void sidebar_set_buffystats (CONTEXT* Context) {
+  int i = 0;
+  BUFFY* tmp = NULL;
+  if (!Context || list_empty(Incoming) || (i = buffy_lookup (Context->path)) < 0)
     return;
-  while (tmp)
-  {
-    if (strcmp (tmp->path, Context->path) == 0)
-    {
-      tmp->new = Context->new;
-      tmp->msg_unread = Context->unread;
-      tmp->msgcount = Context->msgcount;
-      tmp->msg_flagged = Context->flagged;
-      break;
-    }
-    tmp = tmp->next;
-  }
+  tmp = (BUFFY*) Incoming->data[i];
+  tmp->new = Context->new;
+  tmp->msg_unread = Context->unread;
+  tmp->msgcount = Context->msgcount;
+  tmp->msg_flagged = Context->flagged;
 }
 
-int draw_sidebar(int menu) {
+/* actually draws something
+ * FIXME this needs some clue when to do it
+ * FIXME this is completely fucked up right now
+ */
+int sidebar_draw (int menu)
+{
 
-  int lines = option(OPTHELP) ? 1 : 0;
+  int lines = option (OPTHELP) ? 1 : 0;
   BUFFY *tmp;
+  int i = 0;
   short delim_len = mutt_strlen (SidebarDelim);
 
   /* initialize first time */
-  if(!initialized) {
-    prev_show_value = option(OPTMBOXPANE);
+  if (!initialized) {
+    prev_show_value = option (OPTMBOXPANE);
     saveSidebarWidth = SidebarWidth;
-    if(!option(OPTMBOXPANE)) SidebarWidth = 0;
+    if (!option (OPTMBOXPANE))
+      SidebarWidth = 0;
     initialized = 1;
   }
 
   /* save or restore the value SidebarWidth */
-  if(prev_show_value != option(OPTMBOXPANE)) {
-    if(prev_show_value && !option(OPTMBOXPANE)) {
+  if (prev_show_value != option (OPTMBOXPANE)) {
+    if (prev_show_value && !option (OPTMBOXPANE)) {
       saveSidebarWidth = SidebarWidth;
       SidebarWidth = 0;
-    } else if(!prev_show_value && option(OPTMBOXPANE)) {
+    }
+    else if (!prev_show_value && option (OPTMBOXPANE)) {
       SidebarWidth = saveSidebarWidth;
       /* after toggle: force recounting of all mail */
-      mutt_buffy_check(2);
+      mutt_buffy_check (2);
     }
-    prev_show_value = option(OPTMBOXPANE);
+    prev_show_value = option (OPTMBOXPANE);
+  }
+
+  if (SidebarWidth > 0 && option (OPTMBOXPANE)
+      && mutt_strlen (SidebarDelim) >= SidebarWidth) {
+    mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
+    sleep (2);
+    unset_option (OPTMBOXPANE);
+    return (0);
   }
 
-  if ( SidebarWidth == 0 ) return 0;
+  if (SidebarWidth == 0 || !option (OPTMBOXPANE))
+    return 0;
 
   /* draw the divider */
-  /* SETCOLOR(MT_COLOR_STATUS); */
-    SETCOLOR(MT_COLOR_SIDEBAR);
+  SETCOLOR (MT_COLOR_SIDEBAR);
   for (lines = 1;
-       lines < LINES-1-(menu != MENU_PAGER || option (OPTSTATUSONTOP)); lines++ ) {
-    move(lines, SidebarWidth - delim_len);
-    addstr (NONULL (SidebarDelim));
+       lines < LINES - 1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
+       lines++) {
+    move (lines, SidebarWidth - delim_len);
+    if (option (OPTASCIICHARS))
+      addstr (NONULL (SidebarDelim));
+    else if (!option (OPTASCIICHARS) && !mutt_strcmp (SidebarDelim, "|"))
+      addch (ACS_VLINE);
+    else if ((Charset_is_utf8) && !mutt_strcmp (SidebarDelim, "|"))
+      addstr ("\342\224\202");
+    else
+      addstr (NONULL (SidebarDelim));
   }
-  SETCOLOR(MT_COLOR_NORMAL);
+  SETCOLOR (MT_COLOR_NORMAL);
 
-  if ( Incoming == 0 ) return 0;
-  lines = option(OPTHELP) ? 1 : 0; /* go back to the top */
+  if (list_empty(Incoming))
+    return 0;
 
-  if ( CurBuffy == 0 ) CurBuffy = Incoming;
-#if 0
-  if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) 
-#endif
-    calc_boundaries(menu);
+  lines = option (OPTHELP) ? 1 : 0;     /* go back to the top */
 
-  tmp = TopBuffy;
+  calc_boundaries (menu);
 
-  for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP)); tmp = tmp->next ) {
-    if ( tmp == CurBuffy )
-      SETCOLOR(MT_COLOR_INDICATOR);
-    else if ( tmp->msg_flagged > 0 )
-      SETCOLOR(MT_COLOR_FLAGGED);
-    else if ( tmp->msg_unread > 0 )
-      SETCOLOR(MT_COLOR_NEW);
+  for (i = TopBuffy; i < Incoming->length && lines < LINES - 1 - 
+       (menu != MENU_PAGER || option (OPTSTATUSONTOP)); i++) {
+    tmp = (BUFFY*) Incoming->data[i];
+    if (i == CurBuffy)
+      SETCOLOR (MT_COLOR_INDICATOR);
+    else if (tmp->msg_flagged > 0)
+      SETCOLOR (MT_COLOR_FLAGGED);
+    else if (tmp->msg_unread > 0)
+      SETCOLOR (MT_COLOR_NEW);
     else
-      SETCOLOR(MT_COLOR_NORMAL);
+      SETCOLOR (MT_COLOR_NORMAL);
 
-    move( lines, 0 );
-    if (option(OPTSIDEBARNEWMAILONLY)) {
+    move (lines, 0);
+    if (option (OPTSIDEBARNEWMAILONLY)) {
       if (tmp->msg_unread > 0) {
-        if ( Context && !strcmp( tmp->path, Context->path ) ) {
-          printw( "%.*s", SidebarWidth - delim_len,
-                  make_sidebar_entry(basename(tmp->path),
-                                     Context->msgcount, Context->unread, Context->flagged));
+        if (Context && !mutt_strcmp (tmp->path, Context->path)) {
+          printw ("%.*s", SidebarWidth - delim_len,
+                  make_sidebar_entry (basename (tmp->path),
+                                      Context->msgcount, Context->unread,
+                                      Context->flagged));
           tmp->msg_unread = Context->unread;
           tmp->msgcount = Context->msgcount;
           tmp->msg_flagged = Context->flagged;
         }
         else
-          printw( "%.*s", SidebarWidth - delim_len,
-                  make_sidebar_entry(basename(tmp->path),
-                                     tmp->msgcount,tmp->msg_unread, tmp->msg_flagged));
+          printw ("%.*s", SidebarWidth - delim_len,
+                  make_sidebar_entry (basename (tmp->path),
+                                      tmp->msgcount, tmp->msg_unread,
+                                      tmp->msg_flagged));
         lines++;
       }
-    } else {
-      if ( Context && !strcmp( tmp->path, Context->path ) ) {
-        printw( "%.*s", SidebarWidth - delim_len,
-                make_sidebar_entry(basename(tmp->path),
-                                   Context->msgcount, Context->unread, Context->flagged));
+    }
+    else {
+      if (Context && !mutt_strcmp (tmp->path, Context->path)) {
+        printw ("%.*s", SidebarWidth - delim_len,
+                make_sidebar_entry (basename (tmp->path),
+                                    Context->msgcount, Context->unread,
+                                    Context->flagged));
         tmp->msg_unread = Context->unread;
         tmp->msgcount = Context->msgcount;
         tmp->msg_flagged = Context->flagged;
       }
       else
-        printw( "%.*s", SidebarWidth - delim_len,
-                make_sidebar_entry(basename(tmp->path),
-                                   tmp->msgcount,tmp->msg_unread, tmp->msg_flagged));
+        printw ("%.*s", SidebarWidth - delim_len,
+                make_sidebar_entry (basename (tmp->path),
+                                    tmp->msgcount, tmp->msg_unread,
+                                    tmp->msg_flagged));
       lines++;
     }
   }
-  SETCOLOR(MT_COLOR_NORMAL);
-  for ( ; lines < LINES - 1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP)); 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(' ');
+
+    move (lines, 0);
+    for (; i < SidebarWidth - delim_len; i++)
+      addch (' ');
   }
   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;
+/* returns index of new item with new mail or -1 */
+static int exist_next_new () {
+  int i = 0;
+  if (list_empty(Incoming))
+    return (-1);
+  i = CurBuffy + 1;
+  while (i < Incoming->length)
+    if (((BUFFY*) Incoming->data[i++])->msg_unread)
+      return (i-1);
+  return (-1);
 }
 
-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 scroll_sidebar(int op, int menu)
-{
-  BUFFY *tmp;
+/* returns index of prev item with new mail or -1 */
+static int exist_prev_new () {
+  int i = 0;
+  if (list_empty(Incoming))
+    return (-1);
+  i = CurBuffy - 1;
+  while (i >= 0)
+    if (((BUFFY*) Incoming->data[i--])->msg_unread)
+      return (i+1);
+  return (-1);
+}
 
-  if(!SidebarWidth) return;
-  if(!CurBuffy) return;
+void sidebar_scroll (int op, int menu) {
+  int i = 0;
+
+  if (!SidebarWidth || list_empty(Incoming))
+    return;
 
   switch (op) {
-    case OP_SIDEBAR_NEXT:
-      if (!option(OPTSIDEBARNEWMAILONLY)) {
-        if ( CurBuffy->next == NULL ) {
-          mutt_error (_("You are on the last mailbox."));
-          return;
-        }
-        CurBuffy = CurBuffy->next;
-        break;
-      } /* the fall-through is intentional */
-    case OP_SIDEBAR_NEXT_NEW:
-      if ( (tmp = exist_next_new()) == NULL) {
-        mutt_error (_("No next mailboxes with new mail."));
+  case OP_SIDEBAR_NEXT:
+    if (!option (OPTSIDEBARNEWMAILONLY)) {
+      if (CurBuffy + 1 == Incoming->length) {
+        mutt_error (_("You are on the last mailbox."));
         return;
       }
-      else CurBuffy = tmp;
+      CurBuffy++;
       break;
-    case OP_SIDEBAR_PREV:
-      if (!option(OPTSIDEBARNEWMAILONLY)) {
-        if ( CurBuffy->prev == NULL ) {
-          mutt_error (_("You are on the first mailbox."));
-          return;
-        }
-        CurBuffy = CurBuffy->prev;
-       break;
-     } /* the fall-through is intentional */
-    case OP_SIDEBAR_PREV_NEW:
-      if ( (tmp = exist_prev_new()) == NULL) {
-        mutt_error (_("No previous mailbox with new mail."));
+    }                           /* the fall-through is intentional */
+  case OP_SIDEBAR_NEXT_NEW:
+    if ((i = exist_next_new ()) < 0) {
+      mutt_error (_("No next mailboxes with new mail."));
+      return;
+    }
+    else
+      CurBuffy = i;
+    break;
+  case OP_SIDEBAR_PREV:
+    if (!option (OPTSIDEBARNEWMAILONLY)) {
+      if (CurBuffy == 0) {
+        mutt_error (_("You are on the first mailbox."));
         return;
       }
-      else CurBuffy = tmp;
-      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;
-      }
+      CurBuffy--;
       break;
-    default:
+    }                           /* the fall-through is intentional */
+  case OP_SIDEBAR_PREV_NEW:
+    if ((i = exist_prev_new ()) < 0) {
+      mutt_error (_("No previous mailbox with new mail."));
       return;
+    }
+    else
+      CurBuffy = i;
+    break;
+
+  case OP_SIDEBAR_SCROLL_UP:
+    if (TopBuffy == 0) {
+      mutt_error (_("You are on the first mailbox."));
+      return;
+    }
+    CurBuffy -= known_lines;
+    if (CurBuffy < 0)
+      CurBuffy = 0;
+    break;
+  case OP_SIDEBAR_SCROLL_DOWN:
+    if (TopBuffy + known_lines >= Incoming->length) {
+      mutt_error (_("You are on the last mailbox."));
+      return;
+    }
+    CurBuffy += known_lines;
+    if (CurBuffy >= Incoming->length)
+      CurBuffy = Incoming->length;
+    break;
+  default:
+    return;
   }
-  calc_boundaries(menu);
-  draw_sidebar(menu);
+  calc_boundaries (menu);
+  sidebar_draw (menu);
 }