*** empty log message ***

diff --git a/Changes b/Changes
index 94c7141..e7d94d7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -9,6 +9,7 @@ WISH: OnTheSpot editing, or maybe switch to miiiiiiif
 WISH: just for fun, do shade and tint with XRender.
 WISH: support tex fonts
 
+TODO: urxvt::popup is undocumented
        - added sections for DISTRIBUTION MAINTAINERS and about
           SETUID/SETGID to the FAQ.
         - selection, searchable-scrollback, selection-popup and
@@ -27,6 +28,8 @@ WISH: support tex fonts
           side effect, it also gets rid of XGetDefault calls.
         - 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.
 
 6.3  Wed Jan  4 22:37:10 CET 2006
         - SECURITY FIX: on systems using openpty, permissions were

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index 20138fd..dcab803 100644 (file)
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -136,6 +136,9 @@
 /* Define if you have the <libc.h> header file.  */
 #undef HAVE_LIBC_H
 
+/* Define if you have the <libutil.h> header file.  */
+#undef HAVE_LIBUTIL_H
+
 /* Define if you have the <pty.h> header file.  */
 #undef HAVE_PTY_H
 
@@ -178,6 +181,9 @@
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
+/* Define if you have the <util.h> header file.  */
+#undef HAVE_UTIL_H
+
 /* Define if you have the <utmp.h> header file.  */
 #undef HAVE_UTMP_H
 

diff --git a/autoconf/configure.in b/autoconf/configure.in
index c845b52..12c525b 100644 (file)
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -564,6 +564,8 @@ AC_CHECK_HEADERS( \
        utmpx.h \
         stdint.h \
         pty.h \
+        util.h \
+        libutil.h \
         wchar.h \
         cwchar \
         clocale \

diff --git a/configure b/configure
index f0d78bd..b9dade0 100755 (executable)
--- a/configure
+++ b/configure
@@ -7310,6 +7310,8 @@ done
 
 
 
+
+
 for ac_header in \
        assert.h \
        fcntl.h \
@@ -7332,6 +7334,8 @@ for ac_header in \
        utmpx.h \
         stdint.h \
         pty.h \
+        util.h \
+        libutil.h \
         wchar.h \
         cwchar \
         clocale \
@@ -12830,6 +12834,10 @@ fi
 
 
 
+if text x$support_perl = xyes; then
+   support_frills=yes
+fi
+
 
 CFLAGS=${CFLAGS--O}
 LDFLAGS=${LDFLAGS--O}

diff --git a/doc/rxvtperl.3.html b/doc/rxvtperl.3.html
index 3cd2e8c..03acad9 100644 (file)
--- a/doc/rxvtperl.3.html
+++ b/doc/rxvtperl.3.html
@@ -15,9 +15,10 @@
        <li><a href="#name">NAME</a></li>
        <li><a href="#synopsis">SYNOPSIS</a></li>
        <li><a href="#description">DESCRIPTION</a></li>
+       <li><a href="#prepackaged_extensions">PREPACKAGED EXTENSIONS</a></li>
+       <li><a href="#api_documentation">API DOCUMENTATION</a></li>
        <ul>
 
-               <li><a href="#prepackaged_extensions">Prepackaged Extensions</a></li>
                <li><a href="#general_api_considerations">General API Considerations</a></li>
                <li><a href="#extension_objects">Extension Objects</a></li>
                <li><a href="#hooks">Hooks</a></li>
@@ -74,8 +75,9 @@ thus must be encoded as UTF-8.</p>
 scripts will be shared (but not enabled) for all terminals.</p>
 <p>
 </p>
-<h2><a name="prepackaged_extensions">Prepackaged Extensions</a></h2>
-<p>This section describes the extensiosn delivered with this version. You can
+<hr />
+<h1><a name="prepackaged_extensions">PREPACKAGED EXTENSIONS</a></h1>
+<p>This section describes the extensions delivered with this release. You can
 find them in <em>/opt/rxvt/lib/urxvt/perl/</em>.</p>
 <p>You can activate them like this:</p>
 <pre>
@@ -84,13 +86,13 @@ find them in <em>/opt/rxvt/lib/urxvt/perl/</em>.</p>
 <dt><strong><a name="item_selection">selection (enabled by default)</a></strong><br />
 </dt>
 <dd>
-Intelligent selection. This extension tries to be more intelligent when
-the user extends selections (double-click). Right now, it tries to select
-urls and complete shell-quoted arguments, which is very convenient, too,
-if your <em>ls</em> supports <code>--quoting-style=shell</code>.
+(More) intelligent selection. This extension tries to be more intelligent
+when the user extends selections (double-click). Right now, it tries to
+select urls and complete shell-quoted arguments, which is very convenient,
+too, if your <em>ls</em> supports <code>--quoting-style=shell</code>.
 </dd>
 <dd>
-<p>It also offers the following bindable event:</p>
+<p>It also offers the following bindable keyboard command:</p>
 </dd>
 <dl>
 <dt><strong><a name="item_rot13">rot13</a></strong><br />
@@ -114,7 +116,8 @@ runtime.
 </dt>
 <dd>
 Binds a popup menu to Ctrl-Button3 that lets you convert the selection
-text into various other formats/action.
+text into various other formats/action (such as uri unescaping, perl
+evalution, web-browser starting etc.), depending on content.
 </dd>
 <p></p>
 <dt><strong><a name="item_searchable_2dscrollback_3chotkey_3e__28enabled_by_">searchable-scrollback&lt;hotkey&gt; (enabled by default)</a></strong><br />
@@ -161,6 +164,10 @@ overlays or changes.
 <p></p></dl>
 <p>
 </p>
+<hr />
+<h1><a name="api_documentation">API DOCUMENTATION</a></h1>
+<p>
+</p>
 <h2><a name="general_api_considerations">General API Considerations</a></h2>
 <p>All objects (such as terminals, time watchers etc.) are typical
 reference-to-hash objects. The hash can be used to store anything you

diff --git a/doc/rxvtperl.3.man.in b/doc/rxvtperl.3.man.in
index 2597fb9..2189ba5 100644 (file)
--- a/doc/rxvtperl.3.man.in
+++ b/doc/rxvtperl.3.man.in
@@ -162,9 +162,9 @@ thus must be encoded as \s-1UTF\-8\s0.
 .PP
 Each script will only ever be loaded once, even in @@RXVT_NAME@@d, where
 scripts will be shared (but not enabled) for all terminals.
-.Sh "Prepackaged Extensions"
-.IX Subsection "Prepackaged Extensions"
-This section describes the extensiosn delivered with this version. You can
+.SH "PREPACKAGED EXTENSIONS"
+.IX Header "PREPACKAGED EXTENSIONS"
+This section describes the extensions delivered with this release. You can
 find them in \fI@@RXVT_LIBDIR@@/urxvt/perl/\fR.
 .PP
 You can activate them like this:
@@ -174,12 +174,12 @@ You can activate them like this:
 .Ve
 .IP "selection (enabled by default)" 4
 .IX Item "selection (enabled by default)"
-Intelligent selection. This extension tries to be more intelligent when
-the user extends selections (double\-click). Right now, it tries to select
-urls and complete shell-quoted arguments, which is very convenient, too,
-if your \fIls\fR supports \f(CW\*(C`\-\-quoting\-style=shell\*(C'\fR.
+(More) intelligent selection. This extension tries to be more intelligent
+when the user extends selections (double\-click). Right now, it tries to
+select urls and complete shell-quoted arguments, which is very convenient,
+too, if your \fIls\fR supports \f(CW\*(C`\-\-quoting\-style=shell\*(C'\fR.
 .Sp
-It also offers the following bindable event:
+It also offers the following bindable keyboard command:
 .RS 4
 .IP "rot13" 4
 .IX Item "rot13"
@@ -198,7 +198,8 @@ runtime.
 .IP "selection-popup (enabled by default)" 4
 .IX Item "selection-popup (enabled by default)"
 Binds a popup menu to Ctrl\-Button3 that lets you convert the selection
-text into various other formats/action.
+text into various other formats/action (such as uri unescaping, perl
+evalution, web-browser starting etc.), depending on content.
 .IP "searchable\-scrollback<hotkey> (enabled by default)" 4
 .IX Item "searchable-scrollback<hotkey> (enabled by default)"
 Adds regex search functionality to the scrollback buffer, triggered
@@ -225,6 +226,8 @@ similar-looking ascii character.
 Displays a very simple digital clock in the upper right corner of the
 window. Illustrates overwriting the refresh callbacks to create your own
 overlays or changes.
+.SH "API DOCUMENTATION"
+.IX Header "API DOCUMENTATION"
 .Sh "General \s-1API\s0 Considerations"
 .IX Subsection "General API Considerations"
 All objects (such as terminals, time watchers etc.) are typical

diff --git a/doc/rxvtperl.3.txt b/doc/rxvtperl.3.txt
index 57a4b2b..ee4e5fe 100644 (file)
--- a/doc/rxvtperl.3.txt
+++ b/doc/rxvtperl.3.txt
@@ -23,8 +23,8 @@ DESCRIPTION
     Each script will only ever be loaded once, even in rxvtd, where scripts
     will be shared (but not enabled) for all terminals.
 
-  Prepackaged Extensions
-    This section describes the extensiosn delivered with this version. You
+PREPACKAGED EXTENSIONS
+    This section describes the extensions delivered with this release. You
     can find them in /opt/rxvt/lib/urxvt/perl/.
 
     You can activate them like this:
@@ -32,12 +32,13 @@ DESCRIPTION
       rxvt -pe <extensionname>
 
     selection (enabled by default)
-        Intelligent selection. This extension tries to be more intelligent
-        when the user extends selections (double-click). Right now, it tries
-        to select urls and complete shell-quoted arguments, which is very
-        convenient, too, if your ls supports "--quoting-style=shell".
+        (More) intelligent selection. This extension tries to be more
+        intelligent when the user extends selections (double-click). Right
+        now, it tries to select urls and complete shell-quoted arguments,
+        which is very convenient, too, if your ls supports
+        "--quoting-style=shell".
 
-        It also offers the following bindable event:
+        It also offers the following bindable keyboard command:
 
         rot13
             Rot-13 the selection when activated. Used via keyboard trigger:
@@ -50,7 +51,9 @@ DESCRIPTION
 
     selection-popup (enabled by default)
         Binds a popup menu to Ctrl-Button3 that lets you convert the
-        selection text into various other formats/action.
+        selection text into various other formats/action (such as uri
+        unescaping, perl evalution, web-browser starting etc.), depending on
+        content.
 
     searchable-scrollback<hotkey> (enabled by default)
         Adds regex search functionality to the scrollback buffer, triggered
@@ -79,6 +82,7 @@ DESCRIPTION
         the window. Illustrates overwriting the refresh callbacks to create
         your own overlays or changes.
 
+API DOCUMENTATION
   General API Considerations
     All objects (such as terminals, time watchers etc.) are typical
     reference-to-hash objects. The hash can be used to store anything you

diff --git a/src/main.C b/src/main.C
index dfaab15..1646a80 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -78,7 +78,7 @@ rxvt_set_locale (const char *locale)
   return true;
 }
 
-bool
+void
 rxvt_push_locale (const char *locale)
 {
   strcpy (savelocale, curlocale);

diff --git a/src/ptytty.C b/src/ptytty.C
index 8fe4a49..77a9aef 100644 (file)
--- a/src/ptytty.C
+++ b/src/ptytty.C
@@ -24,18 +24,15 @@
 #include "../config.h"         /* NECESSARY */
 #include "rxvt.h"
 
-#ifdef HAVE_STDLIB_H
 # include <cstdlib>
-#endif
+# include <cstring>
+
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#if defined(HAVE_STRING_H)
-# include <cstring>
-#endif
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
@@ -48,14 +45,11 @@
 #ifdef HAVE_ISASTREAM
 # include <stropts.h>
 #endif
-#ifdef HAVE_PTY_H
+#if defined(HAVE_PTY_H)
 # include <pty.h>
-#endif
-
-// better do this via configure, but....
-#if defined(__FreeBSD__)
+#elif defined(HAVE_LIBUTIL_H)
 # include <libutil.h>
-#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__))
+#elif defined(HAVE_UTIL_H)
 # include <util.h>
 #endif
 

diff --git a/src/rxvt.h b/src/rxvt.h
index a66c39e..82d45ad 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -841,7 +841,7 @@ extern void rxvt_exit_failure () __attribute__ ((noreturn));
 
 #define SET_LOCALE(locale) rxvt_set_locale (locale)
 extern bool rxvt_set_locale (const char *locale);
-extern bool rxvt_push_locale (const char *locale);
+extern void rxvt_push_locale (const char *locale);
 extern void rxvt_pop_locale ();
 
 /****************************************************************************/