X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=c59e9825a0fa025d21ff5814449e6005fb893751;hp=9290a1a0ae52dae5d61a10c2f37834926b1dcf40;hb=939231b97323754e1329160d25212083242f7e09;hpb=78f24a39b314d2c47c1417eaa34fdf4078bb4a50 diff --git a/sidebar.c b/sidebar.c index 9290a1a..c59e982 100644 --- a/sidebar.c +++ b/sidebar.c @@ -26,14 +26,13 @@ #include "buffy.h" #include #include "keymap.h" -#include #include /*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,22 +45,24 @@ static int quick_log10(int n) return (++len); } -// CurBuffy should contain a valid buffy mailbox before calling this function!!! +/* 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 + /* correct known_lines if it has changed because of a window resize */ if ( known_lines != LINES ) { known_lines = LINES; } - // fix all the prev links on all the mailboxes + /* 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; - // calculate the position of the current mailbox + /* calculate the position of the current mailbox */ position = 1; tmp = Incoming; while (tmp != CurBuffy) @@ -69,17 +70,18 @@ void calc_boundaries (int menu) position++; tmp = tmp->next; } - // calculate the size of the screen we can use + /* 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 + /* calculate the position of the current mailbox on the screen */ mailbox_position = position%count; if (mailbox_position == 0) mailbox_position=count; - // determine topbuffy + /* determine topbuffy */ TopBuffy = CurBuffy; for(i = mailbox_position; i >1; i--) TopBuffy = TopBuffy->prev; - // determine bottombuffy + /* determine bottombuffy */ BottomBuffy = CurBuffy; - for(i = mailbox_position; i < count && BottomBuffy->next; i++) BottomBuffy = BottomBuffy->next; + for(i = mailbox_position; i < count && BottomBuffy->next; i++) + BottomBuffy = BottomBuffy->next; } static char * shortened_hierarchy(char * box) { @@ -117,12 +119,16 @@ 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; - c = realloc(entry, SidebarWidth + 1); - if ( c ) entry = c; + 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 @@ -146,20 +152,30 @@ char *make_sidebar_entry(char *box, int size, int new, int flagged) 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); } @@ -195,6 +211,7 @@ void set_buffystats (CONTEXT* Context) { if (strcmp (tmp->path, Context->path) == 0) { + tmp->new = Context->new; tmp->msg_unread = Context->unread; tmp->msgcount = Context->msgcount; tmp->msg_flagged = Context->flagged; @@ -215,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 */ @@ -226,19 +243,35 @@ int draw_sidebar(int menu) { } else if(!prev_show_value && option(OPTMBOXPANE)) { SidebarWidth = saveSidebarWidth; /* after toggle: force recounting of all mail */ - mutt_buffy_check(1); + 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); @@ -246,7 +279,9 @@ int draw_sidebar(int menu) { lines = option(OPTHELP) ? 1 : 0; /* go back to the top */ if ( CurBuffy == 0 ) CurBuffy = Incoming; +#if 0 if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) +#endif calc_boundaries(menu); tmp = TopBuffy; @@ -262,19 +297,37 @@ int draw_sidebar(int menu) { 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->flagged)); - tmp->msg_unread = Context->unread; - tmp->msgcount = Context->msgcount; - tmp->msg_flagged = Context->flagged; + 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_flagged)); - lines++; } SETCOLOR(MT_COLOR_NORMAL); for ( ; lines < LINES - 1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP)); lines++ ) { @@ -320,21 +373,35 @@ void scroll_sidebar(int op, int menu) switch (op) { case OP_SIDEBAR_NEXT: - if ( CurBuffy->next == NULL ) return; - CurBuffy = CurBuffy->next; - break; - case OP_SIDEBAR_NEXT_NEW: - if ( (tmp = exist_next_new()) == NULL) + 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->prev == NULL ) return; - CurBuffy = CurBuffy->prev; - break; - case OP_SIDEBAR_PREV_NEW: - if ( (tmp = exist_prev_new()) == NULL) + 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;