* please see the file GPL in the top level source directory.
*/
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
#include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "sidebar.h"
#include "buffy.h"
-#include <libgen.h>
#include "keymap.h"
+
+
+#include <libgen.h>
#include <ctype.h>
-/*BUFFY *CurBuffy = 0;*/
-static BUFFY *TopBuffy = 0;
-static BUFFY *BottomBuffy = 0;
+static int TopBuffy = 0;
+static int CurBuffy = 0;
static int known_lines = 0;
static short initialized = 0;
-static int prev_show_value;
-static short saveSidebarWidth;
-static char *entry = 0;
-
-static int quick_log10 (int n)
-{
- int len = 0;
-
- for (; n > 9; len++, n /= 10);
- return (++len);
-}
+static short prev_show_value;
-/* 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 */
- 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)
- tmp->next->prev = tmp;
-
- /* 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 */
- 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;
- /* determine topbuffy */
- TopBuffy = CurBuffy;
- for (i = mailbox_position; i > 1; i--)
- TopBuffy = TopBuffy->prev;
- /* determine bottombuffy */
- BottomBuffy = CurBuffy;
- for (i = mailbox_position; i < count && BottomBuffy->next; i++)
- BottomBuffy = BottomBuffy->next;
+/* computes first entry to be shown */
+static void calc_boundaries (void) {
+ if (list_empty(Incoming))
+ return;
+ if (CurBuffy < 0 || CurBuffy >= Incoming->length)
+ CurBuffy = 0;
+ if (TopBuffy < 0 || TopBuffy >= Incoming->length)
+ TopBuffy = 0;
+
+ if (option (OPTSIDEBARNEWMAILONLY)) {
+ int i = CurBuffy;
+ TopBuffy = CurBuffy - 1;
+ while (i >= 0) {
+ if (((BUFFY*) Incoming->data[i])->new > 0)
+ TopBuffy = i;
+ i--;
+ }
+ } else if (known_lines>0)
+ TopBuffy = CurBuffy - (CurBuffy % known_lines);
+ if (TopBuffy < 0)
+ TopBuffy = 0;
}
-static char *shortened_hierarchy (char *box)
+static char *shortened_hierarchy (char *box, int maxlen)
{
int dots = 0;
- char *last_dot;
- int i, j;
+ char *last_dot = NULL;
+ int i, j, len = m_strlen(box);
char *new_box;
- for (i = 0; i < mutt_strlen (box); ++i) {
- if (box[i] == '.')
+ if (!SidebarBoundary || !*SidebarBoundary)
+ return (m_strdup(box));
+
+ for (i = 0; i < len; ++i) {
+ if (strchr (SidebarBoundary, box[i])) {
++dots;
- else if (isupper (box[i]))
- return (safe_strdup (box));
+ last_dot = &box[i];
+ }
}
- last_dot = strrchr (box, '.');
+
if (last_dot) {
++last_dot;
- new_box = safe_malloc (mutt_strlen (last_dot) + 2 * dots + 1);
+ new_box = p_new(char, maxlen + 1);
new_box[0] = box[0];
- for (i = 1, j = 1; i < mutt_strlen (box); ++i) {
- if (box[i] == '.') {
- new_box[j++] = '.';
+ 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) {
+ if (&box[i + 1] != last_dot || j + m_strlen(last_dot) > maxlen) {
new_box[j++] = box[i + 1];
new_box[j] = 0;
- }
- else {
+ } else {
strcat (&new_box[j], last_dot);
break;
}
}
return new_box;
}
- return safe_strdup (box);
+ return m_strdup(box);
+}
+
+static const char* sidebar_number_format (char* dest, ssize_t destlen, char op,
+ const char* src, const char* fmt,
+ const char* ifstr, const char* elstr,
+ unsigned long data, format_flag flags) {
+ char tmp[SHORT_STRING];
+ BUFFY* b = (BUFFY*) Incoming->data[data];
+ int opt = flags & M_FORMAT_OPTIONAL;
+ int c = Context && !m_strcmp(Context->path, b->path);
+
+ switch (op) {
+ /* 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;
+ /* tagged */
+ case 't':
+ if (!opt) {
+ snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+ snprintf (dest, destlen, tmp, c ? Context->tagged : 0);
+ } else if ((c && Context->tagged == 0) || !c)
+ opt = 0;
+ break;
+ }
+
+ if (opt)
+ mutt_FormatString (dest, destlen, ifstr, sidebar_number_format,
+ data, M_FORMAT_OPTIONAL);
+ else if (flags & M_FORMAT_OPTIONAL)
+ mutt_FormatString (dest, destlen, elstr, sidebar_number_format,
+ data, M_FORMAT_OPTIONAL);
+ return (src);
+}
+
+int sidebar_need_count (void) {
+ if (!option (OPTMBOXPANE) || SidebarWidth == 0 ||
+ !SidebarNumberFormat || !*SidebarNumberFormat)
+ return (0);
+ return (1);
}
-char *make_sidebar_entry (char *box, int size, int new, int flagged)
+/* print single item
+ * returns:
+ * 0 item was not printed ('cause of $sidebar_newmail_only)
+ * 1 item was printed
+ */
+int make_sidebar_entry (char* box, int idx, ssize_t len)
{
- int i = 0, dlen, max, shortened = 0;
- int offset;
+ int shortened = 0, lencnt = 0;
+ char no[SHORT_STRING], entry[SHORT_STRING];
+ int l = m_strlen(ImapHomeNamespace);
+ int l_m = m_strlen(Maildir);
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 (ImapHomeNamespace && mutt_strlen (ImapHomeNamespace) > 0) {
- if (strncmp (box, ImapHomeNamespace, mutt_strlen (ImapHomeNamespace)) == 0
- && strcmp (box, ImapHomeNamespace) != 0) {
- box += mutt_strlen (ImapHomeNamespace) + 1;
+ if (option (OPTSIDEBARNEWMAILONLY) && box && Context && Context->path &&
+ m_strcmp(Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0)
+ /* if $sidebar_newmail_only is set, don't display the
+ * box only if it's not the currently opened
+ * (i.e. always display the currently opened) */
+ return (0);
+
+ mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
+ sidebar_number_format, idx, M_FORMAT_OPTIONAL);
+ lencnt = m_strlen(no);
+ memset(&entry, ' ', sizeof(entry));
+
+ if (l > 0 && m_strncmp(box, ImapHomeNamespace, l) == 0 &&
+ m_strlen(box) > l)
+ box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
+ else
+ if (l_m > 0 && m_strncmp(box, Maildir, l_m) == 0 &&
+ m_strlen(box) > l_m) {
+ box += l_m;
+ if (Maildir[strlen(Maildir)-1]!='/') {
+ box += 1;
}
- }
-#endif
- max -= quick_log10 (size);
- if (new)
- max -= quick_log10 (new) + 2;
- if (flagged > 0)
- max -= quick_log10 (flagged) + 2;
- if (option (OPTSHORTENHIERARCHY) && mutt_strlen (box) > max) {
- box = shortened_hierarchy (box);
+ } else
+ box = basename (box);
+
+ if (option (OPTSHORTENHIERARCHY) && m_strlen(box) > len-lencnt-1) {
+ box = shortened_hierarchy (box, len-lencnt-1);
shortened = 1;
}
- 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 {
- 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);
+ m_strcpy(entry, len - lencnt, box);
+ entry[m_strlen(entry)] = ' ';
+ memcpy(entry + (len - lencnt), no, lencnt);
+
+ addnstr (entry, len);
+
+ if (shortened)
+ p_delete(&box);
+
+ return (1);
+}
+
+/* returns folder name of currently
+ * selected folder for <sidebar-open>
+ */
+const char* sidebar_get_current (void) {
+ if (list_empty(Incoming))
+ return (NULL);
+ return ((char*) ((BUFFY*) Incoming->data[CurBuffy])->path);
+}
+
+/* internally sets item to buf */
+void sidebar_set_current (const char* buf) {
+ int i = buffy_lookup (buf);
+ if (i >= 0) {
+ CurBuffy = i;
+ calc_boundaries();
}
- return entry;
}
-void set_curbuffy (char buf[LONG_STRING])
-{
- BUFFY *tmp = CurBuffy = Incoming;
+/* fix counters for a context
+ * FIXME since ctx must not be of our business, move it elsewhere
+ */
+void sidebar_set_buffystats (CONTEXT* Context) {
+ int i = 0;
+ BUFFY* tmp = NULL;
+ if (!Context || list_empty(Incoming) || (i = buffy_lookup (Context->path)) < 0)
+ return;
+ tmp = (BUFFY*) Incoming->data[i];
+ tmp->new = Context->new;
+ tmp->msg_unread = Context->unread;
+ tmp->msgcount = Context->msgcount;
+ tmp->msg_flagged = Context->flagged;
+}
+
+void sidebar_draw_frames (void) {
+ ssize_t i,delim_len;
- if (!Incoming)
+ if (!option(OPTMBOXPANE) || SidebarWidth==0)
return;
- while (1) {
- if (!strcmp (tmp->path, buf)) {
- CurBuffy = tmp;
- break;
- }
+ delim_len=m_strlen(NONULL(SidebarDelim));
- if (tmp->next)
- tmp = tmp->next;
+ /* draw vertical delimiter */
+ SETCOLOR (MT_COLOR_SIDEBAR);
+ for (i = 0; i < LINES-1; i++) {
+ move (i, SidebarWidth - delim_len);
+ if (option (OPTASCIICHARS))
+ addstr (NONULL (SidebarDelim));
+ else if (!option (OPTASCIICHARS) && !m_strcmp(SidebarDelim, "|"))
+ addch (ACS_VLINE);
+ else if ((Charset_is_utf8) && !m_strcmp(SidebarDelim, "|"))
+ addstr ("\342\224\202");
else
- break;
+ addstr (NONULL (SidebarDelim));
}
-}
-void set_buffystats (CONTEXT * Context)
-{
- BUFFY *tmp = Incoming;
-
- if (!Context)
- return;
- 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;
- break;
+ /* fill "gaps" at top+bottom */
+ SETCOLOR(MT_COLOR_STATUS);
+ for (i=0; i<SidebarWidth; i++) {
+ /*
+ * if we don't have $status_on_top and have $help, fill top
+ * gap with spaces to get bg color
+ */
+ if (option(OPTSTATUSONTOP) || option(OPTHELP)) {
+ move(0,i);
+ addch(' ');
+ }
+ /*
+ * if we don't have $status_on_top or we have $help, fill bottom
+ * gap with spaces to get bg color
+ */
+ if (!option(OPTSTATUSONTOP) || option(OPTHELP)) {
+ move(LINES-2,i);
+ addch(' ');
}
- tmp = tmp->next;
}
+ SETCOLOR (MT_COLOR_NORMAL);
}
-int draw_sidebar (int menu)
-{
-
- int lines = option (OPTHELP) ? 1 : 0;
+/* actually draws something
+ * FIXME this needs some clue when to do it
+ */
+int sidebar_draw (int menu) {
+ int first_line = option (OPTSTATUSONTOP) ? 1 : option (OPTHELP) ? 1 : 0,
+ last_line = LINES - 2 + (option (OPTSTATUSONTOP) && !option (OPTHELP) ? 1 : 0),
+ i = 0,line;
BUFFY *tmp;
- short delim_len = mutt_strlen (SidebarDelim);
+ ssize_t delim_len = m_strlen(SidebarDelim);
+ char blank[SHORT_STRING];
+
+ known_lines=last_line-first_line;
/* initialize first time */
if (!initialized) {
prev_show_value = option (OPTMBOXPANE);
- saveSidebarWidth = SidebarWidth;
- if (!option (OPTMBOXPANE))
- SidebarWidth = 0;
initialized = 1;
}
+ if (TopBuffy==0 || CurBuffy==0)
+ calc_boundaries();
+
/* 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 */
- mutt_buffy_check (2);
+ buffy_check (2);
}
prev_show_value = option (OPTMBOXPANE);
}
if (SidebarWidth > 0 && option (OPTMBOXPANE)
- && mutt_strlen (SidebarDelim) >= SidebarWidth) {
+ && m_strlen(SidebarDelim) >= SidebarWidth) {
mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
sleep (2);
unset_option (OPTMBOXPANE);
if (SidebarWidth == 0 || !option (OPTMBOXPANE))
return 0;
- /* draw the divider */
- /* 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);
- 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);
+ sidebar_draw_frames();
- if (Incoming == 0)
+ if (list_empty(Incoming))
return 0;
- 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;
-
- for (;
- tmp && lines < LINES - 1 - (menu != MENU_PAGER
- || option (OPTSTATUSONTOP));
- tmp = tmp->next) {
- if (tmp == CurBuffy)
+
+ /* actually print items */
+ for (i = TopBuffy, line=first_line; i < Incoming->length && line < last_line; i++) {
+ tmp = (BUFFY*) Incoming->data[i];
+
+ if (i == CurBuffy)
SETCOLOR (MT_COLOR_INDICATOR);
+ else if (tmp->new > 0)
+ SETCOLOR (MT_COLOR_NEW);
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 (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++;
- }
+ move (line, 0);
+ line += make_sidebar_entry (tmp->path, i, SidebarWidth-delim_len);
}
+
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 (' ');
+ /* fill with blanks to bottom */
+ memset(&blank, ' ', sizeof(blank));
+ for (; line < last_line; line++) {
+ move (line, 0);
+ addnstr (blank, SidebarWidth-delim_len);
}
return 0;
}
-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;
+/* returns index of new item with new mail or -1 */
+static int exist_next_new () {
+ int i = 0;
+ if (list_empty(Incoming))
+ return (-1);
+ i = CurBuffy + 1;
+ while (i < Incoming->length)
+ if (((BUFFY*) Incoming->data[i++])->new > 0)
+ return (i-1);
+ return (-1);
}
-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;
+/* returns index of prev item with new mail or -1 */
+static int exist_prev_new () {
+ int i = 0;
+ if (list_empty(Incoming))
+ return (-1);
+ i = CurBuffy - 1;
+ while (i >= 0)
+ if (((BUFFY*) Incoming->data[i--])->new > 0)
+ return (i+1);
+ return (-1);
}
+void sidebar_scroll (int op, int menu) {
+ int i = 0;
-void scroll_sidebar (int op, int menu)
-{
- BUFFY *tmp;
-
- if (!SidebarWidth)
- return;
- if (!CurBuffy)
+ if (!SidebarWidth || list_empty(Incoming))
return;
switch (op) {
case OP_SIDEBAR_NEXT:
if (!option (OPTSIDEBARNEWMAILONLY)) {
- if (CurBuffy->next == NULL) {
+ if (CurBuffy + 1 == Incoming->length) {
mutt_error (_("You are on the last mailbox."));
return;
}
- CurBuffy = CurBuffy->next;
+ CurBuffy++;
break;
} /* the fall-through is intentional */
case OP_SIDEBAR_NEXT_NEW:
- if ((tmp = exist_next_new ()) == NULL) {
+ if ((i = exist_next_new ()) < 0) {
mutt_error (_("No next mailboxes with new mail."));
return;
}
else
- CurBuffy = tmp;
+ CurBuffy = i;
break;
case OP_SIDEBAR_PREV:
if (!option (OPTSIDEBARNEWMAILONLY)) {
- if (CurBuffy->prev == NULL) {
+ if (CurBuffy == 0) {
mutt_error (_("You are on the first mailbox."));
return;
}
- CurBuffy = CurBuffy->prev;
+ CurBuffy--;
break;
} /* the fall-through is intentional */
case OP_SIDEBAR_PREV_NEW:
- if ((tmp = exist_prev_new ()) == NULL) {
+ if ((i = exist_prev_new ()) < 0) {
mutt_error (_("No previous mailbox with new mail."));
return;
}
else
- CurBuffy = tmp;
+ CurBuffy = i;
break;
case OP_SIDEBAR_SCROLL_UP:
- CurBuffy = TopBuffy;
- if (CurBuffy != Incoming) {
- calc_boundaries (menu);
- CurBuffy = CurBuffy->prev;
+ if (CurBuffy == 0) {
+ mutt_error (_("You are on the first mailbox."));
+ return;
}
+ CurBuffy -= known_lines;
+ if (CurBuffy < 0)
+ CurBuffy = 0;
break;
case OP_SIDEBAR_SCROLL_DOWN:
- CurBuffy = BottomBuffy;
- if (CurBuffy->next) {
- calc_boundaries (menu);
- CurBuffy = CurBuffy->next;
+ if (CurBuffy + 1 == Incoming->length) {
+ mutt_error (_("You are on the last mailbox."));
+ return;
}
+ CurBuffy += known_lines;
+ if (CurBuffy >= Incoming->length)
+ CurBuffy = Incoming->length - 1;
break;
default:
return;
}
- calc_boundaries (menu);
- draw_sidebar (menu);
+ calc_boundaries ();
+ sidebar_draw (menu);
}
projects / apps / madmutt.git / blobdiff