1 | Index: src/Makefile.in |
1 | diff --git a/src/Makefile.in b/src/Makefile.in |
2 | =================================================================== |
2 | index 2136e69..3d7ddea 100644 |
3 | RCS file: /schmorpforge/rxvt-unicode/src/Makefile.in,v |
3 | --- a/src/Makefile.in |
4 | retrieving revision 1.100 |
4 | +++ b/src/Makefile.in |
5 | diff -u -r1.100 Makefile.in |
|
|
6 | --- src/Makefile.in 26 Jun 2007 21:59:13 -0000 1.100 |
|
|
7 | +++ src/Makefile.in 27 Jun 2007 11:08:25 -0000 |
|
|
8 | @@ -36,7 +36,7 @@ |
5 | @@ -36,7 +36,7 @@ COMMON = \ |
9 | command.o rxvtfont.o init.o logging.o main.o misc.o netdisp.o \ |
6 | background.o command.o rxvtfont.o init.o logging.o main.o misc.o \ |
10 | ptytty.o proxy.o screen.o scrollbar.o scrollbar-next.o scrollbar-rxvt.o \ |
7 | ptytty.o proxy.o screen.o scrollbar.o scrollbar-next.o scrollbar-rxvt.o \ |
11 | scrollbar-xterm.o scrollbar-plain.o xdefaults.o xpm.o encoding.o \ |
8 | scrollbar-xterm.o scrollbar-plain.o xdefaults.o encoding.o \ |
12 | - rxvttoolkit.o rxvtutil.o iom.o keyboard.o fdpass.o @PERL_O@ |
9 | - rxvttoolkit.o rxvtutil.o iom.o keyboard.o fdpass.o @PERL_O@ |
13 | + rxvttoolkit.o rxvtutil.o iom.o keyboard.o fdpass.o @PERL_O@ wcwidth.o |
10 | + rxvttoolkit.o rxvtutil.o iom.o keyboard.o fdpass.o @PERL_O@ wcwidth.o |
14 | |
11 | |
15 | COMMON_DAEMON = rxvtdaemon.o |
12 | COMMON_DAEMON = rxvtdaemon.o |
16 | |
13 | |
17 | Index: src/rxvt.h |
14 | diff --git a/src/rxvt.h b/src/rxvt.h |
18 | =================================================================== |
15 | index 64b7fc0..1897040 100644 |
19 | RCS file: /schmorpforge/rxvt-unicode/src/rxvt.h,v |
16 | --- a/src/rxvt.h |
20 | retrieving revision 1.275 |
17 | +++ b/src/rxvt.h |
21 | diff -u -r1.275 rxvt.h |
18 | @@ -649,6 +649,12 @@ enum { |
22 | --- src/rxvt.h 26 Jun 2007 00:40:19 -0000 1.275 |
|
|
23 | +++ src/rxvt.h 27 Jun 2007 11:08:26 -0000 |
|
|
24 | @@ -680,6 +680,12 @@ |
|
|
25 | */ |
19 | */ |
26 | #define dLocal(type,name) type const name = this->name |
20 | #define dLocal(type,name) type const name = this->name |
27 | |
21 | |
28 | +int mk_wcwidth(wchar_t c); |
22 | +int mk_wcwidth(wchar_t c); |
29 | +int mk_wcswidth(const wchar_t *s, size_t n); |
23 | +int mk_wcswidth(const wchar_t *s, size_t n); |
… | |
… | |
32 | +#define wcswidth mk_wcswidth |
26 | +#define wcswidth mk_wcswidth |
33 | + |
27 | + |
34 | // for speed reasons, we assume that all codepoints 32 to 126 are |
28 | // for speed reasons, we assume that all codepoints 32 to 126 are |
35 | // single-width. |
29 | // single-width. |
36 | #define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) |
30 | #define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) |
37 | --- src/wcwidth.C 1970-01-01 01:00:00.000000000 +0100 |
31 | diff --git a/src/wcwidth.C b/src/wcwidth.C |
38 | +++ src/wcwidth.C 2007-06-14 13:11:38.000000000 +0200 |
32 | new file mode 100644 |
|
|
33 | index 0000000..c3d90a6 |
|
|
34 | --- /dev/null |
|
|
35 | +++ b/src/wcwidth.C |
39 | @@ -0,0 +1,218 @@ |
36 | @@ -0,0 +1,218 @@ |
40 | +/* |
37 | +/* |
41 | + * This is an implementation of wcwidth() and wcswidth() (defined in |
38 | + * This is an implementation of wcwidth() and wcswidth() (defined in |
42 | + * IEEE Std 1002.1-2001) for Unicode. |
39 | + * IEEE Std 1002.1-2001) for Unicode. |
43 | + * |
40 | + * |