projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort out some prototypes, put them where they belong.
[apps/madmutt.git]
/
lib-ui
/
enter.c
diff --git
a/lib-ui/enter.c
b/lib-ui/enter.c
index
d6707a6
..
39e0100
100644
(file)
--- a/
lib-ui/enter.c
+++ b/
lib-ui/enter.c
@@
-15,7
+15,7
@@
#include <wctype.h>
#include <wchar.h>
#include <wctype.h>
#include <wchar.h>
-#include <lib-lib/
mem
.h>
+#include <lib-lib/
lib-lib
.h>
#include "curses.h"
#include "enter.h"
#include "curses.h"
#include "enter.h"
@@
-37,7
+37,7
@@
static int my_wcwidth (wchar_t wc)
{
int n = wcwidth (wc);
{
int n = wcwidth (wc);
- if (
IsWPrint
(wc) && n > 0)
+ if (
iswprint
(wc) && n > 0)
return n;
if (!(wc & ~0x7f))
return 2;
return n;
if (!(wc & ~0x7f))
return 2;
@@
-47,7
+47,7
@@
static int my_wcwidth (wchar_t wc)
}
/* combining mark / non-spacing character */
}
/* combining mark / non-spacing character */
-#define COMB_CHAR(wc) (
IsWPrint (wc) && !wcwidth
(wc))
+#define COMB_CHAR(wc) (
iswprint(wc) && !wcwidth
(wc))
static int my_wcswidth (const wchar_t * s, size_t n)
{
static int my_wcswidth (const wchar_t * s, size_t n)
{
@@
-62,7
+62,7
@@
static int my_addwch (wchar_t wc)
{
int n = wcwidth (wc);
{
int n = wcwidth (wc);
- if (
IsWPrint
(wc) && n > 0)
+ if (
iswprint
(wc) && n > 0)
return mutt_addwch (wc);
if (!(wc & ~0x7f))
return printw ("^%c", ((int) wc + 0x40) & 0x7f);
return mutt_addwch (wc);
if (!(wc & ~0x7f))
return printw ("^%c", ((int) wc + 0x40) & 0x7f);
@@
-625,7
+625,7
@@
int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
if (first && (flags & M_CLEAR)) {
first = 0;
if (first && (flags & M_CLEAR)) {
first = 0;
- if (
IsWPrint
(wc)) /* why? */
+ if (
iswprint
(wc)) /* why? */
state->curpos = state->lastchar = 0;
}
state->curpos = state->lastchar = 0;
}
@@
-647,7
+647,7
@@
int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
rv = 0;
goto bye;
}
rv = 0;
goto bye;
}
- else if (wc && (wc < ' ' ||
IsWPrint
(wc))) { /* why? */
+ else if (wc && (wc < ' ' ||
iswprint
(wc))) { /* why? */
if (state->lastchar >= state->wbuflen) {
state->wbuflen = state->lastchar + 20;
p_realloc(&state->wbuf, state->wbuflen);
if (state->lastchar >= state->wbuflen) {
state->wbuflen = state->lastchar + 20;
p_realloc(&state->wbuf, state->wbuflen);