#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);
-
+ 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);
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);
}
}
char buf[LONG_STRING];
menu_make_entry (buf, sizeof (buf), m, n);
- return (regexec (re, buf, 0, NULL, 0));
+ return regexec (re, buf, 0, NULL, 0);
}
MUTTMENU *mutt_new_menu (void)
p->pagelen = LINES - 3;
p->color = default_color;
p->search = menu_search_generic;
- return (p);
+ return p;
}
void mutt_menuDestroy (MUTTMENU ** p)
if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") :
_("Reverse search for: "),
buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
- return (-1);
+ return -1;
m_strreplace(&menu->searchBuf, buf);
menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
}
if (!menu->searchBuf) {
mutt_error _("No search pattern.");
- return (-1);
+ return -1;
}
}
regerror (r, &re, buf, sizeof (buf));
regfree (&re);
mutt_error ("%s", buf);
- return (-1);
+ return -1;
}
r = menu->current + searchDir;
regfree (&re);
mutt_error _("Not found.");
- return (-1);
+ return -1;
}
static int menu_dialog_translate_op (int i)
if (menu->redraw & REDRAW_FULL) {
menu_redraw_full (menu);
/* allow the caller to do any local configuration */
- return (OP_REDRAW);
+ return OP_REDRAW;
}
if (!menu->dialog)
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;
break;
default:
- return (i);
+ return i;
}
}
/* not reached */