#endif
#include "mutt.h"
+#include "enter.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mbyte.h"
#include "imap.h"
#endif
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
#include <string.h>
#include <stdlib.h>
{
wchar_t wc;
size_t k;
- size_t n = mutt_strlen ((char *) s);
+ size_t n = str_len ((char *) s);
mbstate_t mbstate;
memset (&mbstate, 0, sizeof (mbstate));
{
int shift = option (OPTARROWCURSOR) ? 3 : 0;
int cols;
- char *tmpbuf = safe_malloc (n);
+ char *tmpbuf = mem_malloc (n);
if (option (OPTMBOXPANE))
cols = COLS - shift - SidebarWidth;
else
cols = COLS - shift;
- mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, strlen (s), 1);
+ mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, str_len (s), 1);
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
- FREE (&tmpbuf);
+ mem_free (&tmpbuf);
}
void menu_redraw_full (MUTTMENU * menu)
char buf[STRING];
int i;
- draw_sidebar (1);
+ sidebar_draw (1);
for (i = menu->top; i < menu->top + menu->pagelen; i++) {
if (i < menu->max) {
menu_make_entry (buf, sizeof (buf), menu, i);
attrset (menu->color (i));
addch (' ');
}
- else
- move (i - menu->top + menu->offset, SidebarWidth + 3);
+ else {
+ attrset (menu->color (i));
+ move (i - menu->top + menu->offset, SidebarWidth);
+ addstr (" ");
+ }
print_enriched_string (menu->color (i), (unsigned char *) buf, 1);
SETCOLOR (MT_COLOR_NORMAL);
MUTTMENU *mutt_new_menu (void)
{
- MUTTMENU *p = (MUTTMENU *) safe_calloc (1, sizeof (MUTTMENU));
+ MUTTMENU *p = (MUTTMENU *) mem_calloc (1, sizeof (MUTTMENU));
p->current = 0;
p->top = 0;
{
int i;
- FREE (&(*p)->searchBuf);
+ mem_free (&(*p)->searchBuf);
if ((*p)->dialog) {
for (i = 0; i < (*p)->max; i++)
- FREE (&(*p)->dialog[i]);
+ mem_free (&(*p)->dialog[i]);
- FREE (&(*p)->dialog);
+ mem_free (&(*p)->dialog);
}
- FREE (p);
+ mem_free (p);
}
#define M_SEARCH_UP 1
_("Reverse search for: "),
buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
return (-1);
- mutt_str_replace (&menu->searchBuf, buf);
+ str_replace (&menu->searchBuf, buf);
menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
}
else {
menu->oldcurrent = menu->current;
-
- /* move the cursor out of the way */
- move (menu->current - menu->top + menu->offset,
- (option (OPTARROWCURSOR) ? 2 : COLS - 1));
+ if (option (OPTARROWCURSOR))
+ move (menu->current - menu->top + menu->offset, 2);
+ else if (option (OPTBRAILLEFRIENDLY))
+ move (menu->current - menu->top + menu->offset, 0);
+ else
+ move (menu->current - menu->top + menu->offset, COLS - 1);
mutt_refresh ();
+
/* try to catch dialog keys before ops */
if (menu->dialog && menu_dialog_dokey (menu, &i) == 0)
return i;