From: root Date: Sun, 13 Feb 2005 08:56:27 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://git.openbox.org/?p=dana%2Furxvt.git;a=commitdiff_plain;h=e51497ad7f6b37ffe185466b2e9a6480d45b5225 *** empty log message *** --- diff --git a/Changes b/Changes index 4ea1024..c5ff2dd 100644 --- a/Changes +++ b/Changes @@ -2,8 +2,19 @@ Lines marked with "xterm:" indicate either xterm features ported to rxvt or changed rxvt behaviour to make it more compatible to xterm (usually xfree86's xterm). -TODO: VERIFY bugfix for keyboard.C changes. -TODO: maybe just output the error and continue on x errors +TODO: manpage 900mb update +TODO: openbsd +checking for int16_t... ./configure[13497]: test: 2: unexpected operator/operand + short +checking for uint16_t... ./configure[13579]: test: 2: unexpected operator/operand +unsigned short +checking for int32_t... ./configure[13661]: test: 4: unexpected operator/operand + int +checking for uint32_t... ./configure[13743]: test: 4: unexpected operator/operand +unsigned int +checking return type of signal handlers... void +./configure[13848]: break: cannot break +TODO: maybe just output the error and continue on x errors, especially for XIM-management TODO: safer command: keymap processing. TODO: read property sequence is broken with respect to utf-8 etc. WISH: keyboard modification via esc-sequences. diff --git a/autoconf/config.h.in b/autoconf/config.h.in index d4a24ff..bed1190 100644 --- a/autoconf/config.h.in +++ b/autoconf/config.h.in @@ -115,6 +115,12 @@ /* Define if you have the header file. */ #undef HAVE_ASSERT_H +/* Define if you have the header file. */ +#undef HAVE_CLOCALE + +/* Define if you have the header file. */ +#undef HAVE_CWCHAR + /* Define if you have the header file. */ #undef HAVE_DLFCN_H @@ -178,6 +184,9 @@ /* Define if you have the header file. */ #undef HAVE_UTMPX_H +/* Define if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define if you have the Xft library (-lXft). */ #undef HAVE_LIBXFT diff --git a/autoconf/configure.in b/autoconf/configure.in index 4082c74..13dbe56 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -521,6 +521,9 @@ AC_CHECK_HEADERS( \ utmpx.h \ stdint.h \ pty.h \ + wchar.h \ + cwchar \ + clocale \ ) AC_HEADER_TIME @@ -608,19 +611,19 @@ dnl# see usage below AC_DEFUN(RXVT_CHECK_SIZE, [AC_CACHE_CHECK([for $2], $1, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[$2 dummy;]])],[$1=yes],[dnl -if test $ac_cv_sizeof_char -ge $3; then +if test "$ac_cv_sizeof_char" -ge $3; then $1="$4 char" else - if test $ac_cv_sizeof_short -ge $3; then + if test "$ac_cv_sizeof_short" -ge $3; then $1="$4 short" else - if test $ac_cv_sizeof_int -ge $3; then + if test "$ac_cv_sizeof_int" -ge $3; then $1="$4 int" else - if test $ac_cv_sizeof_long -ge $3; then + if test "$ac_cv_sizeof_long" -ge $3; then $1="$4 long" else - if test $ac_cv_sizeof_long_long -ge $3; then + if test "$ac_cv_sizeof_long_long" -ge $3; then $1="$4 long long" else $1="$4 $5" # we _must_ have a (possibly wrong) default @@ -657,15 +660,15 @@ dnl AC_SUBST(rxvt_uint64_typedef) dnl# dnl# Now look for another we use dnl# -if test $ac_cv_sizeof_int_p -eq 8; then +if test "$ac_cv_sizeof_int_p" -eq 8; then rxvt_intp_define="#define intp_t int64_t" rxvt_u_intp_define="#define u_intp_t u_int64_t" else - if test $ac_cv_sizeof_int_p -eq 4; then + if test "$ac_cv_sizeof_int_p" -eq 4; then rxvt_intp_define="#define intp_t int32_t" rxvt_u_intp_define="#define u_intp_t u_int32_t" else - if test $ac_cv_sizeof_int_p -eq 2; then + if test "$ac_cv_sizeof_int_p" -eq 2; then rxvt_intp_define="#define intp_t int16_t" rxvt_u_intp_define="#define u_intp_t u_int16_t" else diff --git a/configure b/configure index b1be943..a485846 100755 --- a/configure +++ b/configure @@ -10984,6 +10984,9 @@ fi + + + for ac_header in \ assert.h \ fcntl.h \ @@ -11006,6 +11009,9 @@ for ac_header in \ utmpx.h \ stdint.h \ pty.h \ + wchar.h \ + cwchar \ + clocale \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -13471,19 +13477,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -if test $ac_cv_sizeof_char -ge 2; then +if test "$ac_cv_sizeof_char" -ge 2; then rxvt_cv_int16_t=" char" else - if test $ac_cv_sizeof_short -ge 2; then + if test "$ac_cv_sizeof_short" -ge 2; then rxvt_cv_int16_t=" short" else - if test $ac_cv_sizeof_int -ge 2; then + if test "$ac_cv_sizeof_int" -ge 2; then rxvt_cv_int16_t=" int" else - if test $ac_cv_sizeof_long -ge 2; then + if test "$ac_cv_sizeof_long" -ge 2; then rxvt_cv_int16_t=" long" else - if test $ac_cv_sizeof_long_long -ge 2; then + if test "$ac_cv_sizeof_long_long" -ge 2; then rxvt_cv_int16_t=" long long" else rxvt_cv_int16_t=" short" # we _must_ have a (possibly wrong) default @@ -13553,19 +13559,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -if test $ac_cv_sizeof_char -ge 2; then +if test "$ac_cv_sizeof_char" -ge 2; then rxvt_cv_uint16_t="unsigned char" else - if test $ac_cv_sizeof_short -ge 2; then + if test "$ac_cv_sizeof_short" -ge 2; then rxvt_cv_uint16_t="unsigned short" else - if test $ac_cv_sizeof_int -ge 2; then + if test "$ac_cv_sizeof_int" -ge 2; then rxvt_cv_uint16_t="unsigned int" else - if test $ac_cv_sizeof_long -ge 2; then + if test "$ac_cv_sizeof_long" -ge 2; then rxvt_cv_uint16_t="unsigned long" else - if test $ac_cv_sizeof_long_long -ge 2; then + if test "$ac_cv_sizeof_long_long" -ge 2; then rxvt_cv_uint16_t="unsigned long long" else rxvt_cv_uint16_t="unsigned short" # we _must_ have a (possibly wrong) default @@ -13635,19 +13641,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -if test $ac_cv_sizeof_char -ge 4; then +if test "$ac_cv_sizeof_char" -ge 4; then rxvt_cv_int32_t=" char" else - if test $ac_cv_sizeof_short -ge 4; then + if test "$ac_cv_sizeof_short" -ge 4; then rxvt_cv_int32_t=" short" else - if test $ac_cv_sizeof_int -ge 4; then + if test "$ac_cv_sizeof_int" -ge 4; then rxvt_cv_int32_t=" int" else - if test $ac_cv_sizeof_long -ge 4; then + if test "$ac_cv_sizeof_long" -ge 4; then rxvt_cv_int32_t=" long" else - if test $ac_cv_sizeof_long_long -ge 4; then + if test "$ac_cv_sizeof_long_long" -ge 4; then rxvt_cv_int32_t=" long long" else rxvt_cv_int32_t=" int" # we _must_ have a (possibly wrong) default @@ -13717,19 +13723,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -if test $ac_cv_sizeof_char -ge 4; then +if test "$ac_cv_sizeof_char" -ge 4; then rxvt_cv_uint32_t="unsigned char" else - if test $ac_cv_sizeof_short -ge 4; then + if test "$ac_cv_sizeof_short" -ge 4; then rxvt_cv_uint32_t="unsigned short" else - if test $ac_cv_sizeof_int -ge 4; then + if test "$ac_cv_sizeof_int" -ge 4; then rxvt_cv_uint32_t="unsigned int" else - if test $ac_cv_sizeof_long -ge 4; then + if test "$ac_cv_sizeof_long" -ge 4; then rxvt_cv_uint32_t="unsigned long" else - if test $ac_cv_sizeof_long_long -ge 4; then + if test "$ac_cv_sizeof_long_long" -ge 4; then rxvt_cv_uint32_t="unsigned long long" else rxvt_cv_uint32_t="unsigned int" # we _must_ have a (possibly wrong) default @@ -13753,15 +13759,15 @@ else fi fi -if test $ac_cv_sizeof_int_p -eq 8; then +if test "$ac_cv_sizeof_int_p" -eq 8; then rxvt_intp_define="#define intp_t int64_t" rxvt_u_intp_define="#define u_intp_t u_int64_t" else - if test $ac_cv_sizeof_int_p -eq 4; then + if test "$ac_cv_sizeof_int_p" -eq 4; then rxvt_intp_define="#define intp_t int32_t" rxvt_u_intp_define="#define u_intp_t u_int32_t" else - if test $ac_cv_sizeof_int_p -eq 2; then + if test "$ac_cv_sizeof_int_p" -eq 2; then rxvt_intp_define="#define intp_t int16_t" rxvt_u_intp_define="#define u_intp_t u_int16_t" else diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html index 099d189..7b1e68c 100644 --- a/doc/rxvt.1.html +++ b/doc/rxvt.1.html @@ -1443,8 +1443,8 @@ the colour code used as default foreground/text colour (or the string default to indicate that the default-colour escape sequence is to be used), bg is the colour code used as default background colour (or the string default), and xpm is the string default if rxvt -was compiled with XPM support. Libraries like slang can (and do) use -this information to optimize screen output. +was compiled with XPM support. Libraries like ncurses and slang can +(and do) use this information to optimize screen output.

WINDOWID
diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in index 02d7394..238bbe0 100644 --- a/doc/rxvt.1.man.in +++ b/doc/rxvt.1.man.in @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "rxvt 1" -.TH rxvt 1 "2005-02-11" "5.0" "RXVT-UNICODE" +.TH rxvt 1 "2005-02-12" "5.0" "RXVT-UNICODE" .SH "NAME" rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system) .SH "SYNOPSIS" @@ -1120,8 +1120,8 @@ the colour code used as default foreground/text colour (or the string \&\f(CW\*(C`default\*(C'\fR to indicate that the default-colour escape sequence is to be used), \f(CW\*(C`bg\*(C'\fR is the colour code used as default background colour (or the string \f(CW\*(C`default\*(C'\fR), and \f(CW\*(C`xpm\*(C'\fR is the string \f(CW\*(C`default\*(C'\fR if @@RXVT_NAME@@ -was compiled with \s-1XPM\s0 support. Libraries like \f(CW\*(C`slang\*(C'\fR can (and do) use -this information to optimize screen output. +was compiled with \s-1XPM\s0 support. Libraries like \f(CW\*(C`ncurses\*(C'\fR and \f(CW\*(C`slang\*(C'\fR can +(and do) use this information to optimize screen output. .IP "\fB\s-1WINDOWID\s0\fR" 4 .IX Item "WINDOWID" Set to the (decimal) X Window \s-1ID\s0 of the @@RXVT_NAME@@ window (the toplevel diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt index dcbdb9c..f2bcbc9 100644 --- a/doc/rxvt.1.txt +++ b/doc/rxvt.1.txt @@ -968,8 +968,8 @@ ENVIRONMENT string "default" to indicate that the default-colour escape sequence is to be used), "bg" is the colour code used as default background colour (or the string "default"), and "xpm" is the string "default" - if rxvt was compiled with XPM support. Libraries like "slang" can - (and do) use this information to optimize screen output. + if rxvt was compiled with XPM support. Libraries like "ncurses" and + "slang" can (and do) use this information to optimize screen output. WINDOWID Set to the (decimal) X Window ID of the rxvt window (the toplevel diff --git a/src/command.C b/src/command.C index 4c5d324..5827e42 100644 --- a/src/command.C +++ b/src/command.C @@ -54,7 +54,6 @@ # include "keyboard.h" #endif -#include #include /*----------------------------------------------------------------------*/ diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in index f288b56..e981cfe 100644 --- a/src/rxvtlib.h.in +++ b/src/rxvtlib.h.in @@ -22,7 +22,13 @@ #include #include -#include +#if HAVE_CWCHAR +# include +#elsif HAVE_WCHAR_H +# include +#else +// stdlib.h might provide it +#endif #include "ptytty.h" diff --git a/src/screen.C b/src/screen.C index 418603c..13fc691 100644 --- a/src/screen.C +++ b/src/screen.C @@ -30,7 +30,6 @@ #include /* get the typedef for CARD32 */ #include -#include #include "salloc.C" // HACK, should be a seperate compile!