static int known_lines = 0;
static short initialized = 0;
static short prev_show_value;
-static short saveSidebarWidth;
/* computes first entry to be shown */
void calc_boundaries (int menu)
if (list_empty(Incoming))
return;
- /* correct known_lines if it has changed because of a window resize */
- /* if (known_lines != LINES)
- known_lines = LINES; */
-
- lines = LINES - 2 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
+ if (CurBuffy < 0 || CurBuffy >= Incoming->length)
+ CurBuffy = 0;
+ if (TopBuffy < 0 || TopBuffy >= Incoming->length)
+ TopBuffy = 0;
+
+ lines = LINES - 2 - (option (OPTSTATUSONTOP));
known_lines = lines;
if (option (OPTSIDEBARNEWMAILONLY)) {
int i = CurBuffy;
if (last_dot) {
++last_dot;
- new_box = safe_malloc (maxlen + 1);
+ new_box = mem_malloc (maxlen + 1);
new_box[0] = box[0];
for (i = 1, j = 1; j < maxlen && i < len; ++i) {
if (strchr (SidebarBoundary, box[i])) {
break;
/* new */
case 'n':
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->new : b->new);
+ } else if ((c && Context->new == 0) || (!c && b->new == 0))
+ opt = 0;
+ break;
+ /* unread */
+ case 'u':
if (!opt) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp, c ? Context->unread : b->msg_unread);
#if USE_IMAP
int l = str_len (ImapHomeNamespace);
#endif
+ int l_m = str_len (Maildir);
if (SidebarWidth > COLS)
SidebarWidth = COLS;
#if USE_IMAP
if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 &&
str_len (box) > l)
- box += l + 1;
+ box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
else
#endif
+ if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 &&
+ str_len (box) > l_m) {
+ box += l_m;
+ if (Maildir[strlen(Maildir)-1]!='/') {
+ box += 1;
+ }
+ } else
box = basename (box);
if (option (OPTSHORTENHIERARCHY) && str_len (box) > len-lencnt-1) {
addnstr (entry, len);
if (shortened)
- FREE(&box);
+ mem_free(&box);
return (1);
}
/* initialize first time */
if (!initialized) {
prev_show_value = option (OPTMBOXPANE);
- saveSidebarWidth = SidebarWidth;
- if (!option (OPTMBOXPANE)){
- SidebarWidth = 0;
+ if (!option (OPTMBOXPANE))
draw_devider = 1;
- }
initialized = 1;
}
/* save or restore the value SidebarWidth */
if (prev_show_value != option (OPTMBOXPANE)) {
- if (prev_show_value && !option (OPTMBOXPANE)) {
- saveSidebarWidth = SidebarWidth;
- SidebarWidth = 0;
- }
- else if (!prev_show_value && option (OPTMBOXPANE)) {
- SidebarWidth = saveSidebarWidth;
+ if (!prev_show_value && option (OPTMBOXPANE)) {
/* after toggle: force recounting of all mail */
buffy_check (2);
}