projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
license statements.
[apps/madmutt.git]
/
menu.c
diff --git
a/menu.c
b/menu.c
index
f8ea243
..
54d36dd
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"
@@
-22,24
+26,19
@@
#include "imap.h"
#endif
#include "imap.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.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;
memset (&mbstate, 0, sizeof (mbstate));
mbstate_t mbstate;
memset (&mbstate, 0, sizeof (mbstate));
@@
-152,16
+151,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)
@@
-173,8
+172,8
@@
void menu_redraw_full (MUTTMENU * menu)
if (option (OPTHELP)) {
SETCOLOR (MT_COLOR_STATUS);
if (option (OPTHELP)) {
SETCOLOR (MT_COLOR_STATUS);
- move (option (OPTSTATUSONTOP) ? LINES - 2 : 0,
0
);
- mutt_paddstr (COLS, menu->help);
+ move (option (OPTSTATUSONTOP) ? LINES - 2 : 0,
SW
);
+ mutt_paddstr (COLS
-SW
, menu->help);
SETCOLOR (MT_COLOR_NORMAL);
menu->offset = 1;
menu->pagelen = LINES - 3;
SETCOLOR (MT_COLOR_NORMAL);
menu->offset = 1;
menu->pagelen = LINES - 3;
@@
-184,6
+183,8
@@
void menu_redraw_full (MUTTMENU * menu)
menu->pagelen = LINES - 2;
}
menu->pagelen = LINES - 2;
}
+ sidebar_draw_frames();
+
mutt_show_error ();
menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
mutt_show_error ();
menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
@@
-195,10
+196,11
@@
void menu_redraw_status (MUTTMENU * menu)
snprintf (buf, sizeof (buf), M_MODEFMT, menu->title);
SETCOLOR (MT_COLOR_STATUS);
snprintf (buf, sizeof (buf), M_MODEFMT, menu->title);
SETCOLOR (MT_COLOR_STATUS);
- move (option (OPTSTATUSONTOP) ? 0 : LINES - 2,
0
);
- mutt_paddstr (COLS, buf);
+ move (option (OPTSTATUSONTOP) ? 0 : LINES - 2,
SW
);
+ mutt_paddstr (COLS
-SW
, buf);
SETCOLOR (MT_COLOR_NORMAL);
menu->redraw &= ~REDRAW_STATUS;
SETCOLOR (MT_COLOR_NORMAL);
menu->redraw &= ~REDRAW_STATUS;
+ sidebar_draw_frames();
}
void menu_redraw_index (MUTTMENU * menu)
}
void menu_redraw_index (MUTTMENU * menu)
@@
-206,7
+208,6
@@
void menu_redraw_index (MUTTMENU * menu)
char buf[STRING];
int i;
char buf[STRING];
int i;
- 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);
for (i = menu->top; i < menu->top + menu->pagelen; i++) {
if (i < menu->max) {
menu_make_entry (buf, sizeof (buf), menu, i);
@@
-254,6
+255,9
@@
void menu_redraw_index (MUTTMENU * menu)
else
CLEARLINE_WIN (i - menu->top + menu->offset);
}
else
CLEARLINE_WIN (i - menu->top + menu->offset);
}
+ sidebar_draw (1);
+/* sidebar_draw_frames(); */
+
menu->redraw = 0;
}
menu->redraw = 0;
}
@@
-639,7
+643,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;
@@
-655,16
+659,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