projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oopsie, small fixes.
[apps/madmutt.git]
/
help.c
diff --git
a/help.c
b/help.c
index
9db718b
..
67d8855
100644
(file)
--- a/
help.c
+++ b/
help.c
@@
-13,14
+13,22
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <wctype.h>
+#include <wchar.h>
+#include <ctype.h>
+#include <string.h>
+
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/str.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "
mutt_curses
.h"
+#include "
charset
.h"
#include "keymap.h"
#include "pager.h"
#include "keymap.h"
#include "pager.h"
-#include "mapping.h"
-
-#include <ctype.h>
-#include <string.h>
static struct binding_t *help_lookupFunction (int op, int menu)
{
static struct binding_t *help_lookupFunction (int op, int menu)
{
@@
-43,7
+51,7
@@
static struct binding_t *help_lookupFunction (int op, int menu)
return (NULL);
}
return (NULL);
}
-void mutt_make_help (char *d, size_t dlen, char *txt, int menu, int op)
+void mutt_make_help (char *d, s
s
ize_t dlen, char *txt, int menu, int op)
{
char buf[SHORT_STRING];
{
char buf[SHORT_STRING];
@@
-54,11
+62,11
@@
void mutt_make_help (char *d, size_t dlen, char *txt, int menu, int op)
d[0] = 0;
}
d[0] = 0;
}
-char *mutt_compile_help (char *buf, size_t buflen, int menu,
+char *mutt_compile_help (char *buf, s
s
ize_t buflen, int menu,
struct mapping_t *items)
{
int i;
struct mapping_t *items)
{
int i;
- size_t len;
+ s
s
ize_t len;
char *pbuf = buf;
for (i = 0; items[i].name && buflen > 2; i++) {
char *pbuf = buf;
for (i = 0; items[i].name && buflen > 2; i++) {
@@
-68,7
+76,7
@@
char *mutt_compile_help (char *buf, size_t buflen, int menu,
buflen -= 2;
}
mutt_make_help (pbuf, buflen, _(items[i].name), menu, items[i].value);
buflen -= 2;
}
mutt_make_help (pbuf, buflen, _(items[i].name), menu, items[i].value);
- len = m
utt_strlen
(pbuf);
+ len = m
_strlen
(pbuf);
pbuf += len;
buflen -= len;
}
pbuf += len;
buflen -= len;
}
@@
-80,16
+88,16
@@
static int print_macro (FILE * f, int maxwidth, const char **macro)
int n = maxwidth;
wchar_t wc;
int w;
int n = maxwidth;
wchar_t wc;
int w;
- size_t k;
- s
ize_t len = mutt_strlen
(*macro);
+ s
s
ize_t k;
+ s
size_t len = m_strlen
(*macro);
mbstate_t mbstate1, mbstate2;
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) {
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;
+ if (k ==
-1 || k == -2
) {
+ k = (k ==
-1
) ? 1 : len;
wc = replacement_char ();
}
/* glibc-2.1.3's wcwidth() returns 1 for unprintable chars! */
wc = replacement_char ();
}
/* glibc-2.1.3's wcwidth() returns 1 for unprintable chars! */
@@
-99,10
+107,10
@@
static int print_macro (FILE * f, int maxwidth, const char **macro)
n -= w;
{
char buf[MB_LEN_MAX * 2];
n -= w;
{
char buf[MB_LEN_MAX * 2];
- size_t n1, n2;
+ s
s
ize_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);
}
}
fputs (buf, f);
}
}
@@
-164,18
+172,18
@@
static void format_line (FILE * f, int ismacro,
else {
col_a = COLS > 83 ? (COLS - 32) >> 2 : 12;
col_b = COLS > 49 ? (COLS - 10) >> 1 : 19;
else {
col_a = COLS > 83 ? (COLS - 32) >> 2 : 12;
col_b = COLS > 49 ? (COLS - 10) >> 1 : 19;
- col = pad (f, m
utt_strlen
(t1), col_a);
+ col = pad (f, m
_strlen
(t1), col_a);
}
if (ismacro > 0) {
}
if (ismacro > 0) {
- if (!m
utt_strcmp
(Pager, "builtin"))
+ if (!m
_strcmp
(Pager, "builtin"))
fputs ("_\010", f);
fputs ("M ", f);
col += 2;
if (!split) {
col += print_macro (f, col_b - col - 4, &t2);
fputs ("_\010", f);
fputs ("M ", f);
col += 2;
if (!split) {
col += print_macro (f, col_b - col - 4, &t2);
- if (m
utt_strlen
(t2) > col_b - col)
+ if (m
_strlen
(t2) > col_b - col)
t2 = "...";
}
}
t2 = "...";
}
}
@@
-195,10
+203,10
@@
static void format_line (FILE * f, int ismacro,
n = COLS - col;
if (ismacro >= 0) {
n = COLS - col;
if (ismacro >= 0) {
-
SKIPWS
(t3);
+
t3 = vskipspaces
(t3);
/* FIXME: this is completely wrong */
/* FIXME: this is completely wrong */
- if ((n = m
utt_strlen
(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)
n = COLS - col;
for (col_a = n; col_a > 0 && t3[col_a] != ' '; col_a--);
if (col_a)
@@
-209,7
+217,7
@@
static void format_line (FILE * f, int ismacro,
print_macro (f, n, &t3);
if (*t3) {
print_macro (f, n, &t3);
if (*t3) {
- if (m
utt_strcmp
(Pager, "builtin")) {
+ if (m
_strcmp
(Pager, "builtin")) {
fputc ('\n', f);
n = 0;
}
fputc ('\n', f);
n = 0;
}
@@
-278,7
+286,7
@@
void mutt_help (int menu)
{
char t[_POSIX_PATH_MAX];
char buf[SHORT_STRING];
{
char t[_POSIX_PATH_MAX];
char buf[SHORT_STRING];
- char *desc;
+ c
onst c
har *desc;
FILE *f;
struct binding_t *funcs;
FILE *f;
struct binding_t *funcs;