projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From: David Champion <dgc@uchicago.edu>
[apps/madmutt.git]
/
sidebar.c
diff --git
a/sidebar.c
b/sidebar.c
index
6fd5ce0
..
4ea49d4
100644
(file)
--- a/
sidebar.c
+++ b/
sidebar.c
@@
-40,10
+40,14
@@
void calc_boundaries (int menu)
if (list_empty(Incoming))
return;
if (list_empty(Incoming))
return;
+ if (CurBuffy < 0 || CurBuffy >= Incoming->length)
+ CurBuffy = 0;
+ if (TopBuffy < 0 || TopBuffy >= Incoming->length)
+ TopBuffy = 0;
/* correct known_lines if it has changed because of a window resize */
/* if (known_lines != LINES)
known_lines = LINES; */
/* 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));
known_lines = lines;
if (option (OPTSIDEBARNEWMAILONLY)) {
lines = LINES - 2 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
known_lines = lines;
if (option (OPTSIDEBARNEWMAILONLY)) {
@@
-64,11
+68,11
@@
static char *shortened_hierarchy (char *box, int maxlen)
{
int dots = 0;
char *last_dot = NULL;
{
int dots = 0;
char *last_dot = NULL;
- int i, j, len =
mutt_str
len (box);
+ int i, j, len =
str_
len (box);
char *new_box;
if (!SidebarBoundary || !*SidebarBoundary)
char *new_box;
if (!SidebarBoundary || !*SidebarBoundary)
- return (s
afe_str
dup (box));
+ return (s
tr_
dup (box));
for (i = 0; i < len; ++i) {
if (strchr (SidebarBoundary, box[i])) {
for (i = 0; i < len; ++i) {
if (strchr (SidebarBoundary, box[i])) {
@@
-79,13
+83,13
@@
static char *shortened_hierarchy (char *box, int maxlen)
if (last_dot) {
++last_dot;
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;
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_str
len (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 {
new_box[j++] = box[i + 1];
new_box[j] = 0;
} else {
@@
-96,7
+100,7
@@
static char *shortened_hierarchy (char *box, int maxlen)
}
return new_box;
}
}
return new_box;
}
- return s
afe_str
dup (box);
+ return s
tr_
dup (box);
}
static const char* sidebar_number_format (char* dest, size_t destlen, char op,
}
static const char* sidebar_number_format (char* dest, size_t destlen, char op,
@@
-187,8
+191,9
@@
int make_sidebar_entry (char* box, int idx, size_t len)
int shortened = 0, lencnt = 0;
char no[SHORT_STRING], entry[SHORT_STRING];
#if USE_IMAP
int shortened = 0, lencnt = 0;
char no[SHORT_STRING], entry[SHORT_STRING];
#if USE_IMAP
- int l =
mutt_str
len (ImapHomeNamespace);
+ int l =
str_
len (ImapHomeNamespace);
#endif
#endif
+ int l_m = str_len (Maildir);
if (SidebarWidth > COLS)
SidebarWidth = COLS;
if (SidebarWidth > COLS)
SidebarWidth = COLS;
@@
-202,30
+207,37
@@
int make_sidebar_entry (char* box, int idx, size_t len)
mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
sidebar_number_format, idx, M_FORMAT_OPTIONAL);
mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
sidebar_number_format, idx, M_FORMAT_OPTIONAL);
- lencnt =
mutt_str
len (no);
+ lencnt =
str_
len (no);
memset (&entry, ' ', sizeof (entry));
#if USE_IMAP
memset (&entry, ' ', sizeof (entry));
#if USE_IMAP
- if (l > 0 && s
afe_str
ncmp (box, ImapHomeNamespace, l) == 0 &&
-
mutt_str
len (box) > l)
- box += l + 1;
+ if (l > 0 && s
tr_
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
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);
box = basename (box);
- if (option (OPTSHORTENHIERARCHY) &&
mutt_str
len (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);
box = shortened_hierarchy (box, len-lencnt-1);
shortened = 1;
}
snprintf (entry, len-lencnt, "%s", box);
- entry[
mutt_str
len (entry)] = ' ';
+ entry[
str_
len (entry)] = ' ';
strncpy (entry + (len - lencnt), no, lencnt);
addnstr (entry, len);
if (shortened)
strncpy (entry + (len - lencnt), no, lencnt);
addnstr (entry, len);
if (shortened)
-
FREE
(&box);
+
mem_free
(&box);
return (1);
}
return (1);
}
@@
-269,7
+281,7
@@
int sidebar_draw (int menu)
int lines = option (OPTHELP) ? 1 : 0, draw_devider = 1, i = 0;
BUFFY *tmp;
int lines = option (OPTHELP) ? 1 : 0, draw_devider = 1, i = 0;
BUFFY *tmp;
- short delim_len =
mutt_str
len (SidebarDelim);
+ short delim_len =
str_
len (SidebarDelim);
char blank[SHORT_STRING];
/* initialize first time */
char blank[SHORT_STRING];
/* initialize first time */
@@
-298,7
+310,7
@@
int sidebar_draw (int menu)
}
if (SidebarWidth > 0 && option (OPTMBOXPANE)
}
if (SidebarWidth > 0 && option (OPTMBOXPANE)
- &&
mutt_str
len (SidebarDelim) >= SidebarWidth) {
+ &&
str_
len (SidebarDelim) >= SidebarWidth) {
mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
sleep (2);
unset_option (OPTMBOXPANE);
mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
sleep (2);
unset_option (OPTMBOXPANE);
@@
-317,9
+329,9
@@
int sidebar_draw (int menu)
move (lines, SidebarWidth - delim_len);
if (option (OPTASCIICHARS))
addstr (NONULL (SidebarDelim));
move (lines, SidebarWidth - delim_len);
if (option (OPTASCIICHARS))
addstr (NONULL (SidebarDelim));
- else if (!option (OPTASCIICHARS) && !
mutt_str
cmp (SidebarDelim, "|"))
+ else if (!option (OPTASCIICHARS) && !
str_
cmp (SidebarDelim, "|"))
addch (ACS_VLINE);
addch (ACS_VLINE);
- else if ((Charset_is_utf8) && !
mutt_str
cmp (SidebarDelim, "|"))
+ else if ((Charset_is_utf8) && !
str_
cmp (SidebarDelim, "|"))
addstr ("\342\224\202");
else
addstr (NONULL (SidebarDelim));
addstr ("\342\224\202");
else
addstr (NONULL (SidebarDelim));