repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 8cb815c0a4a65c9753d761105d2ce2188a85a813:
path_to: 
revision_to: 

commit 8cb815c0a4a65c9753d761105d2ce2188a85a813
Author: Marc Lehmann 
Date:   Wed Jan 11 23:08:54 2006 +0000

    *** empty log message ***

diff --git a/Changes b/Changes

--- a/Changes
+++ b/Changes
@@ -14,6 +14,7 @@ WISH: support tex fonts
 7.0
 TODO: run external commands more sytematically (using $self->env etc.)
 TODO: document searchable-scorllback hotkey
+TODO: double-click and right-extend
 	- added sections for DISTRIBUTION MAINTAINERS and about
           SETUID/SETGID to the FAQ.
         - selection, searchable-scrollback, selection-popup and
@@ -33,7 +34,8 @@ TODO: document searchable-scorllback hotkey
         - free one of the cursors, fixes a small memory leak.
         - built-in (as opposed to terminfos) visual bell was broken/too fast.
         - applied minor cleanups by Ladislav Michnovic.
-        - applied better configure support for openpty by Emanuele Giaquinta.
+        - applied better configure support for openpty and other pty stuff
+          (Emanuele Giaquinta).
         - mark-urls launch-on-click by jepler.
         - removed "small" resource parsing function, as it wasn't really
           compatible, and not really small either.
@@ -44,6 +46,7 @@ TODO: document searchable-scorllback hotkey
         - limit colour changing to the standard 88 palette instead of all
           colours.
         - XTerm_Color01 sequence returned wrong results in query mode.
+        - iom.C now checks against destructed io_manager when unregistering.

 6.3  Wed Jan  4 22:37:10 CET 2006
         - SECURITY FIX: on systems using openpty, permissions were
diff --git a/README.configure b/README.configure

--- a/README.configure
+++ b/README.configure
@@ -159,15 +159,6 @@ CONFIGURE OPTIONS
     --disable-resources
         Removes any support for resource checking.

-    --enable-xgetdefault
-        Make resources checking via XGetDefault() instead of our small
-        version which only checks ~/.Xdefaults, or if that doesn't exist
-        then ~/.Xresources.
-
-        Please note that nowadays, things like XIM will automatically pull
-        in and use the full X resource manager, so the overhead of using it
-        might be very small, if nonexistant.
-
     --enable-strings (default: off)
         Add support for our possibly faster memset() function and other
         various routines, overriding your system's versions which may have
diff --git a/autoconf/config.h.in b/autoconf/config.h.in

--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -73,6 +73,9 @@
 /* Define if you have the on_exit function.  */
 #undef HAVE_ON_EXIT

+/* Define if you have the posix_openpt function.  */
+#undef HAVE_POSIX_OPENPT
+
 /* Define if you have the revoke function.  */
 #undef HAVE_REVOKE

@@ -325,6 +328,9 @@
 /* Define if your XIMCallback specifies XIC as first type. */
 #undef XIMCB_PROTO_BROKEN

+/* Define for this pty type */
+#undef PTYS_ARE_POSIX
+
 /* Define for this pty type */
 #undef PTYS_ARE_OPENPTY

@@ -340,9 +346,6 @@
 /* Define for this pty type */
 #undef PTYS_ARE__GETPTY

-/* Define for this pty type */
-#undef PTYS_ARE_GETPTY
-
 /* Define for this pty type */
 #undef PTYS_ARE_GETPT

diff --git a/autoconf/configure.in b/autoconf/configure.in

--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -742,6 +742,7 @@ AC_CHECK_FUNCS( \
 	setpgrp \
 	setpgid \
 	_getpty \
+	posix_openpt \
 	grantpt \
 	unlockpt \
 	isastream \
@@ -1180,12 +1181,7 @@ if test x$rxvt_broken_ximcb = xyes; then
    AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
 fi

-AC_CACHE_CHECK(for getpt, rxvt_cv_func_getpt,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
-#ifdef HAVE_STDLIB_H
-# include 
-#endif]], [[(void)getpt();]])],[rxvt_cv_func_getpt=yes],[rxvt_cv_func_getpt=no])])
-if test x$rxvt_cv_func_getpt = xno; then
+if test x$rxvt_cv_func_posix_openpt = xno; then
   AC_CHECK_FUNC(openpty, [], [AC_CHECK_LIB(util, openpty, [LIBS="$LIBS -lutil"])])
 fi

@@ -1193,14 +1189,14 @@ dnl# if we don't guess right then it's up to the user
 AC_CACHE_CHECK(for pty/tty type, rxvt_cv_ptys,
 [if test x$ac_cv_func_openpty = xyes -o x$ac_cv_lib_util_openpty = xyes; then
     rxvt_cv_ptys=OPENPTY
+ else if test x$ac_cv_func_posix_openpt = xyes; then
+    rxvt_cv_ptys=POSIX
  else if test x$ac_cv_func__getpty = xyes; then
     rxvt_cv_ptys=SGI4
  else if test -c /dev/ttyp20; then
     rxvt_cv_ptys=SCO
  else if test -c /dev/ptym/clone; then
     rxvt_cv_ptys=HPUX
- else if test x$rxvt_cv_func_getpt = xyes; then
-    rxvt_cv_ptys=GLIBC
  else if test -c /dev/ptc -a -c /dev/pts; then
     rxvt_cv_ptys=PTC
  else if test -c /dev/ptc -a -d /dev/pts; then
@@ -1223,6 +1219,9 @@ fi
 fi
 ])

+if test x$rxvt_cv_ptys = xPOSIX; then
+  AC_DEFINE(PTYS_ARE_POSIX, 1, Define for this pty type)
+fi
 if test x$rxvt_cv_ptys = xOPENPTY; then
   AC_DEFINE(PTYS_ARE_OPENPTY, 1, Define for this pty type)
 fi
@@ -1238,9 +1237,6 @@ fi
 if test x$rxvt_cv_ptys = xSGI4; then
   AC_DEFINE(PTYS_ARE__GETPTY, 1, Define for this pty type)
 fi
-if test x$rxvt_cv_ptys = xCONVEX; then
-  AC_DEFINE(PTYS_ARE_GETPTY, 1, Define for this pty type)
-fi
 if test x$rxvt_cv_ptys = xGLIBC; then
   AC_DEFINE(PTYS_ARE_GETPT, 1, Define for this pty type)
 fi
diff --git a/configure b/configure

--- a/configure
+++ b/configure
@@ -10185,6 +10185,7 @@ esac



+
 for ac_func in \
 	atexit \
 	revoke \
@@ -10196,6 +10197,7 @@ for ac_func in \
 	setpgrp \
 	setpgid \
 	_getpty \
+	posix_openpt \
 	grantpt \
 	unlockpt \
 	isastream \
@@ -11986,63 +11988,7 @@ _ACEOF

 fi

-echo "$as_me:$LINENO: checking for getpt" >&5
-echo $ECHO_N "checking for getpt... $ECHO_C" >&6
-if test "${rxvt_cv_func_getpt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#define _GNU_SOURCE
-#ifdef HAVE_STDLIB_H
-# include 
-#endif
-int
-main ()
-{
-(void)getpt();
-  ;
-  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
-  rxvt_cv_func_getpt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-rxvt_cv_func_getpt=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $rxvt_cv_func_getpt" >&5
-echo "${ECHO_T}$rxvt_cv_func_getpt" >&6
-if test x$rxvt_cv_func_getpt = xno; then
+if test x$rxvt_cv_func_posix_openpt = xno; then
   echo "$as_me:$LINENO: checking for openpty" >&5
 echo $ECHO_N "checking for openpty... $ECHO_C" >&6
 if test "${ac_cv_func_openpty+set}" = set; then
@@ -12213,14 +12159,14 @@ if test "${rxvt_cv_ptys+set}" = set; then
 else
   if test x$ac_cv_func_openpty = xyes -o x$ac_cv_lib_util_openpty = xyes; then
     rxvt_cv_ptys=OPENPTY
+ else if test x$ac_cv_func_posix_openpt = xyes; then
+    rxvt_cv_ptys=POSIX
  else if test x$ac_cv_func__getpty = xyes; then
     rxvt_cv_ptys=SGI4
  else if test -c /dev/ttyp20; then
     rxvt_cv_ptys=SCO
  else if test -c /dev/ptym/clone; then
     rxvt_cv_ptys=HPUX
- else if test x$rxvt_cv_func_getpt = xyes; then
-    rxvt_cv_ptys=GLIBC
  else if test -c /dev/ptc -a -c /dev/pts; then
     rxvt_cv_ptys=PTC
  else if test -c /dev/ptc -a -d /dev/pts; then
@@ -12245,6 +12191,13 @@ fi
 echo "$as_me:$LINENO: result: $rxvt_cv_ptys" >&5
 echo "${ECHO_T}$rxvt_cv_ptys" >&6

+if test x$rxvt_cv_ptys = xPOSIX; then
+
+cat >>confdefs.h <<\_ACEOF
+#define PTYS_ARE_POSIX 1
+_ACEOF
+
+fi
 if test x$rxvt_cv_ptys = xOPENPTY; then

 cat >>confdefs.h <<\_ACEOF
@@ -12279,13 +12232,6 @@ cat >>confdefs.h <<\_ACEOF
 #define PTYS_ARE__GETPTY 1
 _ACEOF

-fi
-if test x$rxvt_cv_ptys = xCONVEX; then
-
-cat >>confdefs.h <<\_ACEOF
-#define PTYS_ARE_GETPTY 1
-_ACEOF
-
 fi
 if test x$rxvt_cv_ptys = xGLIBC; then

diff --git a/doc/rxvt-unicode.spec b/doc/rxvt-unicode.spec

--- a/doc/rxvt-unicode.spec
+++ b/doc/rxvt-unicode.spec
@@ -22,14 +22,7 @@ Xft fonts.
 %setup -q

 %build
-%configure --enable-xft --enable-font-styles --enable-utmp --enable-wtmp \
-  --enable-lastlog --enable-transparency --enable-tinting --enable-fading \
-  --enable-menubar --enable-rxvt-scroll --enable-xterm-scroll \
-  --enable-plain-scroll --enable-half-shadow --enable-xgetdefault \
-  --enable-24bit --enable-keepscrolling --enable-selectionscrolling \
-  --enable-mousewheel --enable-slipwheeling --enable-smart-resize \
-  --enable-pointer-blank --enable-xpm-background --enable-next-scroll \
-  --enable-xim --enable-linespace --with-save-lines=2000 --enable-resources
+%configure
 make

 %install
diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html

--- a/doc/rxvt.1.html
+++ b/doc/rxvt.1.html
@@ -48,7 +48,7 @@
 

 

 
DESCRIPTION
-
rxvt-unicode, version 6.3, is a colour vt102 terminal
+
rxvt-unicode, version 7.0, is a colour vt102 terminal
 emulator intended as an xterm(1) replacement for users who do not
 require features such as Tektronix 4014 emulation and toolkit-style
 configurability. As a result, rxvt-unicode uses much less swap space --
@@ -655,34 +655,26 @@ this terminal instance. See resource perl-ext for details.
 
RESOURCES (available also as long-options)
 
Note: `rxvt --help' gives a list of all resources (long
 options) compiled into your version.
-
There are two different methods that rxvt can use to get the
-Xresource data: using the X libraries (Xrm*-functions) or internal
-Xresources reader (~/.Xdefaults). For the first method (ie.
-rxvt -h lists XGetDefaults), you can set and change the
-resources using X11 tools like xrdb. Many distribution do also load
-settings from the ~/.Xresources file when X starts. rxvt
-will consult the following files/resources in order, with later settings
-overwriting earlier ones:
+
You can set and change the resources using X11 tools like xrdb. Many
+distribution do also load settings from the ~/.Xresources file when X
+starts. rxvt will consult the following files/resources in order,
+with later settings overwriting earlier ones:
 
   1. system-wide app-defaults file, either locale-dependent OR global
   2. app-defaults file in $XAPPLRESDIR
   3. RESOURCE_MANAGER property on root-window OR $HOME/.Xdefaults
   4. SCREEN_RESOURCES for the current screen
   5. $XENVIRONMENT file OR $HOME/.Xdefaults-<nodename>
-
If compiled with internal Xresources support (i.e. rxvt -h
-lists .Xdefaults) then rxvt accepts application defaults
-set in XAPPLOADDIR/URxvt (compile-time defined: usually
-/usr/lib/X11/app-defaults/URxvt) and resources set in
-~/.Xdefaults, or ~/.Xresources if ~/.Xdefaults does not exist.
-Note that when reading X resources, rxvt recognizes two
-class names: XTerm and URxvt. The class name Rxvt allows
-resources common to both rxvt and the original rxvt to be
-easily configured, while the class name URxvt allows resources
-unique to rxvt, notably colours and key-handling, to be
-shared between different rxvt configurations. If no
-resources are specified, suitable defaults will be used. Command-line
-arguments can be used to override resource settings. The following
-resources are allowed:
+
Note that when reading X resources, rxvt recognizes two class
+names: Rxvt and URxvt. The class name Rxvt allows resources
+common to both rxvt and the original rxvt to be easily
+configured, while the class name URxvt allows resources unique to
+rxvt, to be shared between different rxvt
+configurations. If no resources are specified, suitable defaults will
+be used. Command-line arguments can be used to override resource
+settings. The following resources are supported (you might want to
+check the rxvtperl(3) manpage for additional settings by perl
+extensions not documented here):
 

 
geometry: geom

 
@@ -1360,10 +1352,10 @@ performed in an exact manner; however, the closest match is assured.

 can start or end with whitespace.

 
 

-
Please note that you need to double the \ when using
---enable-xgetdefault, as X itself does it's own de-escaping (you can
-use \033 instead of \e (and so on), which will work with both Xt and
-rxvt's own processing).
+
Please note that you need to double the \ in resource files, as
+Xlib itself does it's own de-escaping (you can use \033 instead of
+\e (and so on), which will work with both Xt and rxvt's own
+processing).
 
 

 
You can define a range of keysyms in one shot by providing a string
diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in

--- a/doc/rxvt.1.man.in
+++ b/doc/rxvt.1.man.in
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rxvt 1"
-.TH rxvt 1 "2006-01-11" "6.3" "RXVT-UNICODE"
+.TH rxvt 1 "2006-01-11" "7.0" "RXVT-UNICODE"
 .SH "NAME"
 rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system)
 .SH "SYNOPSIS"
@@ -553,14 +553,10 @@ this terminal instance. See resource \fBperl-ext\fR for details.
 Note: `@@RXVT_NAME@@ \-\-help' gives a list of all resources (long
 options) compiled into your version.
 .PP
-There are two different methods that @@RXVT_NAME@@ can use to get the
-Xresource data: using the X libraries (Xrm*\-functions) or internal
-Xresources reader (\fB~/.Xdefaults\fR). For the first method (ie.
-\&\fB@@RXVT_NAME@@ \-h\fR lists \fBXGetDefaults\fR), you can set and change the
-resources using X11 tools like \fBxrdb\fR. Many distribution do also load
-settings from the \fB~/.Xresources\fR file when X starts. @@RXVT_NAME@@
-will consult the following files/resources in order, with later settings
-overwriting earlier ones:
+You can set and change the resources using X11 tools like \fBxrdb\fR. Many
+distribution do also load settings from the \fB~/.Xresources\fR file when X
+starts. @@RXVT_NAME@@ will consult the following files/resources in order,
+with later settings overwriting earlier ones:
 .PP
 .Vb 5
 \&  1. system-wide app-defaults file, either locale-dependent OR global
@@ -570,20 +566,16 @@ overwriting earlier ones:
 \&  5. $XENVIRONMENT file OR $HOME/.Xdefaults-
 .Ve
 .PP
-If compiled with internal Xresources support (i.e. \fB@@RXVT_NAME@@ \-h\fR
-lists \fB.Xdefaults\fR) then \fB@@RXVT_NAME@@\fR accepts application defaults
-set in XAPPLOADDIR/URxvt (compile\-time defined: usually
-\&\fB/usr/lib/X11/app\-defaults/URxvt\fR) and resources set in
-\&\fB~/.Xdefaults\fR, or \fB~/.Xresources\fR if \fB~/.Xdefaults\fR does not exist.
-Note that when reading X resources, \fB@@RXVT_NAME@@\fR recognizes two
-class names: \fBXTerm\fR and \fBURxvt\fR. The class name \fBRxvt\fR allows
-resources common to both \fB@@RXVT_NAME@@\fR and the original \fIrxvt\fR to be
-easily configured, while the class name \fBURxvt\fR allows resources
-unique to \fB@@RXVT_NAME@@\fR, notably colours and key\-handling, to be
-shared between different \fB@@RXVT_NAME@@\fR configurations. If no
-resources are specified, suitable defaults will be used. Command-line
-arguments can be used to override resource settings. The following
-resources are allowed:
+Note that when reading X resources, \fB@@RXVT_NAME@@\fR recognizes two class
+names: \fBRxvt\fR and \fBURxvt\fR. The class name \fBRxvt\fR allows resources
+common to both \fB@@RXVT_NAME@@\fR and the original \fIrxvt\fR to be easily
+configured, while the class name \fBURxvt\fR allows resources unique to
+\&\fB@@RXVT_NAME@@\fR, to be shared between different \fB@@RXVT_NAME@@\fR
+configurations. If no resources are specified, suitable defaults will
+be used. Command-line arguments can be used to override resource
+settings. The following resources are supported (you might want to
+check the @@RXVT_NAME@@\fIperl\fR\|(3) manpage for additional settings by perl
+extensions not documented here):
 .IP "\fBgeometry:\fR \fIgeom\fR" 4
 .IX Item "geometry: geom"
 Create the window with the specified X window geometry [default 80x24];
@@ -1028,10 +1020,10 @@ performed in an exact manner; however, the closest match is assured.
 \&\f(CW\*(C`^@\*(C'\fR: null, \f(CW\*(C`^A\*(C'\fR ...) and may be enclosed with double quotes so that it
 can start or end with whitespace.
 .Sp
-Please note that you need to double the \f(CW\*(C`\e\*(C'\fR when using
-\&\f(CW\*(C`\-\-enable\-xgetdefault\*(C'\fR, as X itself does it's own de-escaping (you can
-use \f(CW\*(C`\e033\*(C'\fR instead of \f(CW\*(C`\ee\*(C'\fR (and so on), which will work with both Xt and
-@@RXVT_NAME@@'s own processing).
+Please note that you need to double the \f(CW\*(C`\e\*(C'\fR in resource files, as
+Xlib itself does it's own de-escaping (you can use \f(CW\*(C`\e033\*(C'\fR instead of
+\&\f(CW\*(C`\ee\*(C'\fR (and so on), which will work with both Xt and @@RXVT_NAME@@'s own
+processing).
 .Sp
 You can define a range of keysyms in one shot by providing a \fIstring\fR
 with pattern \fBlist/PREFIX/MIDDLE/SUFFIX\fR, where the delimeter `/'
diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod

--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -478,14 +478,10 @@ this terminal instance. See resource B for details.
 Note: `@@RXVT_NAME@@ --help' gives a list of all resources (long
 options) compiled into your version.

-There are two different methods that @@RXVT_NAME@@ can use to get the
-Xresource data: using the X libraries (Xrm*-functions) or internal
-Xresources reader (B<~/.Xdefaults>). For the first method (ie.
-B<@@RXVT_NAME@@ -h> lists B), you can set and change the
-resources using X11 tools like B. Many distribution do also load
-settings from the B<~/.Xresources> file when X starts. @@RXVT_NAME@@
-will consult the following files/resources in order, with later settings
-overwriting earlier ones:
+You can set and change the resources using X11 tools like B. Many
+distribution do also load settings from the B<~/.Xresources> file when X
+starts. @@RXVT_NAME@@ will consult the following files/resources in order,
+with later settings overwriting earlier ones:

   1. system-wide app-defaults file, either locale-dependent OR global
   2. app-defaults file in $XAPPLRESDIR
@@ -493,20 +489,16 @@ overwriting earlier ones:
   4. SCREEN_RESOURCES for the current screen
   5. $XENVIRONMENT file OR $HOME/.Xdefaults-

-If compiled with internal Xresources support (i.e. B<@@RXVT_NAME@@ -h>
-lists B<.Xdefaults>) then B<@@RXVT_NAME@@> accepts application defaults
-set in XAPPLOADDIR/URxvt (compile-time defined: usually
-B) and resources set in
-B<~/.Xdefaults>, or B<~/.Xresources> if B<~/.Xdefaults> does not exist.
-Note that when reading X resources, B<@@RXVT_NAME@@> recognizes two
-class names: B and B. The class name B allows
-resources common to both B<@@RXVT_NAME@@> and the original I to be
-easily configured, while the class name B allows resources
-unique to B<@@RXVT_NAME@@>, notably colours and key-handling, to be
-shared between different B<@@RXVT_NAME@@> configurations. If no
-resources are specified, suitable defaults will be used. Command-line
-arguments can be used to override resource settings. The following
-resources are allowed:
+Note that when reading X resources, B<@@RXVT_NAME@@> recognizes two class
+names: B and B. The class name B allows resources
+common to both B<@@RXVT_NAME@@> and the original I to be easily
+configured, while the class name B allows resources unique to
+B<@@RXVT_NAME@@>, to be shared between different B<@@RXVT_NAME@@>
+configurations. If no resources are specified, suitable defaults will
+be used. Command-line arguments can be used to override resource
+settings. The following resources are supported (you might want to
+check the @@RXVT_NAME@@perl(3) manpage for additional settings by perl
+extensions not documented here):

 =over 4

@@ -1017,10 +1009,10 @@ C<\000>: octal number) or verbatim control characters (C<^?>: delete,
 C<^@>: null, C<^A> ...) and may be enclosed with double quotes so that it
 can start or end with whitespace.

-Please note that you need to double the C<\> when using
-C<--enable-xgetdefault>, as X itself does it's own de-escaping (you can
-use C<\033> instead of C<\e> (and so on), which will work with both Xt and
-@@RXVT_NAME@@'s own processing).
+Please note that you need to double the C<\> in resource files, as
+Xlib itself does it's own de-escaping (you can use C<\033> instead of
+C<\e> (and so on), which will work with both Xt and @@RXVT_NAME@@'s own
+processing).

 You can define a range of keysyms in one shot by providing a I
 with pattern B, where the delimeter `/'
diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt

--- a/doc/rxvt.1.txt
+++ b/doc/rxvt.1.txt
@@ -6,7 +6,7 @@ SYNOPSIS
     rxvt [options] [-e command [ args ]]

 DESCRIPTION
-    rxvt-unicode, version 6.3, is a colour vt102 terminal emulator intended
+    rxvt-unicode, version 7.0, is a colour vt102 terminal emulator intended
     as an *xterm*(1) replacement for users who do not require features such
     as Tektronix 4014 emulation and toolkit-style configurability. As a
     result, rxvt-unicode uses much less swap space -- a significant
@@ -409,13 +409,10 @@ RESOURCES (available also as long-options)
     Note: `rxvt --help' gives a list of all resources (long options)
     compiled into your version.

-    There are two different methods that rxvt can use to get the Xresource
-    data: using the X libraries (Xrm*-functions) or internal Xresources
-    reader (~/.Xdefaults). For the first method (ie. rxvt -h lists
-    XGetDefaults), you can set and change the resources using X11 tools like
-    xrdb. Many distribution do also load settings from the ~/.Xresources
-    file when X starts. rxvt will consult the following files/resources in
-    order, with later settings overwriting earlier ones:
+    You can set and change the resources using X11 tools like xrdb. Many
+    distribution do also load settings from the ~/.Xresources file when X
+    starts. rxvt will consult the following files/resources in order, with
+    later settings overwriting earlier ones:

       1. system-wide app-defaults file, either locale-dependent OR global
       2. app-defaults file in $XAPPLRESDIR
@@ -423,18 +420,15 @@ RESOURCES (available also as long-options)
       4. SCREEN_RESOURCES for the current screen
       5. $XENVIRONMENT file OR $HOME/.Xdefaults-

-    If compiled with internal Xresources support (i.e. rxvt -h lists
-    .Xdefaults) then rxvt accepts application defaults set in
-    XAPPLOADDIR/URxvt (compile-time defined: usually
-    /usr/lib/X11/app-defaults/URxvt) and resources set in ~/.Xdefaults, or
-    ~/.Xresources if ~/.Xdefaults does not exist. Note that when reading X
-    resources, rxvt recognizes two class names: XTerm and URxvt. The class
-    name Rxvt allows resources common to both rxvt and the original *rxvt*
-    to be easily configured, while the class name URxvt allows resources
-    unique to rxvt, notably colours and key-handling, to be shared between
-    different rxvt configurations. If no resources are specified, suitable
-    defaults will be used. Command-line arguments can be used to override
-    resource settings. The following resources are allowed:
+    Note that when reading X resources, rxvt recognizes two class names:
+    Rxvt and URxvt. The class name Rxvt allows resources common to both rxvt
+    and the original *rxvt* to be easily configured, while the class name
+    URxvt allows resources unique to rxvt, to be shared between different
+    rxvt configurations. If no resources are specified, suitable defaults
+    will be used. Command-line arguments can be used to override resource
+    settings. The following resources are supported (you might want to check
+    the rxvtperl(3) manpage for additional settings by perl extensions not
+    documented here):

     geometry: *geom*
         Create the window with the specified X window geometry [default
@@ -876,10 +870,10 @@ RESOURCES (available also as long-options)
         "^@": null, "^A" ...) and may be enclosed with double quotes so that
         it can start or end with whitespace.

-        Please note that you need to double the "\" when using
-        "--enable-xgetdefault", as X itself does it's own de-escaping (you
-        can use "\033" instead of "\e" (and so on), which will work with
-        both Xt and rxvt's own processing).
+        Please note that you need to double the "\" in resource files, as
+        Xlib itself does it's own de-escaping (you can use "\033" instead of
+        "\e" (and so on), which will work with both Xt and rxvt's own
+        processing).

         You can define a range of keysyms in one shot by providing a
         *string* with pattern list/PREFIX/MIDDLE/SUFFIX, where the delimeter
diff --git a/doc/rxvt.7.html b/doc/rxvt.7.html

--- a/doc/rxvt.7.html
+++ b/doc/rxvt.7.html
@@ -2940,19 +2940,6 @@ do it.
 Removes any support for resource checking.
 
 

-
--enable-xgetdefault

-
-

-Make resources checking via XGetDefault() instead of our small
-version which only checks ~/.Xdefaults, or if that doesn't exist then
-~/.Xresources.
-
-

-
Please note that nowadays, things like XIM will automatically pull in and
-use the full X resource manager, so the overhead of using it might be very
-small, if nonexistant.
-
-

 
--enable-strings (default: off)

 
 

diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in

--- a/doc/rxvt.7.man.in
+++ b/doc/rxvt.7.man.in
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rxvt 7"
-.TH rxvt 7 "2006-01-11" "6.3" "RXVT-UNICODE"
+.TH rxvt 7 "2006-01-11" "7.0" "RXVT-UNICODE"
 .SH "NAME"
 RXVT REFERENCE \- FAQ, command sequences and other background information
 .SH "SYNOPSIS"
@@ -2491,15 +2491,6 @@ do it.
 .IP "\-\-disable\-resources" 4
 .IX Item "--disable-resources"
 Removes any support for resource checking.
-.IP "\-\-enable\-xgetdefault" 4
-.IX Item "--enable-xgetdefault"
-Make resources checking via \fIXGetDefault()\fR instead of our small
-version which only checks ~/.Xdefaults, or if that doesn't exist then
-~/.Xresources.
-.Sp
-Please note that nowadays, things like \s-1XIM\s0 will automatically pull in and
-use the full X resource manager, so the overhead of using it might be very
-small, if nonexistant.
 .IP "\-\-enable\-strings (default: off)" 4
 .IX Item "--enable-strings (default: off)"
 Add support for our possibly faster \fImemset()\fR function and other
diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod

--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -2513,16 +2513,6 @@ do it.

 Removes any support for resource checking.

-=item --enable-xgetdefault
-
-Make resources checking via XGetDefault() instead of our small
-version which only checks ~/.Xdefaults, or if that doesn't exist then
-~/.Xresources.
-
-Please note that nowadays, things like XIM will automatically pull in and
-use the full X resource manager, so the overhead of using it might be very
-small, if nonexistant.
-
 =item --enable-strings (default: off)

 Add support for our possibly faster memset() function and other
diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt

--- a/doc/rxvt.7.txt
+++ b/doc/rxvt.7.txt
@@ -1965,15 +1965,6 @@ CONFIGURE OPTIONS
     --disable-resources
         Removes any support for resource checking.

-    --enable-xgetdefault
-        Make resources checking via XGetDefault() instead of our small
-        version which only checks ~/.Xdefaults, or if that doesn't exist
-        then ~/.Xresources.
-
-        Please note that nowadays, things like XIM will automatically pull
-        in and use the full X resource manager, so the overhead of using it
-        might be very small, if nonexistant.
-
     --enable-strings (default: off)
         Add support for our possibly faster memset() function and other
         various routines, overriding your system's versions which may have
diff --git a/reconf b/reconf

--- a/reconf
+++ b/reconf
@@ -10,6 +10,5 @@ if [ "x$HOSTNAME" = xcerebro -o "x$HOSTNAME" = xfuji ]; then
    export CC CXX
 fi

-./configure --prefix=/opt/rxvt --with-name=rxvt \
-            --enable-menubar --enable-xgetdefault \
+./configure --prefix=/opt/rxvt --with-name=rxvt --enable-menubar \
             "$@"
diff --git a/src/ptytty.C b/src/ptytty.C

--- a/src/ptytty.C
+++ b/src/ptytty.C
@@ -90,11 +90,11 @@ get_pty (int *fd_tty, char **ttydev)
 #endif

 #if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
-# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
+# if defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)

   {
-#  ifdef PTYS_ARE_GETPT
-    pfd = getpt ();
+#  ifdef PTYS_ARE_POSIX
+    pfd = posix_openpt (O_RDWR);
 #  else
     pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
 #  endif

-----END OF PAGE-----