/*
* Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- * * Parts of it were written/modified by:
- * Nico Golde <nico@ngolde.de>
- *
+ *
* This file is part of mutt-ng, see http://www.muttng.org/.
* It's licensed under the GNU General Public License,
* please see the file GPL in the top level source directory.
#endif
#include "mutt.h"
+#include "enter.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mbyte.h"
{
wchar_t wc;
size_t k;
- size_t n = safe_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, safe_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)
/* clear() doesn't optimize screen redraws */
move (0, 0);
clrtobot ();
-
- if (!option(OPTMBOXPANE)) SidebarWidth=0;
if (option (OPTHELP)) {
SETCOLOR (MT_COLOR_STATUS);
char buf[STRING];
int i;
- if (!option(OPTMBOXPANE)) SidebarWidth=0;
sidebar_draw (1);
for (i = menu->top; i < menu->top + menu->pagelen; i++) {
if (i < menu->max) {
menu_make_entry (buf, sizeof (buf), menu, menu->current);
menu_pad_string (buf, sizeof (buf));
- if (!option(OPTMBOXPANE)) SidebarWidth=0;
-
if (option (OPTARROWCURSOR)) {
int attr = menu->color (menu->current);
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