#define HELP_C
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/macros.h>
-#include "lib/str.h"
+#include <lib-ui/curses.h>
#include "mutt.h"
-#include "mutt_curses.h"
+#include "charset.h"
#include "keymap.h"
#include "pager.h"
-#include "mapping.h"
-
-#include <wchar.h>
-#include <ctype.h>
-#include <string.h>
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, const 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)))
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++) {
buflen -= 2;
}
mutt_make_help (pbuf, buflen, _(items[i].name), menu, items[i].value);
- len = str_len (pbuf);
+ len = m_strlen(pbuf);
pbuf += len;
buflen -= len;
}
int n = maxwidth;
wchar_t wc;
int w;
- size_t k;
- size_t len = str_len (*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);
}
}
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;
else {
col_a = COLS > 83 ? (COLS - 32) >> 2 : 12;
col_b = COLS > 49 ? (COLS - 10) >> 1 : 19;
- col = pad (f, str_len (t1), col_a);
+ col = pad (f, m_strlen(t1), col_a);
}
if (ismacro > 0) {
- if (!str_cmp (Pager, "builtin"))
- fputs ("_\010", f);
- fputs ("M ", f);
+ fputs ("_\010M ", f);
col += 2;
if (!split) {
col += print_macro (f, col_b - col - 4, &t2);
- if (str_len (t2) > col_b - col)
+ if (m_strlen(t2) > col_b - col)
t2 = "...";
}
}
n = COLS - col;
if (ismacro >= 0) {
- SKIPWS (t3);
+ t3 = vskipspaces(t3);
/* FIXME: this is completely wrong */
- if ((n = str_len (t3)) > COLS - col) {
+ if ((n = m_strlen(t3)) > COLS - col) {
n = COLS - col;
for (col_a = n; col_a > 0 && t3[col_a] != ' '; col_a--);
if (col_a)
print_macro (f, n, &t3);
if (*t3) {
- if (str_cmp (Pager, "builtin")) {
- fputc ('\n', f);
- n = 0;
- }
- else {
- n += col - COLS;
- if (option (OPTMARKERS))
- ++n;
- }
+ n += col - COLS;
+ if (option (OPTMARKERS))
+ ++n;
col = pad (f, n, col_b);
}
}
{
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_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"));
}
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 = _("<UNKNOWN>");
-
- 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 = _("<UNKNOWN>");
+
+ 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