projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
always build imap as well.
[apps/madmutt.git]
/
menu.c
diff --git
a/menu.c
b/menu.c
index
95d4f47
..
eb19d5a
100644
(file)
--- a/
menu.c
+++ b/
menu.c
@@
-11,6
+11,10
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt.h"
#include "enter.h"
#include "mutt_curses.h"
@@
-18,31
+22,23
@@
#include "mbyte.h"
#include "sidebar.h"
#include "mbyte.h"
#include "sidebar.h"
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
+#include <imap/imap.h>
#include <string.h>
#include <stdlib.h>
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
#include <string.h>
#include <stdlib.h>
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
-extern int Charset_is_utf8; /* FIXME: bad modularisation */
-
extern size_t UngetCount;
static void print_enriched_string (int attr, unsigned char *s, int do_color)
{
wchar_t wc;
size_t k;
extern size_t UngetCount;
static void print_enriched_string (int attr, unsigned char *s, int do_color)
{
wchar_t wc;
size_t k;
- size_t n =
str_len
((char *) s);
+ size_t n =
m_strlen
((char *) s);
mbstate_t mbstate;
mbstate_t mbstate;
-
memset (&mbstate, 0, sizeof (mbstate)
);
+
p_clear(&mbstate, 1
);
while (*s) {
if (*s < M_TREE_MAX) {
if (do_color)
while (*s) {
if (*s < M_TREE_MAX) {
if (do_color)
@@
-141,7
+137,7
@@
static void print_enriched_string (int attr, unsigned char *s, int do_color)
static void menu_make_entry (char *s, int l, MUTTMENU * menu, int i)
{
if (menu->dialog) {
static void menu_make_entry (char *s, int l, MUTTMENU * menu, int i)
{
if (menu->dialog) {
-
strncpy (s, menu->dialog[i], l
);
+
m_strcpy(s, l, menu->dialog[i]
);
menu->current = -1; /* hide menubar */
}
else
menu->current = -1; /* hide menubar */
}
else
@@
-152,16
+148,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 =
mem_malloc (
n);
+ char *tmpbuf =
p_new(char,
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,
str_len
(s), 1);
+ mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s,
m_strlen
(s), 1);
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
-
mem_free
(&tmpbuf);
+
p_delete
(&tmpbuf);
}
void menu_redraw_full (MUTTMENU * menu)
}
void menu_redraw_full (MUTTMENU * menu)
@@
-644,7
+640,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 *) mem_calloc (1, sizeof (MUTTMENU)
);
+ MUTTMENU *p =
p_new(MUTTMENU, 1
);
p->current = 0;
p->top = 0;
p->current = 0;
p->top = 0;
@@
-660,16
+656,16
@@
void mutt_menuDestroy (MUTTMENU ** p)
{
int i;
{
int i;
-
mem_free
(&(*p)->searchBuf);
+
p_delete
(&(*p)->searchBuf);
if ((*p)->dialog) {
for (i = 0; i < (*p)->max; i++)
if ((*p)->dialog) {
for (i = 0; i < (*p)->max; i++)
-
mem_free
(&(*p)->dialog[i]);
+
p_delete
(&(*p)->dialog[i]);
-
mem_free
(&(*p)->dialog);
+
p_delete
(&(*p)->dialog);
}
}
-
mem_free
(p);
+
p_delete
(p);
}
#define M_SEARCH_UP 1
}
#define M_SEARCH_UP 1
@@
-683,12
+679,12
@@
static int menu_search (MUTTMENU * menu, int op)
char buf[SHORT_STRING];
if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE) {
char buf[SHORT_STRING];
if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE) {
-
strfcpy (buf, menu->searchBuf ? menu->searchBuf : "", sizeof (b
uf));
+
m_strcpy(buf, sizeof(buf), NONULL(menu->searchB
uf));
if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") :
_("Reverse search for: "),
buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
return (-1);
if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") :
_("Reverse search for: "),
buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
return (-1);
-
str_replace
(&menu->searchBuf, buf);
+
m_strreplace
(&menu->searchBuf, buf);
menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
}
else {
menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
}
else {
@@
-801,7
+797,7
@@
int mutt_menuLoop (MUTTMENU * menu)
{
int i = OP_NULL;
{
int i = OP_NULL;
-
FOREVER
{
+
for (;;)
{
if (option (OPTMENUCALLER)) {
unset_option (OPTMENUCALLER);
return OP_NULL;
if (option (OPTMENUCALLER)) {
unset_option (OPTMENUCALLER);
return OP_NULL;
@@
-809,10
+805,7
@@
int mutt_menuLoop (MUTTMENU * menu)
mutt_curs_set (0);
mutt_curs_set (0);
-
-#ifdef USE_IMAP
imap_keepalive ();
imap_keepalive ();
-#endif
if (menu_redraw (menu) == OP_REDRAW)
return OP_REDRAW;
if (menu_redraw (menu) == OP_REDRAW)
return OP_REDRAW;