projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
menu.c
diff --git
a/menu.c
b/menu.c
index
97f1bed
..
404dc79
100644
(file)
--- a/
menu.c
+++ b/
menu.c
@@
-1,9
+1,7
@@
/*
* Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
/*
* 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.
* 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.
@@
-14,6
+12,7
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "enter.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mbyte.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mbyte.h"
@@
-38,7
+37,7
@@
static void print_enriched_string (int attr, unsigned char *s, int do_color)
{
wchar_t wc;
size_t k;
{
wchar_t wc;
size_t k;
- size_t n = s
afe_str
len ((char *) s);
+ size_t n = s
tr_
len ((char *) s);
mbstate_t mbstate;
memset (&mbstate, 0, sizeof (mbstate));
mbstate_t mbstate;
memset (&mbstate, 0, sizeof (mbstate));
@@
-151,16
+150,16
@@
void menu_pad_string (char *s, size_t n)
{
int shift = option (OPTARROWCURSOR) ? 3 : 0;
int cols;
{
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;
if (option (OPTMBOXPANE))
cols = COLS - shift - SidebarWidth;
else
cols = COLS - shift;
- mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, s
afe_str
len (s), 1);
+ mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, s
tr_
len (s), 1);
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
-
FREE
(&tmpbuf);
+
mem_free
(&tmpbuf);
}
void menu_redraw_full (MUTTMENU * menu)
}
void menu_redraw_full (MUTTMENU * menu)
@@
-169,8
+168,6
@@
void menu_redraw_full (MUTTMENU * menu)
/* clear() doesn't optimize screen redraws */
move (0, 0);
clrtobot ();
/* clear() doesn't optimize screen redraws */
move (0, 0);
clrtobot ();
-
- if (!option(OPTMBOXPANE)) SidebarWidth=0;
if (option (OPTHELP)) {
SETCOLOR (MT_COLOR_STATUS);
if (option (OPTHELP)) {
SETCOLOR (MT_COLOR_STATUS);
@@
-207,7
+204,6
@@
void menu_redraw_index (MUTTMENU * menu)
char buf[STRING];
int i;
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) {
sidebar_draw (1);
for (i = menu->top; i < menu->top + menu->pagelen; i++) {
if (i < menu->max) {
@@
-322,8
+318,6
@@
void menu_redraw_current (MUTTMENU * menu)
menu_make_entry (buf, sizeof (buf), menu, menu->current);
menu_pad_string (buf, sizeof (buf));
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);
if (option (OPTARROWCURSOR)) {
int attr = menu->color (menu->current);
@@
-663,7
+657,7
@@
static int menu_search_generic (MUTTMENU * m, regex_t * re, int n)
MUTTMENU *mutt_new_menu (void)
{
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;
p->current = 0;
p->top = 0;
@@
-679,16
+673,16
@@
void mutt_menuDestroy (MUTTMENU ** p)
{
int i;
{
int i;
-
FREE
(&(*p)->searchBuf);
+
mem_free
(&(*p)->searchBuf);
if ((*p)->dialog) {
for (i = 0; i < (*p)->max; i++)
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
}
#define M_SEARCH_UP 1