X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=c59e9825a0fa025d21ff5814449e6005fb893751;hp=4f5d17c05646296caac92f350abae1969620c188;hb=939231b97323754e1329160d25212083242f7e09;hpb=fd204cba10834057df23ba10458d4095b424e964

diff --git a/sidebar.c b/sidebar.c
index 4f5d17c..c59e982 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -26,14 +26,13 @@
 #include "buffy.h"
 #include <libgen.h>
 #include "keymap.h"
-#include <stdbool.h>
 #include <ctype.h>
 
 /*BUFFY *CurBuffy = 0;*/
 static BUFFY *TopBuffy = 0;
 static BUFFY *BottomBuffy = 0;
 static int known_lines = 0;
-static bool initialized = false;
+static short initialized = 0;
 static int prev_show_value;
 static short saveSidebarWidth;
 static char *entry = 0;
@@ -46,58 +45,43 @@ 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
+   * FIXME move this over to buffy.c where it belongs */
   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) {
@@ -133,13 +117,18 @@ static char * shortened_hierarchy(char * box) {
   return safe_strdup(box);
 }
 
-char *make_sidebar_entry(char *box, int size, int new, int tagged)
+char *make_sidebar_entry(char *box, int size, int new, int flagged)
 {
-  char *c;
-  int i = 0, dlen = mutt_strlen (SidebarDelim);
+  int i = 0, dlen, max, shortened = 0;
+  int offset;
+
+  if (SidebarWidth > COLS)
+    SidebarWidth = COLS;
+
+  dlen = mutt_strlen(SidebarDelim);
+  max = SidebarWidth - dlen - 1;
 
-  c = realloc(entry, SidebarWidth + 1);
-  if ( c ) entry = c;
+  safe_realloc(&entry, SidebarWidth + 1);
   entry[SidebarWidth] = 0;
   for (; i < SidebarWidth; entry[i++] = ' ' );
 #if USE_IMAP
@@ -149,29 +138,45 @@ char *make_sidebar_entry(char *box, int size, int new, int tagged)
     }
   }
 #endif
-  if (option(OPTSHORTENHIERARCHY)) {
+  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);
+    shortened = 1;
   }
   i = strlen(box);
   strncpy( entry, box, i < SidebarWidth - dlen ? i :SidebarWidth - dlen);
 
   if ( new ) {
-    if (tagged>0) {
-      sprintf(entry + SidebarWidth - 5 - quick_log10(size) - dlen - quick_log10(new) - quick_log10(tagged),
-              "% d(%d)[%d]", size, new, tagged);
+    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 {
-      sprintf(entry + SidebarWidth - 3 - quick_log10(size) - dlen - quick_log10(new),
+      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 (tagged>0) {
-      sprintf( entry + SidebarWidth - 3 - quick_log10(size) - dlen - quick_log10(tagged), "% d[%d]", size,tagged);
+    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 {
-      sprintf( entry + SidebarWidth - 1 - quick_log10(size) - dlen, "% d", size);
+      offset = SidebarWidth - 1 - quick_log10(size) - dlen;
+      if (offset<0) offset = 0;
+      snprintf( entry + offset, SidebarWidth - dlen - offset + 1,
+              "% d", size);
     }
-
   }
-  if (option(OPTSHORTENHIERARCHY)) {
+
+  if (option(OPTSHORTENHIERARCHY) && shortened) {
     free(box);
   }
   return entry;
@@ -200,13 +205,16 @@ 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)
     {
+      tmp->new = Context->new;
       tmp->msg_unread = Context->unread;
       tmp->msgcount = Context->msgcount;
-      tmp->msg_tagged = Context->flagged;
+      tmp->msg_flagged = Context->flagged;
       break;
     }
     tmp = tmp->next;
@@ -224,7 +232,7 @@ int draw_sidebar(int menu) {
     prev_show_value = option(OPTMBOXPANE);
     saveSidebarWidth = SidebarWidth;
     if(!option(OPTMBOXPANE)) SidebarWidth = 0;
-    initialized = true;
+    initialized = 1;
   }
 
   /* save or restore the value SidebarWidth */
@@ -234,55 +242,92 @@ 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(2);
     }
     prev_show_value = option(OPTMBOXPANE);
   }
 
-  if ( SidebarWidth == 0 ) return 0;
+  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 || !option (OPTMBOXPANE))
+    return 0;
 
   /* draw the divider */
-  SETCOLOR(MT_COLOR_STATUS);
-  for (lines = option (OPTSTATUSONTOP) ? 0 : 1; 
+  /* SETCOLOR(MT_COLOR_STATUS); */
+    SETCOLOR(MT_COLOR_SIDEBAR);
+  for (lines = 1;
        lines < LINES-1-(menu != MENU_PAGER || option (OPTSTATUSONTOP)); lines++ ) {
     move(lines, SidebarWidth - delim_len);
-    addstr (NONULL (SidebarDelim));
+    if (option (OPTASCIICHARS))
+      addstr (NONULL (SidebarDelim));
+    else if(!option(OPTASCIICHARS) && !strcmp(SidebarDelim,"|"))
+      addch(ACS_VLINE);
+    else if ((Charset_is_utf8) && !strcmp(SidebarDelim, "|"))
+      addstr ("\342\224\202");
+    else
+      addstr (NONULL (SidebarDelim));
   }
   SETCOLOR(MT_COLOR_NORMAL);
 
   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 0
   if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) 
+#endif
     calc_boundaries(menu);
-  if ( CurBuffy == 0 ) CurBuffy = Incoming;
 
   tmp = TopBuffy;
 
   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);
     else
       SETCOLOR(MT_COLOR_NORMAL);
 
     move( lines, 0 );
-    if ( Context && !strcmp( tmp->path, Context->path ) ) {
-      printw( "%.*s", SidebarWidth - delim_len,
-              make_sidebar_entry(basename(tmp->path),
-                                 Context->msgcount, Context->unread, Context->tagged));
-      tmp->msg_unread = Context->unread;
-      tmp->msgcount = Context->msgcount;
-      tmp->msg_tagged = Context->tagged;
+    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));
+          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 && !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
-      printw( "%.*s", SidebarWidth - delim_len,
-              make_sidebar_entry(basename(tmp->path),
-                                 tmp->msgcount,tmp->msg_unread, tmp->msg_tagged));
-    lines++;
   }
   SETCOLOR(MT_COLOR_NORMAL);
   for ( ; lines < LINES - 1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP)); lines++ ) {
@@ -294,24 +339,72 @@ int draw_sidebar(int menu) {
   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;
+}
+
+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)
 {
-        if(!SidebarWidth) return;
-        if(!CurBuffy) return;
+  BUFFY *tmp;
+
+  if(!SidebarWidth) return;
+  if(!CurBuffy) return;
 
   switch (op) {
     case OP_SIDEBAR_NEXT:
-      if ( CurBuffy->next == NULL ) return;
-      CurBuffy = CurBuffy->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."));
+        return;
+      }
+      else CurBuffy = tmp;
       break;
     case OP_SIDEBAR_PREV:
-      if ( CurBuffy == Incoming ) return;
-      {
-        BUFFY *tmp = Incoming;
-        while ( tmp->next && strcmp(tmp->next->path, CurBuffy->path) ) tmp = tmp->next;
-        CurBuffy = tmp;
+      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."));
+        return;
       }
+      else CurBuffy = tmp;
       break;
+     
     case OP_SIDEBAR_SCROLL_UP:
       CurBuffy = TopBuffy;
       if ( CurBuffy != Incoming ) {