X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=0717d6480444a4b9b15cac6b00205c56cb663896;hp=c0b22525a10cee5570dbde8efa28aeb1c503233b;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=dbb9a1e16d03a2d4664d6dc6a30c721b889d4982 diff --git a/help.c b/help.c index c0b2252..0717d64 100644 --- a/help.c +++ b/help.c @@ -9,25 +9,15 @@ #define HELP_C -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include -#include -#include -#include -#include - -#include +#include #include "mutt.h" +#include "charset.h" #include "keymap.h" #include "pager.h" -#include -#include -#include - static struct binding_t *help_lookupFunction (int op, int menu) { int i; @@ -49,66 +39,34 @@ 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) -{ - char buf[SHORT_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))) - snprintf (d, dlen, "%s:%s", buf, txt); - else - d[0] = 0; -} - -char *mutt_compile_help (char *buf, size_t buflen, int menu, - struct mapping_t *items) -{ - int i; - size_t len; - char *pbuf = buf; - - for (i = 0; items[i].name && buflen > 2; i++) { - if (i) { - *pbuf++ = ' '; - *pbuf++ = ' '; - buflen -= 2; - } - mutt_make_help (pbuf, buflen, _(items[i].name), menu, items[i].value); - len = m_strlen(pbuf); - pbuf += len; - buflen -= len; - } - return buf; -} - 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; 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); } } @@ -150,8 +108,8 @@ static int pad (FILE * f, int col, int i) return (col + 1); } -static void format_line (FILE * f, int ismacro, - const char *t1, const char *t2, const char *t3) +static void help_format_line (FILE * f, int ismacro, + const char *t1, const char *t2, const char *t3) { int col; int col_a, col_b; @@ -160,23 +118,20 @@ static void format_line (FILE * f, int ismacro, fputs (t1, f); - /* don't try to press string into one line with less than 40 characters. - The double paranthesis avoid a gcc warning, sigh ... */ - if ((split = COLS < 40)) { + /* don't try to press string into one line with less than 40 characters. */ + if ((split = getmaxx(main_w) < 40)) { col_a = col = 0; col_b = LONG_STRING; fputc ('\n', f); } else { - col_a = COLS > 83 ? (COLS - 32) >> 2 : 12; - col_b = COLS > 49 ? (COLS - 10) >> 1 : 19; + col_a = getmaxx(main_w) > 83 ? (getmaxx(main_w) - 32) >> 2 : 12; + col_b = getmaxx(main_w) > 49 ? (getmaxx(main_w) - 10) >> 1 : 19; col = pad (f, m_strlen(t1), col_a); } if (ismacro > 0) { - if (!m_strcmp(Pager, "builtin")) - fputs ("_\010", f); - fputs ("M ", f); + fputs ("_\010M ", f); col += 2; if (!split) { @@ -198,14 +153,14 @@ static void format_line (FILE * f, int ismacro, } else { while (*t3) { - n = COLS - col; + n = getmaxx(main_w) - col; if (ismacro >= 0) { t3 = vskipspaces(t3); /* FIXME: this is completely wrong */ - if ((n = m_strlen(t3)) > COLS - col) { - n = COLS - col; + if ((n = m_strlen(t3)) > getmaxx(main_w) - col) { + n = getmaxx(main_w) - col; for (col_a = n; col_a > 0 && t3[col_a] != ' '; col_a--); if (col_a) n = col_a; @@ -215,15 +170,9 @@ static void format_line (FILE * f, int ismacro, print_macro (f, n, &t3); if (*t3) { - if (m_strcmp(Pager, "builtin")) { - fputc ('\n', f); - n = 0; - } - else { - n += col - COLS; - if (option (OPTMARKERS)) - ++n; - } + n += col - getmaxx(main_w); + if (option (OPTMARKERS)) + ++n; col = pad (f, n, col_b); } } @@ -236,7 +185,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) { @@ -245,13 +194,13 @@ static void dump_menu (FILE * f, int menu) if (map->op == OP_MACRO) { if (map->descr == NULL) - format_line (f, -1, buf, "macro", map->macro); + help_format_line (f, -1, buf, "macro", map->macro); else - format_line (f, 1, buf, map->macro, map->descr); + help_format_line (f, 1, buf, map->macro, map->descr); } else { b = help_lookupFunction (map->op, menu); - format_line (f, 0, buf, b ? b->name : "UNKNOWN", + help_format_line (f, 0, buf, b ? b->name : "UNKNOWN", b ? _(HelpStrings[b->op]) : _("ERROR: please report this bug")); } @@ -276,49 +225,49 @@ static void dump_unbound (FILE * f, for (i = 0; funcs[i].name; i++) { if (!is_bound (map, funcs[i].op) && (!aux || !is_bound (aux, funcs[i].op))) - format_line (f, 0, funcs[i].name, "", _(HelpStrings[funcs[i].op])); + help_format_line (f, 0, funcs[i].name, "", _(HelpStrings[funcs[i].op])); } } 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(mod_core.tmpdir), 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_pager(buf, tmp, + M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP, + NULL) == OP_REFORMAT_WINCH); } + +#undef HELP_C