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 (OPTHELP);
known_lines = lines;
if (option (OPTSIDEBARNEWMAILONLY)) {
int i = CurBuffy;
{
int dots = 0;
char *last_dot = NULL;
- int i, j, len = mutt_strlen (box);
+ int i, j, len = str_len (box);
char *new_box;
if (!SidebarBoundary || !*SidebarBoundary)
- return (safe_strdup (box));
+ return (str_dup (box));
for (i = 0; i < len; ++i) {
if (strchr (SidebarBoundary, box[i])) {
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])) {
new_box[j++] = box[i];
new_box[j] = 0;
- if (&box[i + 1] != last_dot || j + mutt_strlen (last_dot) > maxlen) {
+ if (&box[i + 1] != last_dot || j + str_len (last_dot) > maxlen) {
new_box[j++] = box[i + 1];
new_box[j] = 0;
} else {
}
return new_box;
}
- return safe_strdup (box);
+ return str_dup (box);
}
static const char* sidebar_number_format (char* dest, size_t destlen, char op,
int c = Context && str_eq (Context->path, b->path);
switch (op) {
- case 'c':
- snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
- snprintf (dest, destlen, tmp, c ? Context->msgcount : b->msgcount);
+ /* deleted */
+ case 'd':
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->deleted : 0);
+ } else if ((c && Context->deleted == 0) || !c)
+ opt = 0;
+ break;
+ /* flagged */
+ case 'F':
+ case 'f': /* for compatibility */
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->flagged : b->msg_flagged);
+ } else if ((c && Context->flagged == 0) || (!c && b->msg_flagged == 0))
+ opt = 0;
+ break;
+ /* total */
+ case 'c': /* for compatibility */
+ case 'm':
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->msgcount : b->msgcount);
+ } else if ((c && Context->msgcount == 0) || (!c && b->msgcount == 0))
+ opt = 0;
+ break;
+ /* total shown, i.e. not hidden by limit */
+ case 'M':
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->vcount : 0);
+ } else if ((c && Context->vcount == 0) || !c)
+ opt = 0;
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);
} else if ((c && Context->unread == 0) || (!c && b->msg_unread == 0))
opt = 0;
break;
- case 'f':
+ /* tagged */
+ case 't':
if (!opt) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
- snprintf (dest, destlen, tmp, c ? Context->flagged : b->msg_flagged);
- } else if ((c && Context->flagged == 0) || (!c && b->msg_flagged == 0))
+ snprintf (dest, destlen, tmp, c ? Context->tagged : 0);
+ } else if ((c && Context->tagged == 0) || !c)
opt = 0;
break;
}
int shortened = 0, lencnt = 0;
char no[SHORT_STRING], entry[SHORT_STRING];
#if USE_IMAP
- int l = mutt_strlen (ImapHomeNamespace);
+ int l = str_len (ImapHomeNamespace);
#endif
+ int l_m = str_len (Maildir);
if (SidebarWidth > COLS)
SidebarWidth = COLS;
mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
sidebar_number_format, idx, M_FORMAT_OPTIONAL);
- lencnt = mutt_strlen (no);
+ lencnt = str_len (no);
memset (&entry, ' ', sizeof (entry));
#if USE_IMAP
- if (l > 0 && safe_strncmp (box, ImapHomeNamespace, l) == 0 &&
- mutt_strlen (box) > l)
- box += l + 1;
+ if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 &&
+ str_len (box) > l)
+ 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) && mutt_strlen (box) > len-lencnt-1) {
+ if (option (OPTSHORTENHIERARCHY) && str_len (box) > len-lencnt-1) {
box = shortened_hierarchy (box, len-lencnt-1);
shortened = 1;
}
snprintf (entry, len-lencnt, "%s", box);
- entry[mutt_strlen (entry)] = ' ';
+ entry[str_len (entry)] = ' ';
strncpy (entry + (len - lencnt), no, lencnt);
addnstr (entry, len);
if (shortened)
- FREE(&box);
+ mem_free(&box);
return (1);
}
*/
int sidebar_draw (int menu)
{
-
- int lines = option (OPTHELP) ? 1 : 0, draw_devider = 1, i = 0;
+ int first_line = option (OPTSTATUSONTOP) ? 1 : option (OPTHELP) ? 1 : 0;
+ int last_line = LINES-1;
+ int draw_devider = 1, i = 0;
+ int line;
BUFFY *tmp;
- short delim_len = mutt_strlen (SidebarDelim);
+ short delim_len = str_len (SidebarDelim);
char blank[SHORT_STRING];
+ if (option (OPTSTATUSONTOP)) {
+ last_line -= option (OPTHELP) ? 1 : 0;
+ } else {
+ last_line -= 1-(menu==MENU_PAGER);
+ }
+
/* 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);
}
}
if (SidebarWidth > 0 && option (OPTMBOXPANE)
- && mutt_strlen (SidebarDelim) >= SidebarWidth) {
+ && str_len (SidebarDelim) >= SidebarWidth) {
mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
sleep (2);
unset_option (OPTMBOXPANE);
if (draw_devider == 1){
/* draw the divider */
SETCOLOR (MT_COLOR_SIDEBAR);
- for (lines = 1;
- lines < LINES - 1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
- lines++) {
- move (lines, SidebarWidth - delim_len);
+ for (line = first_line; line < last_line; line++) {
+ move (line, SidebarWidth - delim_len);
if (option (OPTASCIICHARS))
addstr (NONULL (SidebarDelim));
- else if (!option (OPTASCIICHARS) && !mutt_strcmp (SidebarDelim, "|"))
+ else if (!option (OPTASCIICHARS) && !str_cmp (SidebarDelim, "|"))
addch (ACS_VLINE);
- else if ((Charset_is_utf8) && !mutt_strcmp (SidebarDelim, "|"))
+ else if ((Charset_is_utf8) && !str_cmp (SidebarDelim, "|"))
addstr ("\342\224\202");
else
addstr (NONULL (SidebarDelim));
if (list_empty(Incoming))
return 0;
- lines = option (OPTHELP) ? 1 : 0; /* go back to the top */
+ line = first_line;
calc_boundaries (menu);
/* actually print items */
- for (i = TopBuffy; i < Incoming->length && lines < LINES - 1 -
- (menu != MENU_PAGER || option (OPTSTATUSONTOP)); i++) {
+ for (i = TopBuffy; i < Incoming->length && line < last_line; i++) {
tmp = (BUFFY*) Incoming->data[i];
if (i == CurBuffy)
else
SETCOLOR (MT_COLOR_NORMAL);
- move (lines, 0);
- lines += make_sidebar_entry (tmp->path, i, SidebarWidth-delim_len);
+ move (line, 0);
+ line += make_sidebar_entry (tmp->path, i, SidebarWidth-delim_len);
}
/* fill with blanks to bottom */
memset (&blank, ' ', sizeof (blank));
SETCOLOR (MT_COLOR_NORMAL);
- for (; lines < LINES - 1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP)); lines++) {
- move (lines, 0);
+ for (; line < last_line; line++) {
+ move (line, 0);
addnstr (blank, SidebarWidth-delim_len);
}
return 0;