[Pkg-urxvt-maintainers] [SCM] Git repository for pkg-urxvt branch, master, updated. debian/9.10-2-18-gaa2de7a
Ryan Kavanagh
ryanakca-guest at alioth.debian.org
Tue Jul 19 20:41:29 UTC 2011
The following commit has been merged in the master branch:
commit 7534258c9937894da70fb31f22b4a3126ec93b76
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date: Tue Jul 19 14:37:55 2011 -0400
Imported Upstream version 9.12
---
Changes | 15 ++
MANIFEST | 21 +-
aclocal.m4 | 2 +-
config.guess | 12 +-
config.h.in | 8 +-
config.sub | 9 +-
configure | 441 ++++++++++++++---------------------
doc/rxvt.1.man.in | 27 ++-
doc/rxvt.1.pod | 21 ++-
doc/rxvt.7.man.in | 2 +-
doc/rxvtc.1.man.in | 2 +-
doc/rxvtd.1.man.in | 2 +-
doc/rxvtperl.3.man.in | 2 +-
doc/wcwidth.patch | 12 +-
libecb/ecb.h | 318 +++++++++++++++++++++++++
libev/ev.c | 284 +++++++++++++++--------
libev/ev_epoll.c | 31 ++-
libev/ev_kqueue.c | 8 +-
libev/ev_poll.c | 8 +-
libev/ev_port.c | 12 +-
libev/ev_select.c | 16 +-
libev/ev_vars.h | 4 +-
libev/ev_wrap.h | 8 +-
libptytty/ptytty.m4 | 330 ++++++++++++++++++++++++++
{src => libptytty/src}/fdpass.C | 0
{src => libptytty/src}/libptytty.h | 0
{src => libptytty/src}/logging.C | 204 ++++++++---------
{src => libptytty/src}/proxy.C | 24 +-
{src => libptytty/src}/ptytty.C | 55 +++---
{src => libptytty/src}/ptytty.h | 11 -
libptytty/src/ptytty_conf.h | 56 +++++
ptytty.m4 | 450 ------------------------------------
src/Makefile.in | 110 +++++-----
src/background.C | 176 +++++++--------
src/command.C | 22 +-
src/command.h | 2 +-
src/encoding.C | 2 +-
src/fdpass_wrapper.C | 1 +
src/feature.h | 15 --
src/init.C | 2 +-
src/keyboard.C | 49 ++++-
src/keyboard.h | 2 +-
src/ptytty_conf.h | 9 -
src/ptytty_wrapper.C | 13 +
src/rxvt.h | 6 +-
src/rxvtfont.C | 17 +-
src/rxvtfont.h | 1 -
src/rxvtperl.xs | 6 +-
src/rxvttoolkit.C | 23 +-
src/rxvtutil.C | 27 ---
src/rxvtutil.h | 53 +----
src/screen.C | 32 ++--
src/version.h | 4 +-
src/xdefaults.C | 24 +-
update_ptytty | 8 -
55 files changed, 1615 insertions(+), 1384 deletions(-)
diff --git a/Changes b/Changes
index 72b2da3..b562cb0 100644
--- a/Changes
+++ b/Changes
@@ -20,6 +20,21 @@ TODO: decrqm http://ue.tst.eu/71d7dbd1fcfeaa7d2a4b96eb957d570c.txt
TODO: perl-shell-window? perl-unix-socket?
TODO: command line editing when icanon?
+9.12 Wed Jun 29 14:34:28 CEST 2011
+ - fix regression in processing of SelectionNotify events.
+ urxvt would fail to request a selection if the owner did not
+ support the UTF8_STRING target.
+ - fix rendering of double width chars in certain circumstances, more
+ likely to happen if urxvt is compiled with 256 colors support as
+ urxvt runs out of fonts much earlier then. Fixes gentoo bug #358151
+ (Emanuele Giaquinta).
+ - restore support for 'list' syntax in keysym resources (requested by Sung Pae).
+ - always premultiply colour values - while this increases differences between
+ core fonts and xft, it is "more correct" in practical situations.
+ - disable PTYTTY_REENTRANT option - not needed for urxvt and saves a bit of code.
+ - remove lucidatypewriter from the list of fallback fonts, it was the only
+ non-xft non-cellfont in the list anyway.
+
9.11 Mon May 2 10:34:46 CEST 2011
- fix compilation on GNU/Hurd, debian bug #624736.
- remove 'list' syntax for keysym resources, as it serves no useful purpose.
diff --git a/MANIFEST b/MANIFEST
index c992a4e..f980e5e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -5,13 +5,11 @@ INSTALL
MANIFEST
README.configure
README.FAQ
-update_ptytty
configure
configure.ac
config.sub
config.guess
aclocal.m4
-ptytty.m4
autogen.sh
config.h.in
Makefile.in
@@ -49,6 +47,7 @@ src/command.C
src/command.h
src/encoding.C
src/encoding.h
+src/fdpass_wrapper.C
src/feature.h
src/hookinc.h
src/init.C
@@ -60,6 +59,7 @@ src/keyboard.h
src/main.C
src/misc.C
src/optinc.h
+src/ptytty_wrapper.C
src/rxvtutil.C
src/rxvtutil.h
src/rxvttoolkit.C
@@ -85,13 +85,14 @@ src/scrollbar.h
src/version.h
src/xdefaults.C
-src/libptytty.h
-src/ptytty_conf.h
-src/ptytty.h
-src/ptytty.C
-src/proxy.C
-src/logging.C
-src/fdpass.C
+libptytty/ptytty.m4
+libptytty/src/libptytty.h
+libptytty/src/ptytty_conf.h
+libptytty/src/ptytty.h
+libptytty/src/ptytty.C
+libptytty/src/proxy.C
+libptytty/src/logging.C
+libptytty/src/fdpass.C
src/gentables
src/gencompose
@@ -180,3 +181,5 @@ libev/ev_kqueue.c
libev/ev_port.c
libev/libev.m4
+libecb/ecb.h
+
diff --git a/aclocal.m4 b/aclocal.m4
index 205e7cd..106fac6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,2 +1,2 @@
-m4_include([ptytty.m4])
+m4_include([libptytty/ptytty.m4])
diff --git a/config.guess b/config.guess
index 187cd54..ea5f06f 100644
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.
-timestamp='2011-02-02'
+timestamp='2011-05-11'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -882,7 +882,13 @@ EOF
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ fi
fi
exit ;;
avr32*:Linux:*:*)
@@ -972,7 +978,7 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-tilera-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
diff --git a/config.h.in b/config.h.in
index b31bd3b..9690bfe 100644
--- a/config.h.in
+++ b/config.h.in
@@ -168,16 +168,16 @@
/* Define to 1 if you have the <stropts.h> header file. */
#undef HAVE_STROPTS_H
-/* Define if utmp.h or lastlog.h has struct lastlog */
+/* Define to 1 if the system has the type `struct lastlog'. */
#undef HAVE_STRUCT_LASTLOG
-/* Define if utmpx.h or lastlog.h has struct lastlogx */
+/* Define to 1 if the system has the type `struct lastlogx'. */
#undef HAVE_STRUCT_LASTLOGX
-/* Define if utmp.h has struct utmp */
+/* Define to 1 if the system has the type `struct utmp'. */
#undef HAVE_STRUCT_UTMP
-/* Define if utmpx.h has struct utmpx */
+/* Define to 1 if the system has the type `struct utmpx'. */
#undef HAVE_STRUCT_UTMPX
/* Define to 1 if you have the <sys/byteorder.h> header file. */
diff --git a/config.sub b/config.sub
index 30fdca8..fd99c46 100755
--- a/config.sub
+++ b/config.sub
@@ -408,7 +408,7 @@ case $basic_machine in
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tile*-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
@@ -1120,13 +1120,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
diff --git a/configure b/configure
index 645d247..b4f6516 100755
--- a/configure
+++ b/configure
@@ -6684,103 +6684,102 @@ if test "x$ac_cv_header_utmp_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_UTMP_H 1
_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utmp" >&5
-$as_echo_n "checking for struct utmp... " >&6; }
-if test "${pt_cv_struct_utmp+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ ac_fn_cxx_check_type "$LINENO" "struct utmp" "ac_cv_type_struct_utmp" "
#include <sys/types.h>
#include <utmp.h>
-int
-main ()
-{
-struct utmp ut;
- ;
- return 0;
-}
+
+"
+if test "x$ac_cv_type_struct_utmp" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UTMP 1
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- pt_cv_struct_utmp=yes
-else
- pt_cv_struct_utmp=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmp" >&5
-$as_echo "$pt_cv_struct_utmp" >&6; }
-if test x$pt_cv_struct_utmp = xyes; then
-$as_echo "#define HAVE_STRUCT_UTMP 1" >>confdefs.h
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_host in utmp struct" >&5
-$as_echo_n "checking for ut_host in utmp struct... " >&6; }
-if test "${pt_cv_struct_utmp_host+set}" = set; then :
+
+# ac_fn_cxx_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ------------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_cxx_check_member ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval "test \"\${$4+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <sys/types.h>
-#include <utmp.h>
+$5
int
main ()
{
-struct utmp ut; ut.ut_host;
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
- pt_cv_struct_utmp_host=yes
-else
- pt_cv_struct_utmp_host=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmp_host" >&5
-$as_echo "$pt_cv_struct_utmp_host" >&6; }
-if test x$pt_cv_struct_utmp_host = xyes; then
-
-$as_echo "#define HAVE_UTMP_HOST 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_pid in utmp struct" >&5
-$as_echo_n "checking for ut_pid in utmp struct... " >&6; }
-if test "${pt_cv_struct_utmp_pid+set}" = set; then :
- $as_echo_n "(cached) " >&6
+ eval "$4=yes"
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <sys/types.h>
-#include <utmp.h>
+$5
int
main ()
{
-struct utmp ut; ut.ut_pid;
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
- pt_cv_struct_utmp_pid=yes
+ eval "$4=yes"
else
- pt_cv_struct_utmp_pid=no
+ eval "$4=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmp_pid" >&5
-$as_echo "$pt_cv_struct_utmp_pid" >&6; }
-if test x$pt_cv_struct_utmp_pid = xyes; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_cxx_check_member
+ac_fn_cxx_check_member "$LINENO" "struct utmp" "ut_host" "ac_cv_member_struct_utmp_ut_host" "
+#include <sys/types.h>
+#include <utmp.h>
+
+"
+if test "x$ac_cv_member_struct_utmp_ut_host" = x""yes; then :
+
+$as_echo "#define HAVE_UTMP_HOST 1" >>confdefs.h
+
+fi
+
+
+ac_fn_cxx_check_member "$LINENO" "struct utmp" "ut_pid" "ac_cv_member_struct_utmp_ut_pid" "
+#include <sys/types.h>
+#include <utmp.h>
+
+"
+if test "x$ac_cv_member_struct_utmp_ut_pid" = x""yes; then :
$as_echo "#define HAVE_UTMP_PID 1" >>confdefs.h
fi
+
fi
done
@@ -6793,217 +6792,123 @@ if test "x$ac_cv_header_utmpx_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_UTMPX_H 1
_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utmpx" >&5
-$as_echo_n "checking for struct utmpx... " >&6; }
-if test "${pt_cv_struct_utmpx+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ ac_fn_cxx_check_type "$LINENO" "struct utmpx" "ac_cv_type_struct_utmpx" "
#include <sys/types.h>
#include <utmpx.h>
-int
-main ()
-{
-struct utmpx ut;
- ;
- return 0;
-}
+
+"
+if test "x$ac_cv_type_struct_utmpx" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UTMPX 1
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- pt_cv_struct_utmpx=yes
-else
- pt_cv_struct_utmpx=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmpx" >&5
-$as_echo "$pt_cv_struct_utmpx" >&6; }
-if test x$pt_cv_struct_utmpx = xyes; then
-$as_echo "#define HAVE_STRUCT_UTMPX 1" >>confdefs.h
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for host in utmpx struct" >&5
-$as_echo_n "checking for host in utmpx struct... " >&6; }
-if test "${pt_cv_struct_utmpx_host+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ac_fn_cxx_check_member "$LINENO" "struct utmpx" "ut_host" "ac_cv_member_struct_utmpx_ut_host" "
#include <sys/types.h>
#include <utmpx.h>
-int
-main ()
-{
-struct utmpx utx; utx.ut_host;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- pt_cv_struct_utmpx_host=yes
-else
- pt_cv_struct_utmpx_host=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmpx_host" >&5
-$as_echo "$pt_cv_struct_utmpx_host" >&6; }
-if test x$pt_cv_struct_utmpx_host = xyes; then
+
+"
+if test "x$ac_cv_member_struct_utmpx_ut_host" = x""yes; then :
$as_echo "#define HAVE_UTMPX_HOST 1" >>confdefs.h
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for session in utmpx struct" >&5
-$as_echo_n "checking for session in utmpx struct... " >&6; }
-if test "${pt_cv_struct_utmpx_session+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+
+ac_fn_cxx_check_member "$LINENO" "struct utmpx" "ut_session" "ac_cv_member_struct_utmpx_ut_session" "
#include <sys/types.h>
#include <utmpx.h>
-int
-main ()
-{
-struct utmpx utx; utx.ut_session;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- pt_cv_struct_utmpx_session=yes
-else
- pt_cv_struct_utmpx_session=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmpx_session" >&5
-$as_echo "$pt_cv_struct_utmpx_session" >&6; }
-if test x$pt_cv_struct_utmpx_session = xyes; then
+
+"
+if test "x$ac_cv_member_struct_utmpx_ut_session" = x""yes; then :
$as_echo "#define HAVE_UTMPX_SESSION 1" >>confdefs.h
fi
+
fi
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct lastlog" >&5
-$as_echo_n "checking for struct lastlog... " >&6; }
-if test "${pt_cv_struct_lastlog+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ac_fn_cxx_check_type "$LINENO" "struct lastlog" "ac_cv_type_struct_lastlog" "
#include <sys/types.h>
#include <utmp.h>
#ifdef HAVE_LASTLOG_H
#include <lastlog.h>
#endif
-int
-main ()
-{
-struct lastlog ll;
- ;
- return 0;
-}
+"
+if test "x$ac_cv_type_struct_lastlog" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_LASTLOG 1
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- pt_cv_struct_lastlog=yes
-else
- pt_cv_struct_lastlog=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_lastlog" >&5
-$as_echo "$pt_cv_struct_lastlog" >&6; }
-if test x$pt_cv_struct_lastlog = xyes; then
-$as_echo "#define HAVE_STRUCT_LASTLOG 1" >>confdefs.h
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct lastlogx" >&5
-$as_echo_n "checking for struct lastlogx... " >&6; }
-if test "${pt_cv_struct_lastlogx+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+
+ac_fn_cxx_check_type "$LINENO" "struct lastlogx" "ac_cv_type_struct_lastlogx" "
#include <sys/types.h>
#include <utmpx.h>
#ifdef HAVE_LASTLOG_H
#include <lastlog.h>
#endif
-int
-main ()
-{
-struct lastlogx ll;
- ;
- return 0;
-}
+"
+if test "x$ac_cv_type_struct_lastlogx" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_LASTLOGX 1
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- pt_cv_struct_lastlogx=yes
-else
- pt_cv_struct_lastlogx=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_lastlogx" >&5
-$as_echo "$pt_cv_struct_lastlogx" >&6; }
-if test x$pt_cv_struct_lastlogx = xyes; then
-$as_echo "#define HAVE_STRUCT_LASTLOGX 1" >>confdefs.h
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where utmp is located" >&5
$as_echo_n "checking where utmp is located... " >&6; }
if test "${pt_cv_path_utmp+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define UTMP_FILE in config.h manually" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define UTMP_FILE in config.h manually" >&5
$as_echo "$as_me: WARNING: Define UTMP_FILE in config.h manually" >&2;}
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <stdlib.h>
+#include <sys/stat.h>
+
#include <sys/types.h>
#include <utmp.h>
-#include <errno.h>
+
int main()
{
- char **u, *utmplist[] = {
- "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL };
- FILE *a, *f=fopen("conftestval", "w");
- if (!f) exit(1);
+ char **path, *list[] = { "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL };
+ FILE *f = fopen("conftestval", "w");
+ if (!f) return 1;
#ifdef UTMP_FILE
fprintf(f, "%s
", UTMP_FILE);
- exit(0);
-#endif
-#ifdef _PATH_UTMP
+#elif defined(_PATH_UTMP)
fprintf(f, "%s
", _PATH_UTMP);
- exit(0);
-#endif
- for (u = utmplist; *u; u++) {
- if ((a = fopen(*u, "r")) != NULL || errno == EACCES) {
- fprintf(f, "%s
", *u);
- exit(0);
- }
+#else
+ for (path = list; *path; path++) {
+ struct stat st;
+ if (stat(*path, &st) == 0) {
+ fprintf(f, "%s
", *path);
+ break;
+ }
}
- exit(0);
+#endif
+ return fclose(f) != 0;
}
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
@@ -7033,39 +6938,39 @@ if test "${pt_cv_path_wtmp+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define WTMP_FILE in config.h manually" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define WTMP_FILE in config.h manually" >&5
$as_echo "$as_me: WARNING: Define WTMP_FILE in config.h manually" >&2;}
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <stdlib.h>
+#include <sys/stat.h>
+
#include <sys/types.h>
#ifdef HAVE_UTMP_H
#include <utmp.h>
#endif
-#include <errno.h>
+
int main()
{
- char **w, *wtmplist[] = {
- "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL };
- FILE *a, *f=fopen("conftestval", "w");
- if (!f) exit(1);
+ char **path, *list[] = { "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL };
+ FILE *f = fopen("conftestval", "w");
+ if (!f) return 1;
#ifdef WTMP_FILE
fprintf(f, "%s
", WTMP_FILE);
- exit(0);
-#endif
-#ifdef _PATH_WTMP
+#elif defined(_PATH_WTMP)
fprintf(f, "%s
", _PATH_WTMP);
- exit(0);
-#endif
- for (w = wtmplist; *w; w++) {
- if ((a = fopen(*w, "r")) != NULL || errno == EACCES) {
- fprintf(f, "%s
", *w);
- exit(0);
- }
+#else
+ for (path = list; *path; path++) {
+ struct stat st;
+ if (stat(*path, &st) == 0) {
+ fprintf(f, "%s
", *path);
+ break;
+ }
}
- exit(0);
+#endif
+ return fclose(f) != 0;
}
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
@@ -7094,38 +6999,38 @@ if test "${pt_cv_path_wtmpx+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define WTMPX_FILE in config.h manually" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define WTMPX_FILE in config.h manually" >&5
$as_echo "$as_me: WARNING: Define WTMPX_FILE in config.h manually" >&2;}
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <stdlib.h>
+#include <sys/stat.h>
+
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#endif
-#include <errno.h>
+
int main()
{
- char **w, *wtmplist[] = {
- "/var/log/wtmpx", "/var/adm/wtmpx", NULL };
- FILE *a, *f=fopen("conftestval", "w");
- if (!f) exit(1);
+ char **path, *list[] = { "/var/log/wtmpx", "/var/adm/wtmpx", NULL };
+ FILE *f = fopen("conftestval", "w");
+ if (!f) return 1;
#ifdef WTMPX_FILE
fprintf(f, "%s
", WTMPX_FILE);
- exit(0);
-#endif
-#ifdef _PATH_WTMPX
+#elif defined(_PATH_WTMPX)
fprintf(f, "%s
", _PATH_WTMPX);
- exit(0);
-#endif
- for (w = wtmplist; *w; w++) {
- if ((a = fopen(*w, "r")) != NULL || errno == EACCES) {
- fprintf(f, "%s
", *w);
- exit(0);
- }
+#else
+ for (path = list; *path; path++) {
+ struct stat st;
+ if (stat(*path, &st) == 0) {
+ fprintf(f, "%s
", *path);
+ break;
+ }
}
- exit(0);
+#endif
+ return fclose(f) != 0;
}
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
@@ -7154,43 +7059,42 @@ if test "${pt_cv_path_lastlog+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define LASTLOG_FILE in config.h manually" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define LASTLOG_FILE in config.h manually" >&5
$as_echo "$as_me: WARNING: Define LASTLOG_FILE in config.h manually" >&2;}
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <stdlib.h>
+#include <sys/stat.h>
+
#include <sys/types.h>
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#elif defined(HAVE_UTMP_H)
+#ifdef HAVE_UTMP_H
#include <utmp.h>
#endif
#ifdef HAVE_LASTLOG_H
#include <lastlog.h>
#endif
-#include <errno.h>
+
int main()
{
- char **w, *lastloglist[] = { "/var/log/lastlog", NULL };
- FILE *a, *f=fopen("conftestval", "w");
- if (!f) exit(1);
+ char **path, *list[] = { "/var/log/lastlog", NULL };
+ FILE *f = fopen("conftestval", "w");
+ if (!f) return 1;
#ifdef LASTLOG_FILE
fprintf(f, "%s
", LASTLOG_FILE);
- exit(0);
-#endif
-#ifdef _PATH_LASTLOG
+#elif defined(_PATH_LASTLOG)
fprintf(f, "%s
", _PATH_LASTLOG);
- exit(0);
-#endif
- for (w = lastloglist; *w; w++) {
- if ((a = fopen(*w, "r")) != NULL || errno == EACCES) {
- fprintf(f, "%s
", *w);
- exit(0);
- }
+#else
+ for (path = list; *path; path++) {
+ struct stat st;
+ if (stat(*path, &st) == 0) {
+ fprintf(f, "%s
", *path);
+ break;
+ }
}
- exit(0);
+#endif
+ return fclose(f) != 0;
}
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
@@ -7219,37 +7123,38 @@ if test "${pt_cv_path_lastlogx+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define LASTLOGX_FILE in config.h manually" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define LASTLOGX_FILE in config.h manually" >&5
$as_echo "$as_me: WARNING: Define LASTLOGX_FILE in config.h manually" >&2;}
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <stdlib.h>
+#include <sys/stat.h>
+
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#endif
-#include <errno.h>
+
int main()
{
- char **w, *wtmplist[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL };
- FILE *a, *f=fopen("conftestval", "w");
- if (!f) exit(1);
+ char **path, *list[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL };
+ FILE *f = fopen("conftestval", "w");
+ if (!f) return 1;
#ifdef LASTLOGX_FILE
fprintf(f, "%s
", LASTLOGX_FILE);
- exit(0);
-#endif
-#ifdef _PATH_LASTLOGX
+#elif defined(_PATH_LASTLOGX)
fprintf(f, "%s
", _PATH_LASTLOGX);
- exit(0);
-#endif
- for (w = wtmplist; *w; w++) {
- if ((a = fopen(*w, "r")) != NULL || errno == EACCES) {
- fprintf(f, "%s
", *w);
- exit(0);
- }
+#else
+ for (path = list; *path; path++) {
+ struct stat st;
+ if (stat(*path, &st) == 0) {
+ fprintf(f, "%s
", *path);
+ break;
+ }
}
- exit(0);
+#endif
+ return fclose(f) != 0;
}
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in
index 3c59eb7..a9d8bc6 100644
--- a/doc/rxvt.1.man.in
+++ b/doc/rxvt.1.man.in
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "@@RXVT_NAME@@ 1"
-.TH @@RXVT_NAME@@ 1 "2011-05-02" "@@RXVT_VERSION@@" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 1 "2011-06-29" "@@RXVT_VERSION@@" "RXVT-UNICODE"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -957,9 +957,10 @@ thumb with the pointer on middle button press/drag.
\& B+si R.
.IP " BscrollWithBuffer: R Iboolean R" 4
.IX Item "scrollWithBuffer: boolean"
-\& BTrue R: scroll with scrollback buffer when tty receives new lines (and
-\& BscrollTtyOutput R is False); option B\-sw R. BFalse R: do not scroll
-with scrollback buffer when tty receives new lines; option B+sw R.
+\& BTrue R: scroll with scrollback buffer when tty receives new lines (i.e.
+try to show the same lines) and BscrollTtyOutput R is False; option
+\& B\-sw R. BFalse R: do not scroll with scrollback buffer when tty receives
+new lines; option B+sw R.
.IP " BscrollTtyKeypress: R Iboolean R" 4
.IX Item "scrollTtyKeypress: boolean"
\& BTrue R: scroll to bottom when a non-special key is pressed. Special keys
@@ -1150,6 +1151,24 @@ performed in an exact manner; however, the closest match is assured.
\& Istring R may contain escape values ( (CW\*(C`\en\*(C' R: newline, (CW\*(C`\e000\*(C' R: octal
number), see \s-1RESOURCES\s0 in (CW\*(C`man 7 X\*(C' R for further details.
.Sp
+You can define a range of keysyms in one shot by providing a Istring R
+with pattern Blist/PREFIX/MIDDLE/SUFFIX R, where the delimiter `/'
+should be a character not used by the strings.
+.Sp
+Its usage can be demonstrated by an example:
+.Sp
+.Vb 1
+\& URxvt.keysym.M\-C\-0x61: list|\e033<|abc|>
+.Ve
+.Sp
+The above line is equivalent to the following three lines:
+.Sp
+.Vb 3
+\& URxvt.keysym.Meta\-Control\-0x61: \e033<a>
+\& URxvt.keysym.Meta\-Control\-0x62: \e033<b>
+\& URxvt.keysym.Meta\-Control\-0x63: \e033<c>
+.Ve
+.Sp
If Istring R takes the form of (CW\*(C`command:STRING\*(C' R, the specified B\s-1STRING\s0 R
is interpreted and executed as @@RXVT_NAME@@'s control sequence. For
example the following means "change the current locale to (CW\*(C`zh_CN.GBK\*(C' R
diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
index 50b3533..36bb2bd 100644
--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -937,9 +937,10 @@ B<+si>.
=item B<scrollWithBuffer:> I<boolean>
-B<True>: scroll with scrollback buffer when tty receives new lines (and
-B<scrollTtyOutput> is False); option B<-sw>. B<False>: do not scroll
-with scrollback buffer when tty receives new lines; option B<+sw>.
+B<True>: scroll with scrollback buffer when tty receives new lines (i.e.
+try to show the same lines) and B<scrollTtyOutput> is False; option
+B<-sw>. B<False>: do not scroll with scrollback buffer when tty receives
+new lines; option B<+sw>.
=item B<scrollTtyKeypress:> I<boolean>
@@ -1163,6 +1164,20 @@ performed in an exact manner; however, the closest match is assured.
I<string> may contain escape values (C<
>: newline, C<
--
Git repository for pkg-urxvt
More information about the Pkg-urxvt-maintainers
mailing list