X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=15a2eef6d9e1aff8e85a94c1ea18be0eb9a6078b;hp=c352913b345261e7b73b2970f400bee29b671507;hb=7c6a042ca1bccde0ed39d2499e9272f963025e75;hpb=0d23a37d51884266b694d3a94300ddb5c3faf4fa

diff --git a/sidebar.c b/sidebar.c
index c352913..15a2eef 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -12,81 +12,80 @@
  * please see the file GPL in the top level source directory.
  */
 
+#include <libgen.h>
+#include <ctype.h>
+
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
+#include "charset.h"
 #include "sidebar.h"
 #include "buffy.h"
 #include "keymap.h"
 
-#include "lib/mem.h"
-#include "lib/str.h"
-#include "lib/intl.h"
-
-#include <libgen.h>
-#include <ctype.h>
-
 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;
-
-/* 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);
-  return (++len);
-}
+static short prev_show_value;
 
 /* computes first entry to be shown */
-void calc_boundaries (int menu)
-{
-  int lines = 0;
-
+static void calc_boundaries (void) {
   if (list_empty(Incoming))
     return;
-  /* correct known_lines if it has changed because of a window resize */
-  if (known_lines != LINES)
-    known_lines = LINES;
-  lines = LINES - 2 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
-  TopBuffy = CurBuffy - (CurBuffy % lines);
+  if (CurBuffy < 0 || CurBuffy >= Incoming->length)
+    CurBuffy = 0;
+  if (TopBuffy < 0 || TopBuffy >= Incoming->length)
+    TopBuffy = 0;
+
+  if (option (OPTSIDEBARNEWMAILONLY)) {
+    int i = CurBuffy;
+    TopBuffy = CurBuffy - 1;
+    while (i >= 0) {
+      if (((BUFFY*) Incoming->data[i])->new > 0)
+        TopBuffy = i;
+      i--;
+    }
+  } else if (known_lines>0)
+    TopBuffy = CurBuffy - (CurBuffy % known_lines);
   if (TopBuffy < 0)
     TopBuffy = 0;
 }
 
-static char *shortened_hierarchy (char *box)
+static char *shortened_hierarchy (char *box, int maxlen)
 {
   int dots = 0;
-  char *last_dot;
-  int i, j;
+  char *last_dot = NULL;
+  int i, j, len = m_strlen(box);
   char *new_box;
 
-  for (i = 0; i < mutt_strlen (box); ++i) {
-    if (box[i] == '.')
+  if (!SidebarBoundary || !*SidebarBoundary)
+    return (m_strdup(box));
+
+  for (i = 0; i < len; ++i) {
+    if (strchr (SidebarBoundary, box[i])) {
       ++dots;
-    else if (isupper (box[i]))
-      return (safe_strdup (box));
+      last_dot = &box[i];
+    }
   }
-  last_dot = strrchr (box, '.');
+
   if (last_dot) {
     ++last_dot;
-    new_box = safe_malloc (mutt_strlen (last_dot) + 2 * dots + 1);
+    new_box = p_new(char, maxlen + 1);
     new_box[0] = box[0];
-    for (i = 1, j = 1; i < mutt_strlen (box); ++i) {
-      if (box[i] == '.') {
-        new_box[j++] = '.';
+    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 + m_strlen(last_dot) > maxlen) {
           new_box[j++] = box[i + 1];
           new_box[j] = 0;
-        }
-        else {
+        } else {
           strcat (&new_box[j], last_dot);
           break;
         }
@@ -94,87 +93,150 @@ static char *shortened_hierarchy (char *box)
     }
     return new_box;
   }
-  return safe_strdup (box);
+  return m_strdup(box);
+}
+
+static const char* sidebar_number_format (char* dest, ssize_t destlen, char op,
+                                          const char* src, const char* fmt,
+                                          const char* ifstr, const char* elstr,
+                                          unsigned long data, format_flag flags) {
+  char tmp[SHORT_STRING];
+  BUFFY* b = (BUFFY*) Incoming->data[data];
+  int opt = flags & M_FORMAT_OPTIONAL;
+  int c = Context && !m_strcmp(Context->path, b->path);
+
+  switch (op) {
+    /* deleted */
+    case 'd':
+      if (!opt) {
+        snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+        snprintf (dest, destlen, tmp, c ? Context->deleted : 0);
+      } else if ((c && Context->deleted == 0) || !c)
+        opt = 0;
+      break;
+    /* flagged */
+    case 'F':
+    case 'f':                   /* for compatibility */
+      if (!opt) {
+        snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+        snprintf (dest, destlen, tmp, c ? Context->flagged : b->msg_flagged);
+      } else if ((c && Context->flagged == 0) || (!c && b->msg_flagged == 0))
+        opt = 0;
+      break;
+    /* total */
+    case 'c':                   /* for compatibility */
+    case 'm':
+      if (!opt) {
+        snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+        snprintf (dest, destlen, tmp, c ? Context->msgcount : b->msgcount);
+      } else if ((c && Context->msgcount == 0) || (!c && b->msgcount == 0))
+        opt = 0;
+      break;
+    /* total shown, i.e. not hidden by limit */
+    case 'M':
+      if (!opt) {
+        snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+        snprintf (dest, destlen, tmp, c ? Context->vcount : 0);
+      } else if ((c && Context->vcount == 0) || !c)
+        opt = 0;
+      break;
+    /* new */
+    case 'n':
+      if (!opt) {
+        snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+        snprintf (dest, destlen, tmp, c ? Context->new : b->new);
+      } else if ((c && Context->new == 0) || (!c && b->new == 0))
+        opt = 0;
+      break;
+    /* unread */
+    case 'u':
+      if (!opt) {
+        snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+        snprintf (dest, destlen, tmp, c ? Context->unread : b->msg_unread);
+      } else if ((c && Context->unread == 0) || (!c && b->msg_unread == 0))
+        opt = 0;
+      break;
+    /* tagged */
+    case 't':
+      if (!opt) {
+        snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+        snprintf (dest, destlen, tmp, c ? Context->tagged : 0);
+      } else if ((c && Context->tagged == 0) || !c)
+        opt = 0;
+      break;
+  }
+
+  if (opt)
+    mutt_FormatString (dest, destlen, ifstr, sidebar_number_format,
+                       data, M_FORMAT_OPTIONAL);
+  else if (flags & M_FORMAT_OPTIONAL)
+    mutt_FormatString (dest, destlen, elstr, sidebar_number_format,
+                       data, M_FORMAT_OPTIONAL);
+  return (src);
+}
+
+int sidebar_need_count (void) {
+  if (!option (OPTMBOXPANE) || SidebarWidth == 0 ||
+      !SidebarNumberFormat || !*SidebarNumberFormat)
+    return (0);
+  return (1);
 }
 
 /* print single item
- * FIXME this is completely fucked up right now
+ * returns:
+ *      0       item was not printed ('cause of $sidebar_newmail_only)
+ *      1       item was printed
  */
-char *make_sidebar_entry (char *box, int size, int new, int flagged)
+int make_sidebar_entry (char* box, int idx, ssize_t len)
 {
-  int i = 0, dlen, max, shortened = 0;
-  int offset;
+  int shortened = 0, lencnt = 0;
+  char no[SHORT_STRING], entry[SHORT_STRING];
+  int l = m_strlen(ImapHomeNamespace);
+  int l_m = m_strlen(Maildir);
 
   if (SidebarWidth > COLS)
     SidebarWidth = COLS;
 
-  dlen = mutt_strlen (SidebarDelim);
-  max = SidebarWidth - dlen - 1;
-
-  safe_realloc (&entry, SidebarWidth + 1);
-  entry[SidebarWidth] = 0;
-  for (; i < SidebarWidth; entry[i++] = ' ');
-#if USE_IMAP
-  if (ImapHomeNamespace && mutt_strlen (ImapHomeNamespace) > 0) {
-    if (strncmp (box, ImapHomeNamespace, mutt_strlen (ImapHomeNamespace)) == 0
-        && mutt_strcmp (box, ImapHomeNamespace) != 0) {
-      box += mutt_strlen (ImapHomeNamespace) + 1;
+  if (option (OPTSIDEBARNEWMAILONLY) && box && Context && Context->path && 
+      m_strcmp(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) */
+    return (0);
+
+  mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
+                     sidebar_number_format, idx, M_FORMAT_OPTIONAL);
+  lencnt = m_strlen(no);
+  memset(&entry, ' ', sizeof(entry));
+
+  if (l > 0 && m_strncmp(box, ImapHomeNamespace, l) == 0 && 
+      m_strlen(box) > l)
+    box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
+  else
+  if (l_m > 0 && m_strncmp(box, Maildir, l_m) == 0 && 
+      m_strlen(box) > l_m) {
+    box += l_m;
+    if (Maildir[strlen(Maildir)-1]!='/') {
+      box += 1;
     }
-  }
-#endif
-  max -= quick_log10 (size);
-  if (new)
-    max -= quick_log10 (new) + 2;
-  if (flagged > 0)
-    max -= quick_log10 (flagged) + 2;
-  if (option (OPTSHORTENHIERARCHY) && mutt_strlen (box) > max) {
-    box = shortened_hierarchy (box);
+  } else
+    box = basename (box);
+
+  if (option (OPTSHORTENHIERARCHY) && m_strlen(box) > len-lencnt-1) {
+    box = shortened_hierarchy (box, len-lencnt-1);
     shortened = 1;
   }
-  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 {
-      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);
-  }
-  return entry;
+  m_strcpy(entry, len - lencnt, box);
+  entry[m_strlen(entry)] = ' ';
+  memcpy(entry + (len - lencnt), no, lencnt);
+
+  addnstr (entry, len);
+
+  if (shortened)
+    p_delete(&box);
+
+  return (1);
 }
 
 /* returns folder name of currently 
@@ -189,8 +251,10 @@ const char* sidebar_get_current (void) {
 /* internally sets item to buf */
 void sidebar_set_current (const char* buf) {
   int i = buffy_lookup (buf);
-  if (i >= 0)
+  if (i >= 0) {
     CurBuffy = i;
+    calc_boundaries();
+  }
 }
 
 /* fix counters for a context
@@ -208,43 +272,84 @@ void sidebar_set_buffystats (CONTEXT* Context) {
   tmp->msg_flagged = Context->flagged;
 }
 
+void sidebar_draw_frames (void) {
+  ssize_t i,delim_len;
+
+  if (!option(OPTMBOXPANE) || SidebarWidth==0) 
+    return;
+
+  delim_len=m_strlen(NONULL(SidebarDelim));
+
+  /* draw vertical delimiter */
+  SETCOLOR (MT_COLOR_SIDEBAR);
+  for (i = 0; i < LINES-1; i++) {
+    move (i, SidebarWidth - delim_len);
+    if (option (OPTASCIICHARS))
+      addstr (NONULL (SidebarDelim));
+    else if (!option (OPTASCIICHARS) && !m_strcmp(SidebarDelim, "|"))
+      addch (ACS_VLINE);
+    else if ((Charset_is_utf8) && !m_strcmp(SidebarDelim, "|"))
+      addstr ("\342\224\202");
+    else
+      addstr (NONULL (SidebarDelim));
+  }
+
+  /* fill "gaps" at top+bottom */
+  SETCOLOR(MT_COLOR_STATUS);
+  for (i=0; i<SidebarWidth; i++) {
+    /*
+     * if we don't have $status_on_top and have $help, fill top
+     * gap with spaces to get bg color
+     */
+    if (option(OPTSTATUSONTOP) || option(OPTHELP)) {
+      move(0,i);
+      addch(' ');
+    }
+    /*
+      * if we don't have $status_on_top or we have $help, fill bottom
+      * gap with spaces to get bg color
+      */
+    if (!option(OPTSTATUSONTOP) || option(OPTHELP)) {
+      move(LINES-2,i);
+      addch(' ');
+    }
+  }
+  SETCOLOR (MT_COLOR_NORMAL);
+}
+
 /* 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 sidebar_draw (int menu) {
+  int first_line = option (OPTSTATUSONTOP) ? 1 : option (OPTHELP) ? 1 : 0,
+      last_line = LINES - 2 + (option (OPTSTATUSONTOP) && !option (OPTHELP) ? 1 : 0),
+      i = 0,line;
   BUFFY *tmp;
-  int i = 0;
-  short delim_len = mutt_strlen (SidebarDelim);
+  ssize_t delim_len = m_strlen(SidebarDelim);
+  char blank[SHORT_STRING];
+
+  known_lines=last_line-first_line;
 
   /* initialize first time */
   if (!initialized) {
     prev_show_value = option (OPTMBOXPANE);
-    saveSidebarWidth = SidebarWidth;
-    if (!option (OPTMBOXPANE))
-      SidebarWidth = 0;
     initialized = 1;
   }
 
+  if (TopBuffy==0 || CurBuffy==0)
+    calc_boundaries();
+
   /* save or restore the value SidebarWidth */
   if (prev_show_value != option (OPTMBOXPANE)) {
-    if (prev_show_value && !option (OPTMBOXPANE)) {
-      saveSidebarWidth = SidebarWidth;
-      SidebarWidth = 0;
-    }
-    else if (!prev_show_value && option (OPTMBOXPANE)) {
-      SidebarWidth = saveSidebarWidth;
+    if (!prev_show_value && option (OPTMBOXPANE)) {
       /* after toggle: force recounting of all mail */
-      mutt_buffy_check (2);
+      buffy_check (2);
     }
     prev_show_value = option (OPTMBOXPANE);
   }
 
   if (SidebarWidth > 0 && option (OPTMBOXPANE)
-      && mutt_strlen (SidebarDelim) >= SidebarWidth) {
+      && m_strlen(SidebarDelim) >= SidebarWidth) {
     mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
     sleep (2);
     unset_option (OPTMBOXPANE);
@@ -254,88 +359,35 @@ int sidebar_draw (int menu)
   if (SidebarWidth == 0 || !option (OPTMBOXPANE))
     return 0;
 
-  /* draw the divider */
-  SETCOLOR (MT_COLOR_SIDEBAR);
-  for (lines = 1;
-       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);
+  sidebar_draw_frames();
 
   if (list_empty(Incoming))
     return 0;
 
-  lines = option (OPTHELP) ? 1 : 0;     /* go back to the top */
-
-  calc_boundaries (menu);
-
-  for (i = TopBuffy; i < Incoming->length && lines < LINES - 1 - 
-       (menu != MENU_PAGER || option (OPTSTATUSONTOP)); i++) {
+  /* actually print items */
+  for (i = TopBuffy, line=first_line; i < Incoming->length && line < last_line; i++) {
     tmp = (BUFFY*) Incoming->data[i];
+
     if (i == CurBuffy)
       SETCOLOR (MT_COLOR_INDICATOR);
+    else if (tmp->new > 0)
+      SETCOLOR (MT_COLOR_NEW);
     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);
 
-    move (lines, 0);
-    if (option (OPTSIDEBARNEWMAILONLY)) {
-      if (tmp->msg_unread > 0) {
-        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));
-        lines++;
-      }
-    }
-    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));
-      lines++;
-    }
+    move (line, 0);
+    line += make_sidebar_entry (tmp->path, i, SidebarWidth-delim_len);
   }
+
   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 (' ');
+  /* fill with blanks to bottom */
+  memset(&blank, ' ', sizeof(blank));
+  for (; line < last_line; line++) {
+    move (line, 0);
+    addnstr (blank, SidebarWidth-delim_len);
   }
   return 0;
 }
@@ -347,7 +399,7 @@ static int exist_next_new () {
     return (-1);
   i = CurBuffy + 1;
   while (i < Incoming->length)
-    if (((BUFFY*) Incoming->data[i++])->msg_unread)
+    if (((BUFFY*) Incoming->data[i++])->new > 0)
       return (i-1);
   return (-1);
 }
@@ -359,7 +411,7 @@ static int exist_prev_new () {
     return (-1);
   i = CurBuffy - 1;
   while (i >= 0)
-    if (((BUFFY*) Incoming->data[i--])->msg_unread)
+    if (((BUFFY*) Incoming->data[i--])->new > 0)
       return (i+1);
   return (-1);
 }
@@ -407,7 +459,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;
     }
@@ -416,17 +468,17 @@ 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;
   }
-  calc_boundaries (menu);
+  calc_boundaries ();
   sidebar_draw (menu);
 }