From 0386edf48983af4f7ed0a4257b2852b58424473d Mon Sep 17 00:00:00 2001
From: root <root>
Date: Sun, 22 Aug 2004 01:40:31 +0000
Subject: [PATCH] *** empty log message ***

---
 autoconf/config.h.in  |   3 +
 autoconf/configure.in |   1 +
 configure             | 691 ++++++++++++++++++++++--------------------
 src/rxvtc.C           |   9 +-
 src/xdefaults.C       |  36 ++-
 5 files changed, 403 insertions(+), 337 deletions(-)

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index fae6ea6e..ff79e2b9 100644
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -214,6 +214,9 @@
 /* Resource class */
 #undef RESCLASS
 
+/* Binary base name */
+#undef RXVTNAME
+
 /* Disable the secondary screen. Many programs use the secondary screen as their workplace */
 #undef NO_SECONDARY_SCREEN
 
diff --git a/autoconf/configure.in b/autoconf/configure.in
index 6f8e72bc..75dfc639 100644
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -321,6 +321,7 @@ RXVTNAME=urxvt
 AC_ARG_WITH(name,
   [  --with-name=NAME        set the basename for the installed binaries (default: urxvt)],
   [RXVTNAME="$withval"])
+AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
 
 RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
 AC_SUBST(RXVTNAME)
diff --git a/configure b/configure
index 27b3d833..13d8d32a 100755
--- a/configure
+++ b/configure
@@ -467,7 +467,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK LINKER CXXCPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED CMP TBL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define DEBUG DINCLUDE DLIB include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK LINKER CXXCPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED CMP TBL TIC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define DEBUG DINCLUDE DLIB include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS'
 ac_subst_files='MCOMMON'
 
 # Initialize some variables set by options.
@@ -1033,6 +1033,7 @@ Optional Features:
   --enable-unicode3       use 21 instead of 16 bits to represent unicode characters
   --enable-combining      enable composition of base and combining characters
   --enable-xft            enable xft support on systems that have it
+  --enable-font-styles    enable bold and italic support
   --enable-utmp           enable utmp (utmpx) support
   --enable-wtmp           enable wtmp (wtmpx) support (requires --enable-utmp)
   --enable-lastlog        enable lastlog support (requires --enable-utmp)
@@ -1068,7 +1069,6 @@ Optional Features:
   --enable-dlmalloc       enable Doug Lea's malloc - for production use
                      NOTE: enable only one malloc package
   --enable-smart-resize   enable smart growth/shrink behaviour
-  --enable-256-color      enable 256-color support
   --enable-cursor-blink   enable blinking cursor
   --enable-text-blink     enable blinking text
   --enable-pointer-blank  enable pointer blank when typing or inactive pointer
@@ -8262,6 +8262,7 @@ support_unicode3=no
 support_combining=no
 support_8bitctrls=no
 support_iso14755=no
+support_styles=no
 codesets=
 
 
@@ -8307,6 +8308,7 @@ if test "${enable_everything+set}" = set; then
     support_combining=yes
     #support_8bitctrls=yes
     support_iso14755=yes
+    support_styles=yes
     codesets=all
   fi
 fi;
@@ -8315,7 +8317,7 @@ fi;
 if test "${enable_unicode3+set}" = set; then
   enableval="$enable_unicode3"
   if test x$enableval = xyes -o x$enableval = xno; then
-    support_unicode3=yes
+    support_unicode3=$enableval
   fi
 fi;
 
@@ -8323,7 +8325,7 @@ fi;
 if test "${enable_combining+set}" = set; then
   enableval="$enable_combining"
   if test x$enableval = xyes -o x$enableval = xno; then
-    support_combining=yes
+    support_combining=$enableval
   fi
 fi;
 
@@ -8331,7 +8333,15 @@ fi;
 if test "${enable_xft+set}" = set; then
   enableval="$enable_xft"
   if test x$enableval = xyes -o x$enableval = xno; then
-    support_xft=yes
+    support_xft=$enableval
+  fi
+fi;
+
+# Check whether --enable-font-styles or --disable-font-styles was given.
+if test "${enable_font_styles+set}" = set; then
+  enableval="$enable_font_styles"
+  if test x$enableval = xyes -o x$enableval = xno; then
+    support_styles=$enableval
   fi
 fi;
 
@@ -8522,7 +8532,7 @@ fi;
 if test "${enable_8bitctrls+set}" = set; then
   enableval="$enable_8bitctrls"
   if test x$enableval = xyes -o x$enableval = xno; then
-    support_8bitctrls=yes
+    support_8bitctrls=$enableval
   fi
 fi;
 
@@ -8579,6 +8589,11 @@ if test "${with_name+set}" = set; then
   RXVTNAME="$withval"
 fi;
 
+cat >>confdefs.h <<_ACEOF
+#define RXVTNAME "$RXVTNAME"
+_ACEOF
+
+
 RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
 
 
@@ -8700,18 +8715,6 @@ _ACEOF
   fi
 fi;
 
-# Check whether --enable-256-color or --disable-256-color was given.
-if test "${enable_256_color+set}" = set; then
-  enableval="$enable_256_color"
-  if test x$enableval = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TTY_256COLOR 1
-_ACEOF
-
-  fi
-fi;
-
 # Check whether --enable-cursor-blink or --disable-cursor-blink was given.
 if test "${enable_cursor_blink+set}" = set; then
   enableval="$enable_cursor_blink"
@@ -9095,6 +9098,45 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+# Extract the first word of "tic", so it can be a program name with args.
+set dummy tic; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_TIC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $TIC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TIC="$TIC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_TIC="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+TIC=$ac_cv_path_TIC
+
+if test -n "$TIC"; then
+  echo "$as_me:$LINENO: result: $TIC" >&5
+echo "${ECHO_T}$TIC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
 
 
 
@@ -16459,93 +16501,340 @@ _ACEOF
 
 fi
 
-if test x$support_iso14755 = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ISO_14755 1
-_ACEOF
-
-fi
-if test x$support_8bitctrls = xyes; then
+if test x$support_xft = xyes; then
+  LIBS="$LIBS `pkg-config xft --libs`"
+  CFLAGS="$CFLAGS `pkg-config xft --cflags`"
+  CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
 
-cat >>confdefs.h <<\_ACEOF
-#define EIGHT_BIT_CONTROLS 1
-_ACEOF
 
+for ac_header in X11/Xft/Xft.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-if test x$support_fading = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define OFF_FOCUS_FADING 1
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-
-fi
-if test x$support_tinting = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TINTING 1
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
 _ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
 fi
-if test x$support_inheritpixmap = xyes; then
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
-cat >>confdefs.h <<\_ACEOF
-#define TRANSPARENT 1
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-
-fi
-if test x$support_keepscrolling = xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
 _ACEOF
-
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
 fi
-if test x$support_selectionscrolling = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define SELECTION_SCROLLING 1
-_ACEOF
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
 fi
-if test x$support_menubar = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define MENUBAR 1
-_ACEOF
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
 fi
-if test x$support_frills = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_FRILLS 1
-_ACEOF
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 
 fi
-if test x$support_linespace = xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_LINESPACE 1
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
+else
+  support_xft=no
 fi
-if test x$support_24bit = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define PREFER_24BIT 1
-_ACEOF
+done
 
-fi
-if test x$support_mousewheel = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define MOUSE_WHEEL 1
+echo "$as_me:$LINENO: checking for XftDrawString32 in -lXft" >&5
+echo $ECHO_N "checking for XftDrawString32 in -lXft... $ECHO_C" >&6
+if test "${ac_cv_lib_Xft_XftDrawString32+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXft  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
-if test x$support_mouseslipwheel = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char XftDrawString32 ();
+int
+main ()
+{
+XftDrawString32 ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_Xft_XftDrawString32=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xft_XftDrawString32=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftDrawString32" >&5
+echo "${ECHO_T}$ac_cv_lib_Xft_XftDrawString32" >&6
+if test $ac_cv_lib_Xft_XftDrawString32 = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXFT 1
+_ACEOF
+
+  LIBS="-lXft $LIBS"
+
+else
+  support_xft=no
+fi
+
+
+  if test x$support_xft = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define XFT 1
+_ACEOF
+
+  fi
+fi
+if test x$support_styles = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_STYLES 1
+_ACEOF
+
+fi
+if test x$support_iso14755 = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ISO_14755 1
+_ACEOF
+
+fi
+if test x$support_8bitctrls = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define EIGHT_BIT_CONTROLS 1
+_ACEOF
+
+fi
+if test x$support_fading = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define OFF_FOCUS_FADING 1
+_ACEOF
+
+fi
+if test x$support_tinting = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define TINTING 1
+_ACEOF
+
+fi
+if test x$support_inheritpixmap = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define TRANSPARENT 1
+_ACEOF
+
+fi
+if test x$support_keepscrolling = xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
+_ACEOF
+
+fi
+if test x$support_selectionscrolling = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define SELECTION_SCROLLING 1
+_ACEOF
+
+fi
+if test x$support_menubar = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define MENUBAR 1
+_ACEOF
+
+fi
+if test x$support_frills = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_FRILLS 1
+_ACEOF
+
+fi
+if test x$support_linespace = xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_LINESPACE 1
+_ACEOF
+
+fi
+if test x$support_24bit = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define PREFER_24BIT 1
+_ACEOF
+
+fi
+if test x$support_mousewheel = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define MOUSE_WHEEL 1
+_ACEOF
+
+fi
+if test x$support_mouseslipwheel = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
 #define MOUSE_SLIP_WHEELING 1
 _ACEOF
 
@@ -16815,247 +17104,6 @@ else
   include_time_h="/* #include <time.h> */"
 fi
 
-if test x$support_xft = xyes; then
-  LIBS="$LIBS `pkg-config xft --libs`"
-  CFLAGS="$CFLAGS `pkg-config xft --cflags`"
-  CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
-
-
-for ac_header in X11/Xft/Xft.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  support_xft=no
-fi
-
-done
-
-
-echo "$as_me:$LINENO: checking for XftDrawString32 in -lXft" >&5
-echo $ECHO_N "checking for XftDrawString32 in -lXft... $ECHO_C" >&6
-if test "${ac_cv_lib_Xft_XftDrawString32+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXft  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XftDrawString32 ();
-int
-main ()
-{
-XftDrawString32 ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_Xft_XftDrawString32=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xft_XftDrawString32=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftDrawString32" >&5
-echo "${ECHO_T}$ac_cv_lib_Xft_XftDrawString32" >&6
-if test $ac_cv_lib_Xft_XftDrawString32 = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXFT 1
-_ACEOF
-
-  LIBS="-lXft $LIBS"
-
-else
-  support_xft=no
-fi
-
-
-  if test x$support_xft = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define XFT 1
-_ACEOF
-
-  fi
-fi
-
                                                                       ac_config_files="$ac_config_files autoconf/Make.common Makefile doc/Makefile src/Makefile src/test/Makefile src/rxvtlib.h W11/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -17721,6 +17769,7 @@ s,@LN@,$LN,;t t
 s,@SED@,$SED,;t t
 s,@CMP@,$CMP,;t t
 s,@TBL@,$TBL,;t t
+s,@TIC@,$TIC,;t t
 s,@X_CFLAGS@,$X_CFLAGS,;t t
 s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
 s,@X_LIBS@,$X_LIBS,;t t
diff --git a/src/rxvtc.C b/src/rxvtc.C
index 3ff1ba3c..fd9e7f8e 100644
--- a/src/rxvtc.C
+++ b/src/rxvtc.C
@@ -27,6 +27,7 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 
 #include <unistd.h>
 #include <signal.h>
@@ -53,7 +54,7 @@ client::client ()
 
   if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
     {
-      perror ("unable to connect to rxvtd");
+      perror ("unable to connect to the rxvt-unicode daemon");
       exit (EXIT_FAILURE);
     }
 }
@@ -81,7 +82,11 @@ main (int argc, const char *const *argv)
   for (char **var = environ; *environ; environ++)
     c.send ("ENV"), c.send (*environ);
 
-  for (int i = 0; i < argc; i++)
+  const char *base = strrchr (argv[0], '/');
+  base = base ? base + 1 : argv[0];
+  c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
+
+  for (int i = 1; i < argc; i++)
     c.send ("ARG"), c.send (argv[i]);
 
   c.send ("END");
diff --git a/src/xdefaults.C b/src/xdefaults.C
index 2eed6b09..5ac012b8 100644
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -111,7 +111,7 @@ optList[] = {
 #endif
 #endif
 #ifdef OFF_FOCUS_FADING
-              STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."),
+              STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
 #endif
 #ifdef TINTING
               STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
@@ -160,8 +160,8 @@ optList[] = {
               RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
 #endif				/* NO_BRIGHTCOLOR */
 #ifndef NO_BOLD_UNDERLINE_REVERSE
-              BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
               RSTRG (Rs_color + Color_BD, "colorBD", "color"),
+              RSTRG (Rs_color + Color_IT, "colorIT", "color"),
               RSTRG (Rs_color + Color_UL, "colorUL", "color"),
               RSTRG (Rs_color + Color_RV, "colorRV", "color"),
 #endif				/* ! NO_BOLD_UNDERLINE_REVERSE */
@@ -181,8 +181,13 @@ optList[] = {
 #if (MENUBAR_MAX)
               RSTRG (Rs_menu, "menu", "name[;tag]"),
 #endif
-              STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
               /* fonts: command-line option = resource name */
+              STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
+#if ENABLE_STYLES
+              STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
+              STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
+              STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
+#endif
 #ifdef USE_XIM
               STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
               STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
@@ -251,11 +256,23 @@ optList[] = {
 #undef BOOL
 /*}}} */
 
-static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
+static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
 static const char optionsstring[] = "options: "
 #if XFT
                                     "xft,"
 #endif
+#if ENABLE_STYLES
+                                    "styles,"
+#endif
+#if ENABLE_COMBINING
+                                    "combining,"
+#endif
+#if TEXT_BLINK
+                                    "blink,"
+#endif
+#if ISO_14755
+                                    "iso14755,"
+#endif
 #if UNICODE_3
                                     "unicode3,"
 #endif
@@ -276,12 +293,6 @@ static const char optionsstring[] = "options: "
                                     "+cn-ext"
 #endif
                                     ","
-#if ENABLE_COMBINING
-                                    "combining,"
-#endif
-#if TEXT_BLINK
-                                    "blink,"
-#endif
 #if OFF_FOCUS_FADING
                                     "fade,"
 #endif
@@ -363,9 +374,6 @@ static const char optionsstring[] = "options: "
 #if defined(SMART_RESIZE)
                                     "smart-resize,"
 #endif
-#if defined(TTY_256COLOR)
-                                    "256colour,"
-#endif
 #if defined(CURSOR_BLINK)
                                     "cursorBlink,"
 #endif
@@ -847,7 +855,7 @@ rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const c
 #   ifdef HAVE_EXTRA_XRESOURCE_FILES
     /* Add in ~/.Xdefaults or ~/.Xresources */
     {
-      char           *ptr;
+      char *ptr;
 
       if ((ptr = (char *)getenv ("HOME")) == NULL)
         ptr = ".";
-- 
2.34.1