*** empty log message ***

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index ffe57fa1b5ea5f2cf792b44b4adf6b58a92a3f99..2fe87f208571e03d86c425f3fdba40ee7b32b6a5 100644 (file)
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -160,6 +160,9 @@
 /* Define if you have the <sys/sockio.h> header file.  */
 #undef HAVE_SYS_SOCKIO_H
 
+/* Define if you have the <sys/stropts.h> header file.  */
+#undef HAVE_SYS_STROPTS_H
+
 /* Define if you have the <sys/strredir.h> header file.  */
 #undef HAVE_SYS_STRREDIR_H
 

diff --git a/autoconf/configure.in b/autoconf/configure.in
index 2186e572b6b6dcb0983aa66a66bda256a87e0c5d..d4a8855a3218d83a07e42e2a46c08306c90ec1e5 100644 (file)
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -503,6 +503,7 @@ AC_CHECK_HEADERS( \
        sys/select.h \
        sys/sockio.h \
        sys/strredir.h \
+        sys/stropts.h \
        sys/time.h \
        utmp.h \
        utmpx.h \
@@ -1259,9 +1260,9 @@ fi
 if test x$codesets = xall; then
   codesets=jp,jp-ext,kr,cn,cn-ext
 fi
+AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
+AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
 for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
-  AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
-  AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
   case "$codeset" in
     JP     ) AC_DEFINE(ENCODING_JP,     1, Define if you want japanese codesets) ;;
     JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;

diff --git a/configure b/configure
index 2b6f36dbd9ae75fd7364f43a9ad04a947a5271b2..ea1e5b03457db2fbdab8bab430dc13b5693aab0b 100755 (executable)
--- a/configure
+++ b/configure
@@ -10913,6 +10913,7 @@ fi
 
 
 
+
 
 for ac_header in \
        assert.h \
@@ -10930,6 +10931,7 @@ for ac_header in \
        sys/select.h \
        sys/sockio.h \
        sys/strredir.h \
+        sys/stropts.h \
        sys/time.h \
        utmp.h \
        utmpx.h \

diff --git a/src/ptytty.C b/src/ptytty.C
index 5b07c8dba8b70fcbe78be7217dc11963b252e1ea..c539252d8c47d47a016b8f417331f73932629322 100644 (file)
--- a/src/ptytty.C
+++ b/src/ptytty.C
@@ -52,7 +52,7 @@
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
-#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
+#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)
 # include <sys/stropts.h>      /* for I_PUSH */
 #endif
 #ifdef HAVE_ISASTREAM

diff --git a/src/xdefaults.C b/src/xdefaults.C
index 3ef077c06158b3fd2218e1f1b4c1babed8d3927f..5787a1d4094f15ae9cbab9b8f3f6ad266de17dd1 100644 (file)
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -254,27 +254,53 @@ optList[] = {
 
 static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
 static const char optionsstring[] = "Options: "
+#if XFT
+                                    "xft,"
+#endif
+#if UNICODE_3
+                                    "unicode3,"
+#endif
+                                    "encodings=eu+vn"
+#if ENCODING_JP
+                                    "+jp"
+#endif
+#if ENCODING_JP_EXT
+                                    "+jp-ext"
+#endif
+#if ENCODING_KR
+                                    "+kr"
+#endif
+#if ENCODING_CN
+                                    "+cn"
+#endif
+#if ENCODING_CN_EXT
+                                    "+cn-ext"
+#endif
+                                    ","
+#if ENABLE_COMBINING
+                                    "combining,"
+#endif
+#if TEXT_BLINK
+                                    "blink,"
+#endif
+#if OFF_FOCUS_FADING
+                                    "fade,"
+#endif
 #if defined(XPM_BACKGROUND)
                                     "XPM,"
 #endif
 #if defined(TRANSPARENT)
                                     "transparent,"
 #endif
+#if TINTING
+                                    "tint,"
+#endif
 #if defined(UTMP_SUPPORT)
                                     "utmp,"
 #endif
 #if defined(MENUBAR)
                                     "menubar,"
 #endif
-#if !defined(NO_FRILLS)
-                                    "frills,"
-#endif
-#if !defined(NO_LINESPACE)
-                                    "linespace,"
-#endif
-#if defined(PREFER_24BIT)
-                                    "24bit,"
-#endif
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
@@ -311,12 +337,42 @@ static const char optionsstring[] = "Options: "
 #if defined(NO_DELETE_KEY)
                                     "no_delete,"
 #endif
+#if EIGHT_BIT_CONTROLS
+                                    "8bitctrls,"
+#endif
 #if !defined(NO_STRINGS)
                                     "strings,"
 #endif
+#if !defined(NO_FRILLS)
+                                    "frills,"
+#endif
+#if !defined(NO_LINESPACE)
+                                    "linespace,"
+#endif
+#if defined(PREFER_24BIT)
+                                    "24bit,"
+#endif
+#if defined(SELECTION_SCROLLING)
+                                    "selectionscrolling,"
+#endif
+#if MOUSE_WHEEL
+                                    "wheel,"
+#endif
+#if MOUSE_SLIP_WHEELING
+                                    "slipwheel,"
+#endif
+#if defined(SMART_RESIZE)
+                                    "smart-resize,"
+#endif
 #if defined(TTY_256COLOR)
                                     "256colour,"
 #endif
+#if defined(CURSOR_BLINK)
+                                    "cursorBlink,"
+#endif
+#if defined(POINTER_BLANK)
+                                    "pointerBlank,"
+#endif
 #if defined(NO_RESOURCES)
                                     "NoResources"
 #else