X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=9290a1a0ae52dae5d61a10c2f37834926b1dcf40;hp=5089989621c0390e74947aa1db4831d1396c6378;hb=58fbf95737a7601f6e139e39b9f69d102c7e858d;hpb=cc3d47bfac671f147aa0822cd5ecdc84e91de979

diff --git a/sidebar.c b/sidebar.c
index 5089989..9290a1a 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -46,58 +46,40 @@ static int quick_log10(int n)
   return (++len);
 }
 
-static int cur_is_hidden (int maxline)
-{
-  int l = 0, seen = 0;
-  BUFFY* tmp = TopBuffy;
-  if (!CurBuffy)
-    return (0);
-  while (tmp && l < maxline && !seen)
-  {
-    if (strcmp (tmp->path, CurBuffy->path) == 0)
-      seen = 1;
-    else
-      tmp = tmp->next;
-    l++;
-  }
-  return (seen == 0 || l == maxline);
-}
-
+// CurBuffy should contain a valid buffy mailbox before calling this function!!!
 void calc_boundaries (int menu)
 {
   BUFFY *tmp = Incoming;
+  int position;
+  int i,count, mailbox_position;
 
+  // correct known_lines if it has changed because of a window resize
   if ( known_lines != LINES ) {
-    TopBuffy = BottomBuffy = 0;
     known_lines = LINES;
   }
+  // fix all the prev links on all the mailboxes
   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;
+  // 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;
 }
 
 static char * shortened_hierarchy(char * box) {
@@ -207,6 +189,8 @@ void set_curbuffy(char buf[LONG_STRING])
 void set_buffystats (CONTEXT* Context)
 {
   BUFFY* tmp = Incoming;
+  if (!Context)
+    return;
   while (tmp)
   {
     if (strcmp (tmp->path, Context->path) == 0)
@@ -241,6 +225,8 @@ int draw_sidebar(int menu) {
       SidebarWidth = 0;
     } else if(!prev_show_value && option(OPTMBOXPANE)) {
       SidebarWidth = saveSidebarWidth;
+      /* after toggle: force recounting of all mail */
+      mutt_buffy_check(1);
     }
     prev_show_value = option(OPTMBOXPANE);
   }
@@ -259,12 +245,9 @@ int draw_sidebar(int menu) {
   if ( Incoming == 0 ) return 0;
   lines = option(OPTHELP) ? 1 : 0; /* go back to the top */
 
-  if (cur_is_hidden (LINES-1-(menu != MENU_PAGER)))
-    CurBuffy = TopBuffy;
-
+  if ( CurBuffy == 0 ) CurBuffy = Incoming;
   if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) 
     calc_boundaries(menu);
-  if ( CurBuffy == 0 ) CurBuffy = Incoming;
 
   tmp = TopBuffy;
 
@@ -330,9 +313,10 @@ BUFFY * exist_prev_new()
 
 void scroll_sidebar(int op, int menu)
 {
-        if(!SidebarWidth) return;
-        if(!CurBuffy) return;
-	BUFFY *tmp;
+  BUFFY *tmp;
+
+  if(!SidebarWidth) return;
+  if(!CurBuffy) return;
 
   switch (op) {
     case OP_SIDEBAR_NEXT:
@@ -341,10 +325,7 @@ void scroll_sidebar(int op, int menu)
       break;
     case OP_SIDEBAR_NEXT_NEW:
       if ( (tmp = exist_next_new()) == NULL)
-      {
-	      if (CurBuffy->next == NULL) return;
-	      CurBuffy = CurBuffy->next;
-      }
+          return;
       else CurBuffy = tmp;
       break;
     case OP_SIDEBAR_PREV:
@@ -353,10 +334,7 @@ void scroll_sidebar(int op, int menu)
      break;
     case OP_SIDEBAR_PREV_NEW:
       if ( (tmp = exist_prev_new()) == NULL)
-      {
-	      if(CurBuffy->prev == NULL) return;
-	      CurBuffy = CurBuffy->prev;
-      }
+          return;
       else CurBuffy = tmp;
       break;