X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=1162b23d342ba7446b230c9c75e9d9e9aea130f8;hp=abccfacc8c3af7202143160bd8a9d87e11b83b44;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd diff --git a/help.c b/help.c index abccfac..1162b23 100644 --- a/help.c +++ b/help.c @@ -9,22 +9,14 @@ #define HELP_C -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include -#include -#include +#include #include "mutt.h" -#include "mutt_curses.h" +#include "charset.h" #include "keymap.h" #include "pager.h" -#include "mapping.h" - -#include -#include -#include static struct binding_t *help_lookupFunction (int op, int menu) { @@ -47,9 +39,9 @@ static struct binding_t *help_lookupFunction (int op, int menu) return (NULL); } -void mutt_make_help (char *d, size_t dlen, char *txt, int menu, int op) +void mutt_make_help (char *d, ssize_t dlen, char *txt, int menu, int op) { - char buf[SHORT_STRING]; + char buf[STRING]; if (km_expand_key (buf, sizeof (buf), km_find_func (menu, op)) || km_expand_key (buf, sizeof (buf), km_find_func (MENU_GENERIC, op))) @@ -58,11 +50,11 @@ void mutt_make_help (char *d, size_t dlen, char *txt, int menu, int op) d[0] = 0; } -char *mutt_compile_help (char *buf, size_t buflen, int menu, +char *mutt_compile_help (char *buf, ssize_t buflen, int menu, struct mapping_t *items) { int i; - size_t len; + ssize_t len; char *pbuf = buf; for (i = 0; items[i].name && buflen > 2; i++) { @@ -84,29 +76,29 @@ static int print_macro (FILE * f, int maxwidth, const char **macro) int n = maxwidth; wchar_t wc; int w; - size_t k; - size_t len = m_strlen(*macro); + ssize_t k; + ssize_t len = m_strlen(*macro); mbstate_t mbstate1, mbstate2; - memset (&mbstate1, 0, sizeof (mbstate1)); - memset (&mbstate2, 0, sizeof (mbstate2)); + p_clear(&mbstate1, 1); + p_clear(&mbstate2, 1); for (; len && (k = mbrtowc (&wc, *macro, len, &mbstate1)); *macro += k, len -= k) { - if (k == (size_t) (-1) || k == (size_t) (-2)) { - k = (k == (size_t) (-1)) ? 1 : len; - wc = replacement_char (); + if (k == -1 || k == -2) { + k = (k == -1) ? 1 : len; + wc = CharsetReplacement; } /* glibc-2.1.3's wcwidth() returns 1 for unprintable chars! */ - if (IsWPrint (wc) && (w = wcwidth (wc)) >= 0) { + if (iswprint(wc) && (w = wcwidth (wc)) >= 0) { if (w > n) break; n -= w; { char buf[MB_LEN_MAX * 2]; - size_t n1, n2; + ssize_t n1, n2; - if ((n1 = wcrtomb (buf, wc, &mbstate2)) != (size_t) (-1) && - (n2 = wcrtomb (buf + n1, 0, &mbstate2)) != (size_t) (-1)) + if ((n1 = wcrtomb(buf, wc, &mbstate2)) != -1 && + (n2 = wcrtomb(buf + n1, 0, &mbstate2)) != -1) fputs (buf, f); } } @@ -172,7 +164,7 @@ static void format_line (FILE * f, int ismacro, } if (ismacro > 0) { - if (!str_cmp (Pager, "builtin")) + if (!m_strcmp(Pager, "builtin")) fputs ("_\010", f); fputs ("M ", f); col += 2; @@ -199,7 +191,7 @@ static void format_line (FILE * f, int ismacro, n = COLS - col; if (ismacro >= 0) { - SKIPWS (t3); + t3 = vskipspaces(t3); /* FIXME: this is completely wrong */ if ((n = m_strlen(t3)) > COLS - col) { @@ -213,7 +205,7 @@ static void format_line (FILE * f, int ismacro, print_macro (f, n, &t3); if (*t3) { - if (str_cmp (Pager, "builtin")) { + if (m_strcmp(Pager, "builtin")) { fputc ('\n', f); n = 0; } @@ -234,7 +226,7 @@ static void dump_menu (FILE * f, int menu) { struct keymap_t *map; struct binding_t *b; - char buf[SHORT_STRING]; + char buf[STRING]; /* browse through the keymap table */ for (map = Keymaps[menu]; map; map = map->next) { @@ -280,43 +272,41 @@ static void dump_unbound (FILE * f, void mutt_help (int menu) { - char t[_POSIX_PATH_MAX]; - char buf[SHORT_STRING]; - const char *desc; - FILE *f; - struct binding_t *funcs; - - mutt_mktemp (t); - - funcs = km_get_table (menu); - desc = mutt_getnamebyvalue (menu, Menus); - if (!desc) - desc = _(""); - - do { - if ((f = safe_fopen (t, "w")) == NULL) { - mutt_perror (t); - return; - } + char tmp[_POSIX_PATH_MAX]; + char buf[STRING]; + const char *desc; + FILE *f; + struct binding_t *funcs; + + funcs = km_get_table (menu); + desc = mutt_getnamebyvalue (menu, Menus); + if (!desc) + desc = _(""); + + do { + f = m_tempfile(tmp, sizeof(tmp), NONULL(Tempdir), NULL); + if (!f) { + mutt_perror(tmp); + return; + } - dump_menu (f, menu); - if (menu != MENU_EDITOR && menu != MENU_PAGER) { - fputs (_("\nGeneric bindings:\n\n"), f); - dump_menu (f, MENU_GENERIC); - } + dump_menu(f, menu); + if (menu != MENU_EDITOR && menu != MENU_PAGER) { + fputs(_("\nGeneric bindings:\n\n"), f); + dump_menu(f, MENU_GENERIC); + } - fputs (_("\nUnbound functions:\n\n"), f); - if (funcs) - dump_unbound (f, funcs, Keymaps[menu], NULL); - if (menu != MENU_PAGER) - dump_unbound (f, OpGeneric, Keymaps[MENU_GENERIC], Keymaps[menu]); + fputs(_("\nUnbound functions:\n\n"), f); + if (funcs) + dump_unbound(f, funcs, Keymaps[menu], NULL); - fclose (f); + if (menu != MENU_PAGER) + dump_unbound (f, OpGeneric, Keymaps[MENU_GENERIC], Keymaps[menu]); - snprintf (buf, sizeof (buf), _("Help for %s"), desc); - } - while - (mutt_do_pager (buf, t, - M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP, NULL) - == OP_REFORMAT_WINCH); + m_fclose(&f); + + snprintf(buf, sizeof (buf), _("Help for %s"), desc); + } while (mutt_do_pager(buf, tmp, + M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP, + NULL) == OP_REFORMAT_WINCH); }