projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
useless file.
[apps/madmutt.git]
/
lib-ui
/
curs_lib.c
diff --git
a/lib-ui/curs_lib.c
b/lib-ui/curs_lib.c
index
0bbe168
..
fb65b64
100644
(file)
--- a/
lib-ui/curs_lib.c
+++ b/
lib-ui/curs_lib.c
@@
-11,30
+11,13
@@
* 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 <lib-lib/lib-lib.h>
-#include <wchar.h>
-#include <wctype.h>
#include <termios.h>
#include <termios.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-
#ifdef HAVE_LANGINFO_YESEXPR
#include <langinfo.h>
#endif
#ifdef HAVE_LANGINFO_YESEXPR
#include <langinfo.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-
#include <lib-sys/unix.h>
#include <lib-sys/mutt_signal.h>
#include <lib-sys/unix.h>
#include <lib-sys/mutt_signal.h>
@@
-594,12
+577,12
@@
void mutt_format_string (char *dest, ssize_t destlen,
for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) {
if (k == -1 || k == -2) {
k = (k == -1) ? 1 : n;
for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) {
if (k == -1 || k == -2) {
k = (k == -1) ? 1 : n;
- wc =
replacement_char ()
;
+ wc =
CharsetReplacement
;
}
if (arboreal && wc < M_TREE_MAX)
w = 1; /* hack */
else {
}
if (arboreal && wc < M_TREE_MAX)
w = 1; /* hack */
else {
- if (!
IsWPrint
(wc))
+ if (!
iswprint
(wc))
wc = '?';
w = wcwidth (wc);
}
wc = '?';
w = wcwidth (wc);
}
@@
-689,9
+672,9
@@
void mutt_paddstr (int n, const char *s)
for (; len && (k = mbrtowc (&wc, s, len, &mbstate)); s += k, len -= k) {
if (k == -1 || k == -2) {
k = (k == -1) ? 1 : len;
for (; len && (k = mbrtowc (&wc, s, len, &mbstate)); s += k, len -= k) {
if (k == -1 || k == -2) {
k = (k == -1) ? 1 : len;
- wc =
replacement_char ()
;
+ wc =
CharsetReplacement
;
}
}
- if (!
IsWPrint
(wc))
+ if (!
iswprint
(wc))
wc = '?';
w = wcwidth (wc);
if (w >= 0) {
wc = '?';
w = wcwidth (wc);
if (w >= 0) {
@@
-726,9
+709,9
@@
int mutt_strwidth (const char *s)
for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {
if (k == -1 || k == -2) {
k = (k == -1) ? 1 : n;
for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {
if (k == -1 || k == -2) {
k = (k == -1) ? 1 : n;
- wc =
replacement_char ()
;
+ wc =
CharsetReplacement
;
}
}
- if (!
IsWPrint
(wc))
+ if (!
iswprint
(wc))
wc = '?';
w += wcwidth (wc);
}
wc = '?';
w += wcwidth (wc);
}