X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=00145ee8ba56d9677c927164662a512ddd88e0a8;hp=01178641ed2d8a0f1724be006bb136661d76b4b0;hb=a9d22903ab440da5d0b4d994d9de49ff2cf663d4;hpb=972ceaccdfed1c8c4a665b2ecb9683d140fdeda2

diff --git a/sidebar.c b/sidebar.c
index 0117864..00145ee 100644
--- 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 = mutt_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)-1; 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 + mutt_strlen (last_dot) > maxlen) {
           new_box[j++] = box[i + 1];
           new_box[j] = 0;
-        }
-        else {
+        } else {
           strcat (&new_box[j], last_dot);
           break;
         }
@@ -107,7 +106,7 @@ static const char* sidebar_number_format (char* dest, size_t destlen, char op,
   char tmp[SHORT_STRING];
   BUFFY* b = (BUFFY*) Incoming->data[data];
   int opt = flags & M_FORMAT_OPTIONAL;
-  int c = Context && safe_strcmp (Context->path, b->path) == 0;
+  int c = Context && str_eq (Context->path, b->path);
 
   switch (op) {
     case 'c':
@@ -156,15 +155,14 @@ int make_sidebar_entry (char* box, int idx, size_t len)
   int shortened = 0, lencnt = 0;
   char no[SHORT_STRING], entry[SHORT_STRING];
 #if USE_IMAP
-  int l = safe_strlen (ImapHomeNamespace);
+  int l = mutt_strlen (ImapHomeNamespace);
 #endif
 
   if (SidebarWidth > COLS)
     SidebarWidth = COLS;
 
   if (option (OPTSIDEBARNEWMAILONLY) && box && Context && Context->path && 
-      safe_strcmp (Context->path, box) != 0 && 
-      ((BUFFY*) Incoming->data[idx])->new == 0)
+      !str_eq (Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0)
     /* if $sidebar_newmail_only is set, don't display the
      * box only if it's not the currently opened
      * (i.e. always display the currently opened) */
@@ -172,24 +170,24 @@ int make_sidebar_entry (char* box, int idx, size_t len)
 
   mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
                      sidebar_number_format, idx, M_FORMAT_OPTIONAL);
-  lencnt = safe_strlen (no);
+  lencnt = mutt_strlen (no);
   memset (&entry, ' ', sizeof (entry));
 
 #if USE_IMAP
   if (l > 0 && safe_strncmp (box, ImapHomeNamespace, l) == 0 && 
-      safe_strlen (box) > l)
+      mutt_strlen (box) > l)
     box += l + 1;
   else
 #endif
     box = basename (box);
 
-  if (option (OPTSHORTENHIERARCHY) && safe_strlen (box) > len-lencnt-1) {
-    box = shortened_hierarchy (box);
+  if (option (OPTSHORTENHIERARCHY) && mutt_strlen (box) > len-lencnt-1) {
+    box = shortened_hierarchy (box, len-lencnt-1);
     shortened = 1;
   }
 
-  snprintf (entry, len-lencnt-1, "%s", box);
-  entry[safe_strlen (entry)] = ' ';
+  snprintf (entry, len-lencnt, "%s", box);
+  entry[mutt_strlen (entry)] = ' ';
   strncpy (entry + (len - lencnt), no, lencnt);
 
   addnstr (entry, len);
@@ -239,7 +237,7 @@ int sidebar_draw (int menu)
 
   int lines = option (OPTHELP) ? 1 : 0, draw_devider = 1, i = 0;
   BUFFY *tmp;
-  short delim_len = safe_strlen (SidebarDelim);
+  short delim_len = mutt_strlen (SidebarDelim);
   char blank[SHORT_STRING];
 
   /* initialize first time */
@@ -262,13 +260,13 @@ 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);
   }
 
   if (SidebarWidth > 0 && option (OPTMBOXPANE)
-      && safe_strlen (SidebarDelim) >= SidebarWidth) {
+      && mutt_strlen (SidebarDelim) >= SidebarWidth) {
     mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
     sleep (2);
     unset_option (OPTMBOXPANE);
@@ -287,9 +285,9 @@ int sidebar_draw (int menu)
       move (lines, SidebarWidth - delim_len);
       if (option (OPTASCIICHARS))
         addstr (NONULL (SidebarDelim));
-      else if (!option (OPTASCIICHARS) && !safe_strcmp (SidebarDelim, "|"))
+      else if (!option (OPTASCIICHARS) && !mutt_strcmp (SidebarDelim, "|"))
         addch (ACS_VLINE);
-      else if ((Charset_is_utf8) && !safe_strcmp (SidebarDelim, "|"))
+      else if ((Charset_is_utf8) && !mutt_strcmp (SidebarDelim, "|"))
         addstr ("\342\224\202");
       else
         addstr (NONULL (SidebarDelim));
@@ -309,10 +307,10 @@ int sidebar_draw (int menu)
 
     if (i == CurBuffy)
       SETCOLOR (MT_COLOR_INDICATOR);
-    else if (tmp->msg_flagged > 0)
-      SETCOLOR (MT_COLOR_FLAGGED);
     else if (tmp->new > 0)
       SETCOLOR (MT_COLOR_NEW);
+    else if (tmp->msg_flagged > 0)
+      SETCOLOR (MT_COLOR_FLAGGED);
     else
       SETCOLOR (MT_COLOR_NORMAL);
 
@@ -397,7 +395,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 +404,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;