projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make rx_t be chaine-able so that we can get rid of list2_t (stage 1).
[apps/madmutt.git]
/
lib-ui
/
enter.c
diff --git
a/lib-ui/enter.c
b/lib-ui/enter.c
index
0d5b12e
..
d42c855
100644
(file)
--- a/
lib-ui/enter.c
+++ b/
lib-ui/enter.c
@@
-8,19
+8,14
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <wctype.h>
-
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
#include "curses.h"
#include "enter.h"
#include "menu.h"
#include "mutt.h"
#include "curses.h"
#include "enter.h"
#include "menu.h"
#include "mutt.h"
+#include "alias.h"
#include "keymap.h"
#include "history.h"
#include "buffy.h"
#include "keymap.h"
#include "history.h"
#include "buffy.h"
@@
-35,7
+30,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;
@@
-45,7
+40,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)
{
@@
-60,7
+55,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);
@@
-120,7
+115,7
@@
static void my_wcstombs (char *dest, ssize_t dlen, const wchar_t * src,
}
}
}
}
-size_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, const char *buf)
+s
tatic s
ize_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, const char *buf)
{
wchar_t wc;
mbstate_t st;
{
wchar_t wc;
mbstate_t st;
@@
-623,7
+618,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;
}
@@
-645,7
+640,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);