"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "doc/wcwidth.patch" between
rxvt-unicode-9.26.tar.bz2 and rxvt-unicode-9.29.tar.bz2

About: rxvt-unicode is a clone of the terminal emulator rxvt.

wcwidth.patch  (rxvt-unicode-9.26.tar.bz2):wcwidth.patch  (rxvt-unicode-9.29.tar.bz2)
diff --git a/src/Makefile.in b/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in
index defe61d..cbbacd1 100644 index d374ae83..08a26e65 100644
--- a/src/Makefile.in --- a/src/Makefile.in
+++ b/src/Makefile.in +++ b/src/Makefile.in
@@ -35,7 +35,7 @@ COMMON = \ @@ -40,7 +40,7 @@ COMMON = \
screen.o scrollbar.o scrollbar-next.o scrollbar-rxvt.o \ screen.o scrollbar.o scrollbar-next.o scrollbar-rxvt.o \
scrollbar-xterm.o scrollbar-plain.o xdefaults.o encoding.o \ scrollbar-xterm.o scrollbar-plain.o xdefaults.o encoding.o \
rxvttoolkit.o rxvtutil.o keyboard.o rxvtimg.o \ rxvttoolkit.o rxvtutil.o keyboard.o rxvtimg.o \
- ev_cpp.o fdpass_wrapper.o ptytty_wrapper.o @PERL_O@ - ev_cpp.o @PERL_O@
+ ev_cpp.o fdpass_wrapper.o ptytty_wrapper.o wcwidth.o @PERL_O@ + ev_cpp.o @PERL_O@ wcwidth.o
ev_cpp.o @PERL_O@ <span class="insert">wcwidth.o</span>
COMMON_DAEMON = rxvtdaemon.o COMMON_DAEMON = rxvtdaemon.o
diff --git a/src/rxvt.h b/src/rxvt.h diff --git a/src/rxvt.h b/src/rxvt.h
index 5be4391..152bf64 100644 index 043b7c18..5bcfdb01 100644
--- a/src/rxvt.h --- a/src/rxvt.h
+++ b/src/rxvt.h +++ b/src/rxvt.h
@@ -706,6 +706,12 @@ typedef struct _mwmhints @@ -652,6 +652,12 @@ typedef struct _mwmhints
// speed hack, copy some member variable into a local variable of the same name // speed hack, copy some member variable into a local variable of the same name
#define dLocal(type,name) type const name = this->name #define dLocal(type,name) type const name = this->name
+int mk_wcwidth(wchar_t c); +int mk_wcwidth(wchar_t c);
+int mk_wcswidth(const wchar_t *s, size_t n); +int mk_wcswidth(const wchar_t *s, size_t n);
+ +
+#define wcwidth mk_wcwidth +#define wcwidth mk_wcwidth
+#define wcswidth mk_wcswidth +#define wcswidth mk_wcswidth
+ +
// for speed reasons, we assume that all codepoints 32 to 126 are // for speed reasons, we assume that all codepoints 32 to 126 are
// single-width. // single-width.
#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) #define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
diff --git a/src/wcwidth.C b/src/wcwidth.C diff --git a/src/wcwidth.C b/src/wcwidth.C
new file mode 100644 new file mode 100644
index 0000000..c3d90a6 index 00000000..c3d90a6a
--- /dev/null --- /dev/null
+++ b/src/wcwidth.C +++ b/src/wcwidth.C
@@ -0,0 +1,218 @@ @@ -0,0 +1,218 @@
+/* +/*
+ * This is an implementation of wcwidth() and wcswidth() (defined in + * This is an implementation of wcwidth() and wcswidth() (defined in
+ * IEEE Std 1002.1-2001) for Unicode. + * IEEE Std 1002.1-2001) for Unicode.
+ * + *
+ * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html + * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html
+ * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html + * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html
+ * + *
 End of changes. 7 change blocks. 
7 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)