#include <lib-lib/lib-lib.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include "mutt.h"
#include "charset.h"
return (NULL);
}
-void mutt_make_help (char *d, ssize_t dlen, char *txt, int menu, int op)
-{
- 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)))
- snprintf (d, dlen, "%s:%s", buf, txt);
- else
- d[0] = 0;
-}
-
-char *mutt_compile_help (char *buf, ssize_t buflen, int menu,
- struct mapping_t *items)
-{
- int i;
- ssize_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;
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;
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 ... */
+ /* don't try to press string into one line with less than 40 characters. */
if ((split = COLS < 40)) {
col_a = col = 0;
col_b = LONG_STRING;
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]));
}
}
desc = _("<UNKNOWN>");
do {
- f = m_tempfile(tmp, sizeof(tmp), NONULL(MCore.tmpdir), NULL);
+ f = m_tempfile(tmp, sizeof(tmp), NONULL(mod_core.tmpdir), NULL);
if (!f) {
mutt_perror(tmp);
return;
M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP,
NULL) == OP_REFORMAT_WINCH);
}
+
+#undef HELP_C