#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;
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)
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) {
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
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);
}
{
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;
prev_show_value = option(OPTMBOXPANE);
saveSidebarWidth = SidebarWidth;
if(!option(OPTMBOXPANE)) SidebarWidth = 0;
- initialized = true;
+ initialized = 1;
}
/* save or restore the value SidebarWidth */
} 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);
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;
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++ ) {
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;
projects / apps / madmutt.git / blobdiff