X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=menu.c;h=90e2bdca18e373c18990f276e241693d08f6bc0f;hp=f8ea243724f5232d96200fa0977a524db52c8644;hb=186cc3cb513f2387959888d896dbf67b250a9035;hpb=50adaa99ec40c06e557a13394b6f7e62bcc5b9fa diff --git a/menu.c b/menu.c index f8ea243..90e2bdc 100644 --- a/menu.c +++ b/menu.c @@ -11,6 +11,10 @@ # include "config.h" #endif +#include +#include +#include + #include "mutt.h" #include "enter.h" #include "mutt_curses.h" @@ -18,31 +22,23 @@ #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 #include #include #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; - size_t n = str_len ((char *) s); + size_t n = m_strlen((char *) s); mbstate_t mbstate; - memset (&mbstate, 0, sizeof (mbstate)); + p_clear(&mbstate, 1); 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) { - strncpy (s, menu->dialog[i], l); + m_strcpy(s, l, menu->dialog[i]); 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; - char *tmpbuf = mem_malloc (n); + char *tmpbuf = p_new(char, n); 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 */ - mem_free (&tmpbuf); + p_delete(&tmpbuf); } void menu_redraw_full (MUTTMENU * menu) @@ -173,8 +169,8 @@ void menu_redraw_full (MUTTMENU * menu) 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; @@ -184,6 +180,8 @@ void menu_redraw_full (MUTTMENU * menu) menu->pagelen = LINES - 2; } + sidebar_draw_frames(); + mutt_show_error (); menu->redraw = REDRAW_INDEX | REDRAW_STATUS; @@ -195,10 +193,11 @@ void menu_redraw_status (MUTTMENU * menu) 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; + sidebar_draw_frames(); } void menu_redraw_index (MUTTMENU * menu) @@ -206,7 +205,6 @@ void menu_redraw_index (MUTTMENU * menu) 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); @@ -254,6 +252,9 @@ void menu_redraw_index (MUTTMENU * menu) else CLEARLINE_WIN (i - menu->top + menu->offset); } + sidebar_draw (1); +/* sidebar_draw_frames(); */ + menu->redraw = 0; } @@ -624,7 +625,7 @@ void menu_prev_entry (MUTTMENU * menu) mutt_error _("You are on the first entry."); } -static int default_color (int i) +static int default_color (int i __attribute__ ((unused))) { return ColorDefs[MT_COLOR_NORMAL]; } @@ -639,7 +640,7 @@ static int menu_search_generic (MUTTMENU * m, regex_t * re, int n) 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; @@ -655,16 +656,16 @@ void mutt_menuDestroy (MUTTMENU ** p) { int i; - mem_free (&(*p)->searchBuf); + p_delete(&(*p)->searchBuf); 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 @@ -678,12 +679,12 @@ static int menu_search (MUTTMENU * menu, int op) char buf[SHORT_STRING]; if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE) { - strfcpy (buf, menu->searchBuf ? menu->searchBuf : "", sizeof (buf)); + m_strcpy(buf, sizeof(buf), NONULL(menu->searchBuf)); 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 { @@ -796,7 +797,7 @@ int mutt_menuLoop (MUTTMENU * menu) { int i = OP_NULL; - FOREVER { + for (;;) { if (option (OPTMENUCALLER)) { unset_option (OPTMENUCALLER); return OP_NULL; @@ -804,10 +805,7 @@ int mutt_menuLoop (MUTTMENU * menu) mutt_curs_set (0); - -#ifdef USE_IMAP imap_keepalive (); -#endif if (menu_redraw (menu) == OP_REDRAW) return OP_REDRAW; @@ -972,10 +970,10 @@ int mutt_menuLoop (MUTTMENU * menu) menu->redraw = REDRAW_INDEX; } else if (menu->max) { - int i = menu->tag (menu, menu->current, -1); + int t = menu->tag (menu, menu->current, -1); - menu->tagged += i; - if (i && option (OPTRESOLVE) && menu->current < menu->max - 1) { + menu->tagged += t; + if (t && option (OPTRESOLVE) && menu->current < menu->max - 1) { menu->current++; menu->redraw = REDRAW_MOTION_RESYNCH; }