#include <lib-lib/lib-lib.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include "mutt.h"
#include "charset.h"
/* 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))) {
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, ssize_t dlen, const 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;
+ return NULL;
}
static int print_macro (FILE * f, int maxwidth, const char **macro)
fprintf (f, "?");
}
}
- return (maxwidth - n);
+ return maxwidth - n;
}
static int pad (FILE * f, int col, int i)
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 help_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);
}
}
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;
print_macro (f, n, &t3);
if (*t3) {
- n += col - COLS;
+ n += col - getmaxx(main_w);
if (option (OPTMARKERS))
++n;
col = pad (f, n, col_b);