*** empty log message ***

diff --git a/README.configure b/README.configure
index f95abb066ad37ab4b3b9f2fa976dbadf2c3ecb41..bea2cd48f1920ca8005c500720e587655f97b277 100644 (file)
--- a/README.configure
+++ b/README.configure
@@ -159,6 +159,11 @@ CONFIGURE OPTIONS
         to have. Normally you want this, but for very small binaries you may
         want to disable this.
 
+    --enable-iso14755
+        Enable extended ISO 14755 support (see rxvt(1), or doc/rxvt.1.txt).
+        Basic support (section 5.1) is enabled by "--enable-frills", while
+        support for 5.2, 5.3 and 5.4 is enabled with this switch.
+
     --enable-linespace
         Add support to provide user specified line spacing between text
         rows.

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index 2fe87f208571e03d86c425f3fdba40ee7b32b6a5..0f67377de5d32aab1a6ea5b980a6dda22b47302a 100644 (file)
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -334,6 +334,9 @@
 /* Define for second char in devptyXX */
 #undef PTYCHAR2
 
+/* Define if you want ISO 14755 extended support */
+#undef ISO_14755
+
 /* Define if you want 8 bit control sequences */
 #undef EIGHT_BIT_CONTROLS
 
@@ -355,8 +358,8 @@
 /* Define if you want Menubar support */
 #undef MENUBAR
 
-/* Define if you don't want handling for rarely used features */
-#undef NO_FRILLS
+/* Define if you want handling for rarely used but handy features */
+#undef ENABLE_FRILLS
 
 /* Define if you don't want support linespace */
 #undef NO_LINESPACE

diff --git a/autoconf/configure.in b/autoconf/configure.in
index d4a8855a3218d83a07e42e2a46c08306c90ec1e5..c13db83997dbee814e4b951fa0f25e8099af777b 100644 (file)
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -93,6 +93,7 @@ support_xft=no
 support_unicode3=no
 support_combining=no
 support_8bitctrls=no
+support_iso14755=no
 codesets=
 
 dnl# --------------------------------------------------------------------------
@@ -137,6 +138,7 @@ AC_ARG_ENABLE(everything,
     support_unicode3=yes
     support_combining=yes
     #support_8bitctrls=yes
+    support_iso14755=yes
     codesets=all
   fi])
 
@@ -327,6 +329,12 @@ AC_ARG_ENABLE(swapscreen,
     AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace)
   fi])
 
+AC_ARG_ENABLE(iso14755,
+  [  --enable-iso14755       enable support for extended ISO 14755 modes],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    support_iso14755=$enableval
+  fi])
+
 AC_ARG_ENABLE(frills,
   [  --enable-frills         enable support for rarely used features],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -585,7 +593,6 @@ dnl> AC_CHECK_TYPE(off_t, long)
 AC_TYPE_PID_T
 AC_TYPE_UID_T
 
-
 AC_CHECK_SIZEOF(char, 1)
 AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(int, 4)
@@ -1173,6 +1180,9 @@ fi
 dnl# --------------------------------------------------------------------------
 dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------
+if test x$support_iso14755 = xyes; then
+  AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
+fi
 if test x$support_8bitctrls = xyes; then
   AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
 fi
@@ -1194,8 +1204,8 @@ fi
 if test x$support_menubar = xyes; then
   AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
 fi
-if test x$support_frills = xno; then
-  AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features)
+if test x$support_frills = xyes; then
+  AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
 fi
 if test x$support_linespace = xno; then
   AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)

diff --git a/configure b/configure
index ea1e5b03457db2fbdab8bab430dc13b5693aab0b..27b3d83355b900c186780cd9a4d6676c5a18da8c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1056,6 +1056,7 @@ Optional Features:
   --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt)
   --enable-strings        enable some replacement system functions
   --disable-swapscreen    disable swap screen support
+  --enable-iso14755       enable support for extended ISO 14755 modes
   --enable-frills         enable support for rarely used features
   --enable-linespace      enable support for linespace
   --enable-24bit          enable support for using 24bit visuals if available
@@ -5239,7 +5240,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5242 "configure"' > conftest.$ac_ext
+  echo '#line 5243 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5790,7 +5791,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:5793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -7406,7 +7407,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7409 "configure"
+#line 7410 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7504,7 +7505,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7507 "configure"
+#line 7508 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8260,6 +8261,7 @@ support_xft=no
 support_unicode3=no
 support_combining=no
 support_8bitctrls=no
+support_iso14755=no
 codesets=
 
 
@@ -8304,6 +8306,7 @@ if test "${enable_everything+set}" = set; then
     support_unicode3=yes
     support_combining=yes
     #support_8bitctrls=yes
+    support_iso14755=yes
     codesets=all
   fi
 fi;
@@ -8599,6 +8602,14 @@ _ACEOF
   fi
 fi;
 
+# Check whether --enable-iso14755 or --disable-iso14755 was given.
+if test "${enable_iso14755+set}" = set; then
+  enableval="$enable_iso14755"
+  if test x$enableval = xyes -o x$enableval = xno; then
+    support_iso14755=$enableval
+  fi
+fi;
+
 # Check whether --enable-frills or --disable-frills was given.
 if test "${enable_frills+set}" = set; then
   enableval="$enable_frills"
@@ -11729,7 +11740,6 @@ _ACEOF
 fi
 
 
-
 echo "$as_me:$LINENO: checking for char" >&5
 echo $ECHO_N "checking for char... $ECHO_C" >&6
 if test "${ac_cv_type_char+set}" = set; then
@@ -16449,6 +16459,13 @@ _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
@@ -16498,10 +16515,10 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-if test x$support_frills = xno; then
+if test x$support_frills = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_FRILLS 1
+#define ENABLE_FRILLS 1
 _ACEOF
 
 fi
@@ -16640,7 +16657,6 @@ fi
 if test x$codesets = xall; then
   codesets=jp,jp-ext,kr,cn,cn-ext
 fi
-for codeset in `echo $codesets | tr "a-z,\\-" "A-Z _"`; do
 
 cat >>confdefs.h <<\_ACEOF
 #define ENCODING_EU 1
@@ -16651,6 +16667,7 @@ cat >>confdefs.h <<\_ACEOF
 #define ENCODING_VN 1
 _ACEOF
 
+for codeset in `echo $codesets | tr "a-z,\\-" "A-Z _"`; do
   case "$codeset" in
     JP     )
 cat >>confdefs.h <<\_ACEOF

diff --git a/reconf b/reconf
index 2d3de88ffcb8d3522bef0e9c4aa58a697a949281..c2a6c3e4fb40875a0344972580fe79858e2e7c01 100755 (executable)
--- a/reconf
+++ b/reconf
@@ -10,5 +10,5 @@
             --enable-frills --enable-swapscreen --enable-transparency --enable-slipwheeling \
             --with-codesets=all --enable-menubar --enable-tinting \
             --enable-cursor-blink --enable-text-blink --enable-fading \
-            --enable-plain-scroll --enable-rxvt-scroll --enable-combining \
+            --enable-plain-scroll --enable-rxvt-scroll --enable-combining --enable-iso14755 \
             "$@"