projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
further pop_mx_ng work
[apps/madmutt.git]
/
help.c
diff --git
a/help.c
b/help.c
index
4fee510
..
30bcbde
100644
(file)
--- a/
help.c
+++ b/
help.c
@@
-27,16
+27,16
@@
static struct binding_t *help_lookupFunction (int op, int menu)
/* first look in the generic map for the function */
for (i = 0; OpGeneric[i].name; i++)
if (OpGeneric[i].op == op)
/* 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)
}
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)
;
+ return
NULL
;
}
static int print_macro (FILE * f, int maxwidth, const char **macro)
}
static int print_macro (FILE * f, int maxwidth, const char **macro)
@@
-92,7
+92,7
@@
static int print_macro (FILE * f, int maxwidth, const char **macro)
fprintf (f, "?");
}
}
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)
@@
-102,10
+102,10
@@
static int pad (FILE * f, int col, int i)
if (col < i) {
snprintf (fmt, sizeof (fmt), "%%-%ds", i - col);
fprintf (f, fmt, "");
if (col < i) {
snprintf (fmt, sizeof (fmt), "%%-%ds", i - col);
fprintf (f, fmt, "");
- return
(i)
;
+ return
i
;
}
fputc (' ', f);
}
fputc (' ', f);
- return
(col + 1)
;
+ return
col + 1
;
}
static void help_format_line (FILE * f, int ismacro,
}
static void help_format_line (FILE * f, int ismacro,
@@
-119,14
+119,14
@@
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. */
fputs (t1, f);
/* don't try to press string into one line with less than 40 characters. */
- if ((split =
COLS
< 40)) {
+ if ((split =
getmaxx(main_w)
< 40)) {
col_a = col = 0;
col_b = LONG_STRING;
fputc ('\n', f);
}
else {
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);
}
col = pad (f, m_strlen(t1), col_a);
}
@@
-153,14
+153,14
@@
static void help_format_line (FILE * f, int ismacro,
}
else {
while (*t3) {
}
else {
while (*t3) {
- n =
COLS
- col;
+ n =
getmaxx(main_w)
- col;
if (ismacro >= 0) {
t3 = vskipspaces(t3);
/* FIXME: this is completely wrong */
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;
for (col_a = n; col_a > 0 && t3[col_a] != ' '; col_a--);
if (col_a)
n = col_a;
@@
-170,7
+170,7
@@
static void help_format_line (FILE * f, int ismacro,
print_macro (f, n, &t3);
if (*t3) {
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);
if (option (OPTMARKERS))
++n;
col = pad (f, n, col_b);