X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=30bcbde56e879e7f88270a594cfa40f476ae2ccb;hp=a4985a9de6a940a27d84b6ede5e2e5132e8b8fb8;hb=049b21f53af51ad7259613f5eefaa0f37b1b2167;hpb=f404a0ca916be07049af51a3022baaaaab94def6 diff --git a/help.c b/help.c index a4985a9..30bcbde 100644 --- a/help.c +++ b/help.c @@ -1,168 +1,115 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1996-2000 Michael R. Elkins - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - */ + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. + */ #define HELP_C -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include + +#include #include "mutt.h" -#include "mutt_curses.h" +#include "charset.h" #include "keymap.h" #include "pager.h" -#include "mapping.h" - -#include -#include static struct binding_t *help_lookupFunction (int op, int menu) { int i; struct binding_t *map; - if (menu != MENU_PAGER) - { + if (menu != MENU_PAGER) { /* first look in the generic map for the function */ for (i = 0; OpGeneric[i].name; i++) if (OpGeneric[i].op == op) - return (&OpGeneric[i]); + return &OpGeneric[i]; } - if ((map = km_get_table(menu))) - { + if ((map = km_get_table (menu))) { for (i = 0; map[i].name; i++) if (map[i].op == op) - return (&map[i]); + return &map[i]; } - - 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; + return NULL; } -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 = mutt_strlen (pbuf); - pbuf += len; - buflen -= len; - } - return buf; -} - -static int print_macro (FILE *f, int maxwidth, const char **macro) +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 = mutt_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)); - 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 (); + p_clear(&mbstate1, 1); + p_clear(&mbstate2, 1); + for (; len && (k = mbrtowc (&wc, *macro, len, &mbstate1)); + *macro += k, len -= k) { + 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; + break; n -= w; { - char buf[MB_LEN_MAX*2]; - size_t n1, n2; - if ((n1 = wcrtomb (buf, wc, &mbstate2)) != (size_t)(-1) && - (n2 = wcrtomb (buf + n1, 0, &mbstate2)) != (size_t)(-1)) - fputs (buf, f); + char buf[MB_LEN_MAX * 2]; + ssize_t n1, n2; + + if ((n1 = wcrtomb(buf, wc, &mbstate2)) != -1 && + (n2 = wcrtomb(buf + n1, 0, &mbstate2)) != -1) + fputs (buf, f); } } - else if (wc < 0x20 || wc == 0x7f) - { + else if (wc < 0x20 || wc == 0x7f) { if (2 > n) - break; + break; n -= 2; if (wc == '\033') - fprintf (f, "\\e"); + fprintf (f, "\\e"); else if (wc == '\n') - fprintf (f, "\\n"); + fprintf (f, "\\n"); else if (wc == '\r') - fprintf (f, "\\r"); + fprintf (f, "\\r"); else if (wc == '\t') - fprintf (f, "\\t"); + fprintf (f, "\\t"); else - fprintf (f, "^%c", (char)((wc + '@') & 0x7f)); + fprintf (f, "^%c", (char) ((wc + '@') & 0x7f)); } - else - { + else { if (1 > n) - break; + break; n -= 1; fprintf (f, "?"); } } - return (maxwidth - n); + return maxwidth - n; } -static int pad (FILE *f, int col, int i) +static int pad (FILE * f, int col, int i) { char fmt[8]; - if (col < i) - { - snprintf (fmt, sizeof(fmt), "%%-%ds", i - col); + if (col < i) { + snprintf (fmt, sizeof (fmt), "%%-%ds", i - col); fprintf (f, fmt, ""); - return (i); + return i; } fputc (' ', f); - return (col + 1); + 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; @@ -171,33 +118,26 @@ 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 = pad (f, mutt_strlen(t1), col_a); + else { + 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 (!mutt_strcmp (Pager, "builtin")) - fputs ("_\010", f); - fputs ("M ", f); + if (ismacro > 0) { + fputs ("_\010M ", f); col += 2; - if (!split) - { + if (!split) { col += print_macro (f, col_b - col - 4, &t2); - if (mutt_strlen (t2) > col_b - col) - t2 = "..."; + if (m_strlen(t2) > col_b - col) + t2 = "..."; } } @@ -207,47 +147,33 @@ static void format_line (FILE *f, int ismacro, else col = pad (f, col, col_b); - if (split) - { + if (split) { print_macro (f, LONG_STRING, &t3); fputc ('\n', f); } - else - { - while (*t3) - { - n = COLS - col; - - if (ismacro >= 0) - { - SKIPWS(t3); - - /* FIXME: this is completely wrong */ - if ((n = mutt_strlen (t3)) > COLS - col) - { - n = COLS - col; - for (col_a = n; col_a > 0 && t3[col_a] != ' '; col_a--) ; - if (col_a) - n = col_a; - } + else { + while (*t3) { + n = getmaxx(main_w) - col; + + if (ismacro >= 0) { + t3 = vskipspaces(t3); + + /* FIXME: this is completely wrong */ + 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; + } } print_macro (f, n, &t3); - if (*t3) - { - if (mutt_strcmp (Pager, "builtin")) - { - fputc ('\n', f); - n = 0; - } - else - { - n += col - COLS; - if (option (OPTMARKERS)) - ++n; - } - col = pad (f, n, col_b); + if (*t3) { + n += col - getmaxx(main_w); + if (option (OPTMARKERS)) + ++n; + col = pad (f, n, col_b); } } } @@ -255,31 +181,28 @@ static void format_line (FILE *f, int ismacro, fputc ('\n', f); } -static void dump_menu (FILE *f, int menu) +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) - { - if (map->op != OP_NULL) - { + for (map = Keymaps[menu]; map; map = map->next) { + if (map->op != OP_NULL) { km_expand_key (buf, sizeof (buf), map); - if (map->op == OP_MACRO) - { - if (map->descr == NULL) - format_line (f, -1, buf, "macro", map->macro); + if (map->op == OP_MACRO) { + if (map->descr == NULL) + 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", - b ? _(HelpStrings[b->op]) : _("ERROR: please report this bug")); + else { + b = help_lookupFunction (map->op, menu); + help_format_line (f, 0, buf, b ? b->name : "UNKNOWN", + b ? _(HelpStrings[b->op]) : + _("ERROR: please report this bug")); } } } @@ -293,63 +216,58 @@ static int is_bound (struct keymap_t *map, int op) return 0; } -static void dump_unbound (FILE *f, - struct binding_t *funcs, - struct keymap_t *map, - struct keymap_t *aux) +static void dump_unbound (FILE * f, + struct binding_t *funcs, + struct keymap_t *map, struct keymap_t *aux) { int i; - 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])); + for (i = 0; funcs[i].name; i++) { + if (!is_bound (map, funcs[i].op) && + (!aux || !is_bound (aux, 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]; - 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; - } - - 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]); - - fclose (f); - - 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); + 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); + } + + 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]); + + 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