Rocco Rutte:

[apps/madmutt.git] / sidebar.c

diff --git a/sidebar.c b/sidebar.c
index d1116fa..305a564 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -41,9 +41,11 @@ void calc_boundaries (int menu)
   if (list_empty(Incoming))
     return;
   /* correct known_lines if it has changed because of a window resize */
-  if (known_lines != LINES)
-    known_lines = LINES;
+  /*  if (known_lines != LINES)
+    known_lines = LINES; */
+  
   lines = LINES - 2 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
+  known_lines = lines;
   if (option (OPTSIDEBARNEWMAILONLY)) {
     int i = CurBuffy;
     TopBuffy = CurBuffy - 1;
@@ -58,38 +60,35 @@ void calc_boundaries (int menu)
     TopBuffy = 0;
 }
 
-static char *shortened_hierarchy (char *box)
+static char *shortened_hierarchy (char *box, int maxlen)
 {
   int dots = 0;
   char *last_dot = NULL;
-  int i, j;
+  int i, j, len = safe_strlen (box);
   char *new_box;
 
   if (!SidebarBoundary || !*SidebarBoundary)
     return (safe_strdup (box));
 
-  for (i = 0; i < safe_strlen (box); ++i) {
-    if (strchr (SidebarBoundary, box[i]))
-      ++dots;
-  }
-  for (i = safe_strlen (box); i >= 0; i--)
+  for (i = 0; i < len; ++i) {
     if (strchr (SidebarBoundary, box[i])) {
+      ++dots;
       last_dot = &box[i];
-      break;
     }
+  }
+
   if (last_dot) {
     ++last_dot;
-    new_box = safe_malloc (safe_strlen (last_dot) + 2 * dots + 1);
+    new_box = safe_malloc (maxlen + 1);
     new_box[0] = box[0];
-    for (i = 1, j = 1; i < safe_strlen (box); ++i) {
+    for (i = 1, j = 1; j < maxlen && i < len; ++i) {
       if (strchr (SidebarBoundary, box[i])) {
         new_box[j++] = box[i];
         new_box[j] = 0;
-        if (&box[i + 1] != last_dot) {
+        if (&box[i + 1] != last_dot || j + safe_strlen (last_dot) > maxlen) {
           new_box[j++] = box[i + 1];
           new_box[j] = 0;
-        }
-        else {
+        } else {
           strcat (&new_box[j], last_dot);
           break;
         }
@@ -184,11 +183,11 @@ int make_sidebar_entry (char* box, int idx, size_t len)
     box = basename (box);
 
   if (option (OPTSHORTENHIERARCHY) && safe_strlen (box) > len-lencnt-1) {
-    box = shortened_hierarchy (box);
+    box = shortened_hierarchy (box, len-lencnt-1);
     shortened = 1;
   }
 
-  snprintf (entry, len-lencnt-1, "%s", box);
+  snprintf (entry, len-lencnt, "%s", box);
   entry[safe_strlen (entry)] = ' ';
   strncpy (entry + (len - lencnt), no, lencnt);
 
@@ -262,7 +261,7 @@ int sidebar_draw (int menu)
     else if (!prev_show_value && option (OPTMBOXPANE)) {
       SidebarWidth = saveSidebarWidth;
       /* after toggle: force recounting of all mail */
-      mutt_buffy_check (2);
+      buffy_check (2);
     }
     prev_show_value = option (OPTMBOXPANE);
   }
@@ -397,7 +396,7 @@ void sidebar_scroll (int op, int menu) {
     break;
 
   case OP_SIDEBAR_SCROLL_UP:
-    if (TopBuffy == 0) {
+    if (CurBuffy == 0) {
       mutt_error (_("You are on the first mailbox."));
       return;
     }
@@ -406,13 +405,13 @@ void sidebar_scroll (int op, int menu) {
       CurBuffy = 0;
     break;
   case OP_SIDEBAR_SCROLL_DOWN:
-    if (TopBuffy + known_lines >= Incoming->length) {
+    if (CurBuffy + 1 == Incoming->length) {
       mutt_error (_("You are on the last mailbox."));
       return;
     }
     CurBuffy += known_lines;
     if (CurBuffy >= Incoming->length)
-      CurBuffy = Incoming->length;
+      CurBuffy = Incoming->length - 1;
     break;
   default:
     return;