X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=e5ec1c2169f11be4640a4c0038f5e8c66281119a;hp=5692cddbba0949ff953b3890d80f79c415e3c135;hb=841934011451205d8295ac955486f06c317fdf15;hpb=0eea44816346f6a9e9d52c1e1f363dd00dde56b6 diff --git a/sidebar.c b/sidebar.c index 5692cdd..e5ec1c2 100644 --- a/sidebar.c +++ b/sidebar.c @@ -1,23 +1,16 @@ /* + * Copyright notice from original mutt: * Copyright (C) ????-2004 Justin Hibbits * Copyright (C) 2004 Thomer M. Gil - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - */ - - + * + * Parts were written/modified by: + * Rocco Rutte + * Nico Golde + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. + */ #include "mutt.h" #include "mutt_menu.h" @@ -26,23 +19,22 @@ #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; -static int quick_log10(int n) +static int quick_log10 (int n) { int len = 0; - for (; n > 9; len++, n /= 10) - ; + + for (; n > 9; len++, n /= 10); return (++len); } @@ -52,73 +44,78 @@ void calc_boundaries (int menu) { BUFFY *tmp = Incoming; int position; - int i,count, mailbox_position; + int i, count, mailbox_position; /* correct known_lines if it has changed because of a window resize */ - if ( known_lines != LINES ) { + if (known_lines != LINES) { 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 ) + for (; tmp->next != 0; tmp = tmp->next) tmp->next->prev = tmp; /* calculate the position of the current mailbox */ position = 1; tmp = Incoming; - while (tmp != CurBuffy) - { + 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; + 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; + for (i = mailbox_position; i > 1; i--) + TopBuffy = TopBuffy->prev; /* determine bottombuffy */ BottomBuffy = CurBuffy; - for(i = mailbox_position; i < count && BottomBuffy->next; i++) + for (i = mailbox_position; i < count && BottomBuffy->next; i++) BottomBuffy = BottomBuffy->next; } -static char * shortened_hierarchy(char * box) { +static char *shortened_hierarchy (char *box) +{ int dots = 0; - char * last_dot; - int i,j; - char * new_box; - for (i=0;i COLS) SidebarWidth = COLS; - dlen = mutt_strlen(SidebarDelim); + dlen = mutt_strlen (SidebarDelim); max = SidebarWidth - dlen - 1; - safe_realloc(&entry, SidebarWidth + 1); + safe_realloc (&entry, SidebarWidth + 1); entry[SidebarWidth] = 0; - for (; i < SidebarWidth; entry[i++] = ' ' ); + for (; i < SidebarWidth; entry[i++] = ' '); #if USE_IMAP - if (ImapHomeNamespace && strlen(ImapHomeNamespace)>0) { - if (strncmp(box,ImapHomeNamespace,strlen(ImapHomeNamespace))==0 && strcmp(box,ImapHomeNamespace)!=0) { - box+=strlen(ImapHomeNamespace)+1; + if (ImapHomeNamespace && mutt_strlen (ImapHomeNamespace) > 0) { + if (strncmp (box, ImapHomeNamespace, mutt_strlen (ImapHomeNamespace)) == 0 + && strcmp (box, ImapHomeNamespace) != 0) { + box += mutt_strlen (ImapHomeNamespace) + 1; } } #endif - max -= quick_log10(size); + max -= quick_log10 (size); if (new) - max -= quick_log10(new) + 2; + max -= quick_log10 (new) + 2; if (flagged > 0) - max -= quick_log10(flagged) + 2; - if (option(OPTSHORTENHIERARCHY) && mutt_strlen(box) > max) { - box = shortened_hierarchy(box); + 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 (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); + 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 { - 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); + 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); + if (option (OPTSHORTENHIERARCHY) && shortened) { + free (box); } return entry; } -void set_curbuffy(char buf[LONG_STRING]) +void set_curbuffy (char buf[LONG_STRING]) { - BUFFY* tmp = CurBuffy = Incoming; + BUFFY *tmp = CurBuffy = Incoming; if (!Incoming) return; - while(1) { - if(!strcmp(tmp->path, buf)) { + while (1) { + if (!strcmp (tmp->path, buf)) { CurBuffy = tmp; break; } - if(tmp->next) + if (tmp->next) tmp = tmp->next; else break; } } -void set_buffystats (CONTEXT* Context) +void set_buffystats (CONTEXT * Context) { - BUFFY* tmp = Incoming; + BUFFY *tmp = Incoming; + if (!Context) return; - while (tmp) - { - if (strcmp (tmp->path, Context->path) == 0) - { + while (tmp) { + 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; @@ -221,168 +230,232 @@ void set_buffystats (CONTEXT* Context) } } -int draw_sidebar(int menu) { +int draw_sidebar (int menu) +{ - int lines = option(OPTHELP) ? 1 : 0; + int lines = option (OPTHELP) ? 1 : 0; BUFFY *tmp; short delim_len = mutt_strlen (SidebarDelim); /* initialize first time */ - if(!initialized) { - prev_show_value = option(OPTMBOXPANE); + if (!initialized) { + prev_show_value = option (OPTMBOXPANE); saveSidebarWidth = SidebarWidth; - if(!option(OPTMBOXPANE)) SidebarWidth = 0; - initialized = true; + if (!option (OPTMBOXPANE)) + SidebarWidth = 0; + initialized = 1; } /* save or restore the value SidebarWidth */ - if(prev_show_value != option(OPTMBOXPANE)) { - if(prev_show_value && !option(OPTMBOXPANE)) { + if (prev_show_value != option (OPTMBOXPANE)) { + if (prev_show_value && !option (OPTMBOXPANE)) { saveSidebarWidth = SidebarWidth; SidebarWidth = 0; - } else if(!prev_show_value && option(OPTMBOXPANE)) { + } + else if (!prev_show_value && option (OPTMBOXPANE)) { SidebarWidth = saveSidebarWidth; /* after toggle: force recounting of all mail */ - mutt_buffy_check(2); + mutt_buffy_check (2); } - prev_show_value = option(OPTMBOXPANE); + prev_show_value = option (OPTMBOXPANE); + } + + 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 ) return 0; + if (SidebarWidth == 0 || !option (OPTMBOXPANE)) + return 0; /* draw the divider */ /* SETCOLOR(MT_COLOR_STATUS); */ - SETCOLOR(MT_COLOR_SIDEBAR); - for (lines = option (OPTSTATUSONTOP) ? 0 : 1; - lines < LINES-1-(menu != MENU_PAGER || option (OPTSTATUSONTOP)); lines++ ) { - move(lines, SidebarWidth - delim_len); - addstr (NONULL (SidebarDelim)); + 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) && !strcmp (SidebarDelim, "|")) + addch (ACS_VLINE); + else if ((Charset_is_utf8) && !strcmp (SidebarDelim, "|")) + addstr ("\342\224\202"); + else + addstr (NONULL (SidebarDelim)); } - SETCOLOR(MT_COLOR_NORMAL); + SETCOLOR (MT_COLOR_NORMAL); - if ( Incoming == 0 ) return 0; - lines = option(OPTHELP) ? 1 : 0; /* go back to the top */ + if (Incoming == 0) + return 0; + lines = option (OPTHELP) ? 1 : 0; /* go back to the top */ - if ( CurBuffy == 0 ) CurBuffy = Incoming; - if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) - calc_boundaries(menu); + if (CurBuffy == 0) + CurBuffy = Incoming; +#if 0 + if (known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0) +#endif + calc_boundaries (menu); 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); + 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->flagged)); - tmp->msg_unread = Context->unread; - tmp->msgcount = Context->msgcount; - tmp->msg_flagged = Context->flagged; + SETCOLOR (MT_COLOR_NORMAL); + + move (lines, 0); + 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++ ) { + 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(' '); + + move (lines, 0); + for (; i < SidebarWidth - delim_len; i++) + addch (' '); } return 0; } -BUFFY * exist_next_new() +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 *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 *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) + 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) { BUFFY *tmp; - if(!SidebarWidth) return; - if(!CurBuffy) return; + if (!SidebarWidth) + return; + if (!CurBuffy) + return; switch (op) { - case OP_SIDEBAR_NEXT: - if ( CurBuffy->next == NULL ) { + case OP_SIDEBAR_NEXT: + if (!option (OPTSIDEBARNEWMAILONLY)) { + 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->prev == NULL ) { + } /* 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 (!option (OPTSIDEBARNEWMAILONLY)) { + 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 ) { - calc_boundaries(menu); - CurBuffy = CurBuffy->prev; - } break; - case OP_SIDEBAR_SCROLL_DOWN: - CurBuffy = BottomBuffy; - if ( CurBuffy->next ) { - calc_boundaries(menu); - CurBuffy = CurBuffy->next; - } - break; - default: + } /* 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) { + calc_boundaries (menu); + CurBuffy = CurBuffy->prev; + } + break; + case OP_SIDEBAR_SCROLL_DOWN: + CurBuffy = BottomBuffy; + if (CurBuffy->next) { + calc_boundaries (menu); + CurBuffy = CurBuffy->next; + } + break; + default: + return; } - calc_boundaries(menu); - draw_sidebar(menu); + calc_boundaries (menu); + draw_sidebar (menu); }