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) {
char *make_sidebar_entry(char *box, int size, int new, int flagged)
{
- char *c;
- int i = 0, dlen = mutt_strlen (SidebarDelim), max = SidebarWidth-dlen-1,
- shortened = 0;
+ 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
if ( new ) {
if (flagged>0) {
- sprintf(entry + SidebarWidth - 5 - quick_log10(size) - dlen - quick_log10(new) - quick_log10(flagged),
+ 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 (flagged>0) {
- sprintf( entry + SidebarWidth - 3 - quick_log10(size) - dlen - quick_log10(flagged), "% d[%d]", size,flagged);
+ 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) && shortened) {
free(box);
}
void set_buffystats (CONTEXT* Context)
{
BUFFY* tmp = Incoming;
+ if (!Context)
+ return;
while (tmp)
{
if (strcmp (tmp->path, Context->path) == 0)
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;
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)
- {
- if (CurBuffy->next == NULL) return;
- CurBuffy = CurBuffy->next;
+ 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->prev == NULL ) return;
+ 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)
- {
- if(CurBuffy->prev == NULL) return;
- CurBuffy = CurBuffy->prev;
+ if ( (tmp = exist_prev_new()) == NULL) {
+ mutt_error (_("No previous mailbox with new mail."));
+ return;
}
else CurBuffy = tmp;
break;
projects / apps / madmutt.git / blobdiff