#include <lib-ui/lib-ui.h>
-#include "enter.h"
#include "menu.h"
#include "mutt.h"
#include "charset.h"
#include <imap/imap.h>
-#include <lib-ui/sidebar.h>
extern size_t UngetCount;
void menu_redraw_full (MUTTMENU * menu)
{
SETCOLOR(main_w, MT_COLOR_NORMAL);
- /* wclear() doesn't optimize screen redraws */
- wmove (main_w, 0, 0);
- wclrtobot (main_w);
-
- SETCOLOR(main_w, MT_COLOR_STATUS);
- wmove (main_w, option (OPTSTATUSONTOP) ? LINES - 2 : 0, 0);
- mutt_paddstr (main_w, getmaxx(main_w), "");
+ werase(main_w);
+ SETCOLOR(main_w, MT_COLOR_SIDEBAR);
+ mvwhline(main_w, LINES - 2, 0, ACS_HLINE, getmaxx(main_w));
SETCOLOR(main_w, MT_COLOR_NORMAL);
menu->offset = 1;
menu->pagelen = LINES - 3;
snprintf (buf, sizeof (buf), M_MODEFMT, menu->title);
SETCOLOR(main_w, MT_COLOR_STATUS);
- wmove (main_w, option (OPTSTATUSONTOP) ? 0 : LINES - 2, 0);
+ wmove (main_w, 0, 0);
mutt_paddstr (main_w, getmaxx(main_w), buf);
SETCOLOR(main_w, MT_COLOR_NORMAL);
menu->redraw &= ~REDRAW_STATUS;
return;
}
- wmove (main_w, menu->oldcurrent + menu->offset - menu->top, 0);
SETCOLOR(main_w, MT_COLOR_NORMAL);
BKGDSET(main_w, MT_COLOR_NORMAL);
/* erase the current indicator */
- wattrset (main_w, menu->color (menu->oldcurrent));
+ wattrset(main_w, menu->color(menu->oldcurrent));
+ wmove (main_w, menu->oldcurrent + menu->offset - menu->top, 0);
wclrtoeol (main_w);
menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
menu_pad_string (buf, sizeof (buf));
{
char buf[STRING];
- wmove (main_w, menu->current + menu->offset - menu->top, 0);
menu_make_entry (buf, sizeof (buf), menu, menu->current);
menu_pad_string (buf, sizeof (buf));
wattrset (main_w, menu->color (menu->current));
ADDCOLOR(main_w, MT_COLOR_INDICATOR);
BKGDSET(main_w, MT_COLOR_INDICATOR);
+ wmove (main_w, menu->current + menu->offset - menu->top, 0);
wclrtoeol (main_w);
print_enriched_string (menu->color (menu->current), (unsigned char *) buf,
0);
if (*Errorbuf)
mutt_clear_error ();
- SETCOLOR(main_w, MT_COLOR_NORMAL);
- mvwaddstr (main_w, LINES - 1, 0, menu->prompt);
- wclrtoeol (main_w);
+ SETCOLOR(stdscr, MT_COLOR_NORMAL);
+ mvwaddstr(stdscr, LINES - 1, 0, menu->prompt);
+ wclrtoeol(stdscr);
}
}
int c = MIN (MenuContext, menu->pagelen / 2);
int old_top = menu->top;
- if (!option (OPTMENUMOVEOFF) && menu->max <= menu->pagelen) { /* less entries than lines */
- if (menu->top != 0) {
- menu->top = 0;
- set_option (OPTNEEDREDRAW);
- }
+ if ((menu->pagelen <= 0) || (c < MenuContext)) {
+ if (menu->current < menu->top + c)
+ menu->top = menu->current - c;
+ else if (menu->current >= menu->top + menu->pagelen - c)
+ menu->top = menu->current - menu->pagelen + c + 1;
} else {
- if (option (OPTMENUSCROLL) || (menu->pagelen <= 0) || (c < MenuContext)) {
- if (menu->current < menu->top + c)
- menu->top = menu->current - c;
- else if (menu->current >= menu->top + menu->pagelen - c)
- menu->top = menu->current - menu->pagelen + c + 1;
- } else {
- if (menu->current < menu->top + c)
- menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - menu->current) / (menu->pagelen - c)) - c;
- else if ((menu->current >= menu->top + menu->pagelen - c))
- menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / (menu->pagelen - c)) - c;
- }
+ if (menu->current < menu->top + c)
+ menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - menu->current) / (menu->pagelen - c)) - c;
+ else if ((menu->current >= menu->top + menu->pagelen - c))
+ menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / (menu->pagelen - c)) - c;
}
- if (!option (OPTMENUMOVEOFF)) /* make entries stick to bottom */
- menu->top = MIN (menu->top, menu->max - menu->pagelen);
menu->top = MAX (menu->top, 0);
if (menu->top != old_top)
if (menu->max) {
int c = MIN (MenuContext, menu->pagelen / 2);
- if (menu->top + 1 < menu->max - c && (option (OPTMENUMOVEOFF)
- || (menu->max > menu->pagelen
- && menu->top <
- menu->max - menu->pagelen))) {
+ if (menu->top + 1 < menu->max - c) {
menu->top++;
if (menu->current < menu->top + c && menu->current < menu->max - 1)
menu->current++;
menu->redraw = REDRAW_INDEX;
- }
- else
+ } else {
mutt_error _("You cannot scroll down farther.");
- }
- else
+ }
+ } else {
mutt_error _("No entries.");
+ }
}
void menu_prev_line (MUTTMENU * menu)
menu->top += jumplen;
/* jumped too long? */
- if ((neg || !option (OPTMENUMOVEOFF)) && DIRECTION * menu->top > tmp)
+ if (neg && DIRECTION * menu->top > tmp)
menu->top = tmp;
/* need to move the cursor? */
i = km_dokey (menu->menu);
if (i == OP_TAG_PREFIX || i == OP_TAG_PREFIX_COND) {
if (menu->tagged) {
- mvwaddstr (main_w, LINES - 1, 0, "Tag-");
- wclrtoeol (main_w);
+ mvwaddstr(stdscr, LINES - 1, 0, "Tag-");
+ wclrtoeol(stdscr);
i = km_dokey (menu->menu);
menu->tagprefix = 1;
- CLEARLINE(main_w, LINES - 1);
+ CLEARLINE(stdscr, LINES - 1);
}
else if (i == OP_TAG_PREFIX) {
mutt_error _("No tagged entries.");
MAYBE_REDRAW (menu->redraw);
break;
- case OP_WHAT_KEY:
- mutt_what_key ();
- break;
-
case OP_REDRAW:
clearok (main_w, TRUE);
menu->redraw = REDRAW_FULL;