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) {
return safe_strdup(box);
}
-char *make_sidebar_entry(char *box, int size, int new)
+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;
- c = realloc(entry, SidebarWidth + 1);
- if ( c ) entry = c;
+ dlen = mutt_strlen(SidebarDelim);
+ max = SidebarWidth - dlen - 1;
+
+ safe_realloc(&entry, SidebarWidth + 1);
entry[SidebarWidth] = 0;
for (; i < SidebarWidth; entry[i++] = ' ' );
#if USE_IMAP
}
}
#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 )
- sprintf(entry + SidebarWidth - 3 - quick_log10(size) - dlen - quick_log10(new),
- "% d(%d)", size, new);
- else
- sprintf( entry + SidebarWidth - 1 - quick_log10(size) - dlen, "% d", size);
- if (option(OPTSHORTENHIERARCHY)) {
+ 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;
void set_buffystats (CONTEXT* Context)
{
BUFFY* tmp = Incoming;
+ if (!Context)
+ return;
while (tmp)
{
if (strcmp (tmp->path, Context->path) == 0)
{
tmp->msg_unread = Context->unread;
tmp->msgcount = Context->msgcount;
+ tmp->msg_flagged = Context->flagged;
break;
}
tmp = tmp->next;
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);
}
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;
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
if ( Context && !strcmp( tmp->path, Context->path ) ) {
printw( "%.*s", SidebarWidth - delim_len,
make_sidebar_entry(basename(tmp->path),
- Context->msgcount, Context->unread));
+ 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->msgcount,tmp->msg_unread, tmp->msg_flagged));
lines++;
}
SETCOLOR(MT_COLOR_NORMAL);
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;
+ if ( CurBuffy->next == NULL ) {
+ mutt_error (_("You are on the last mailbox."));
+ return;
+ }
CurBuffy = CurBuffy->next;
break;
+ 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 ( CurBuffy->prev == NULL ) {
+ mutt_error (_("You are on the first mailbox."));
+ return;
+ }
+ CurBuffy = CurBuffy->prev;
+ break;
+ 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 ) {