-- Leo's gemini proxy

-- Connecting to git.thebackupbox.net:1965...

-- Connected

-- Sending request

-- Meta line: 20 text/gemini

repo: rxvt-unicode-sixel
action: commit
revision:
path_from:
revision_from: 82cce1c49e11750783d7795c7a9ebfdb4eb436bf:
path_to:
revision_to:

git.thebackupbox.net

rxvt-unicode-sixel

git://git.thebackupbox.net/rxvt-unicode-sixel

commit 82cce1c49e11750783d7795c7a9ebfdb4eb436bf
Author: Marc Lehmann <schmorp@schmorp.de>
Date:   Fri Jan 25 18:42:23 2008 +0000

    *** empty log message ***

diff --git a/Changes b/Changes

index 3b4f07ab426e7c6e60b42f837b6facacba74e224..

index ..48c717573fda7a257da9b412c9b369c931d8b543 100644

--- a/Changes
+++ b/Changes
@@ -17,7 +17,7 @@ WISH: load system-wide config file even if we don't have one
 WISH: look into XAddConnectionWatch, does anybody need that?
 DUMB: support tex fonts

-9.0
+9.0  Fri Jan 25 19:34:04 CET 2008
 	- fix a crash bug where urxvtd would crash when urxvtc was called
           with wrong arguments (I wish debian maintainers in general would
           report bugs and their proposed fixes to the original package maintaienrs
diff --git a/README.FAQ b/README.FAQ

index 54bbe5d05cd1bbb83a00c6c48676cfddea6b8b46..

index ..ba9ba0b858a7c94af2643dfe5b34ecb72833278b 100644

--- a/README.FAQ
+++ b/README.FAQ
@@ -993,7 +993,7 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS

            xprop -root XIM_SERVERS

-    *
+

    My input method wants <some encoding> but I want UTF-8, what can I do?
     You can specify separate locales for the input method and the rest of
diff --git a/README.configure b/README.configure

index f05b450282a9962c217916884f81aa94475caffb..

index ..e1102d0d67a74bd387bda8344a755231a2a34da1 100644

--- a/README.configure
+++ b/README.configure
@@ -36,13 +36,12 @@ CONFIGURE OPTIONS
         about 700kB), but it doesn't increase memory usage unless you use a
         font requiring one of these encodings.

-           all             all available codeset groups
-           zh              common chinese encodings
-           zh_ext          rarely used but very big chinese encodings
-           jp              common japanese encodings
-           jp_ext          rarely used but big japanese encodings
-           kr              korean encodings
-
+   all             all available codeset groups
+   zh              common chinese encodings
+   zh_ext          rarely used but very big chinese encodings
+   jp              common japanese encodings
+   jp_ext          rarely used but big japanese encodings
+   kr              korean encodings
     --enable-xim (default: on)
         Add support for XIM (X Input Method) protocol. This allows using
         alternative input methods (e.g. kinput2) and will also correctly set
diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in

index 037aa153d83eaf85b2a771db0bbba911cbae73ec..

index ..0e55d9d577b970416f9185c363c6c65f653c68dd 100644

--- a/doc/rxvt.1.man.in
+++ b/doc/rxvt.1.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35
+.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -25,11 +25,11 @@
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-
@@ -48,22 +48,25 @@
 .    ds R" ''
 'br\}
 .\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
 .\" If the F register is turned on, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
-.if \nF \{\
+.ie \nF \{\
 .    de IX
 .    tm Index:\\$1\t\\n%\t"\\$2"
 ..
 .    nr % 0
 .    rr F
 .\}
-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+.    de IX
+..
+.\}
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -129,7 +132,11 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 1"
-.TH @@RXVT_NAME@@ 1 "2007-12-24" "8.9" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 1 "2008-01-25" "8.9" "RXVT-UNICODE"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
 .SH "NAME"
 rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system)
 .SH "SYNOPSIS"
@@ -197,7 +204,7 @@ reference documentation (escape sequences etc.).
 .IX Header "OPTIONS"
 The \fB@@RXVT_NAME@@\fR options (mostly a subset of \fIxterm\fR's) are listed
 below. In keeping with the smaller-is-better philosophy, options may be
-eliminated or default values chosen at compile\-time, so options and
+eliminated or default values chosen at compile-time, so options and
 defaults listed may not accurately reflect the version installed on
 your system. `@@RXVT_NAME@@ \-h' gives a list of major compile-time options on
 the \fIOptions\fR line. Option descriptions may be prefixed with which
@@ -259,14 +266,14 @@ Tint the transparent background pixmap with the given colour when
 transparency is enabled with \fB\-tr\fR. This only works for
 non-tiled backgrounds, currently. See also the \fB\-sh\fR option that can be
 used to brighten or darken the image in addition to tinting it.
-Please note that certain tint colours can be applied on the server\-side,
+Please note that certain tint colours can be applied on the server-side,
 thus yielding performance gain of two orders of magnitude. These colours are:
 blue, red, green, cyan, magenta, yellow, and those close to them. Also
 pure black and pure white colors essentially mean no tinting; resource
 \&\fItintColor\fR. Example:
 .Sp
 .Vb 1
-\&   @@RXVT_NAME@@ -tr -tint blue -sh 40
+\&   @@RXVT_NAME@@ \-tr \-tint blue \-sh 40
 .Ve
 .IP "\fB\-sh\fR \fInumber\fR" 4
 .IX Item "-sh number"
@@ -281,7 +288,7 @@ transparency image, using method specified. Supported values are :
 \&\fBadd\fR, \fBalphablend\fR, \fBallanon\fR \- color values averaging, \fBcolorize\fR,
 \&\fBdarken\fR, \fBdiff\fR, \fBdissipate\fR, \fBhue\fR, \fBlighten\fR, \fBoverlay\fR,
 \&\fBsaturate\fR, \fBscreen\fR, \fBsub\fR, \fBtint\fR, \fBvalue\fR. The default is
-alpha\-blending. Compile \fIafterimage\fR; resource \fIblendType\fR.
+alpha-blending. Compile \fIafterimage\fR; resource \fIblendType\fR.
 .IP "\fB\-blr\fR \fIHxV\fR" 4
 .IX Item "-blr HxV"
 Apply Gaussian Blur with the specified radii to the transparent
@@ -301,7 +308,7 @@ Window foreground colour; resource \fBforeground\fR.
 Compile \fIafterimage\fR: Specify image file for the background and also
 optionally specify its scaling with a geometry string. Note you may need to
 add quotes to avoid special shell interpretation of the \f(CW\*(C`;\*(C'\fR in the
-command\-line; for more details see resource \fBbackgroundPixmap\fR.
+command-line; for more details see resource \fBbackgroundPixmap\fR.
 .IP "\fB\-cr\fR \fIcolour\fR" 4
 .IX Item "-cr colour"
 The cursor colour; resource \fBcursorColor\fR.
@@ -324,12 +331,12 @@ smaller, but not (in general) larger. A (hopefully) reasonable default
 font list is always appended to it. See resource \fBfont\fR for more details.
 .Sp
 In short, to specify an X11 core font, just specify its name or prefix it
-with \f(CW\*(C`x:\*(C'\fR. To specify an XFT\-font, you need to prefix it with \f(CW\*(C`xft:\*(C'\fR,
+with \f(CW\*(C`x:\*(C'\fR. To specify an XFT-font, you need to prefix it with \f(CW\*(C`xft:\*(C'\fR,
 e.g.:
 .Sp
 .Vb 2
-\&   @@RXVT_NAME@@ -fn "xft:Bitstream Vera Sans Mono:pixelsize=15"
-\&   @@RXVT_NAME@@ -fn "9x15bold,xft:Bitstream Vera Sans Mono"
+\&   @@RXVT_NAME@@ \-fn "xft:Bitstream Vera Sans Mono:pixelsize=15"
+\&   @@RXVT_NAME@@ \-fn "9x15bold,xft:Bitstream Vera Sans Mono"
 .Ve
 .Sp
 See also the question \*(L"How does rxvt-unicode choose fonts?\*(R" in the \s-1FAQ\s0
@@ -371,6 +378,13 @@ Turn on/off visual bell on receipt of a bell character; resource
 .IP "\fB\-sb\fR|\fB+sb\fR" 4
 .IX Item "-sb|+sb"
 Turn on/off scrollbar; resource \fBscrollBar\fR.
+.IP "\fB\-sr\fR|\fB+sr\fR" 4
+.IX Item "-sr|+sr"
+Put scrollbar on right/left; resource \fBscrollBar_right\fR.
+.IP "\fB\-st\fR|\fB+st\fR" 4
+.IX Item "-st|+st"
+Display rxvt (non XTerm/NeXT) scrollbar without/with a trough;
+resource \fBscrollBar_floating\fR.
 .IP "\fB\-si\fR|\fB+si\fR" 4
 .IX Item "-si|+si"
 Turn on/off scroll-to-bottom on \s-1TTY\s0 output inhibit; resource
@@ -384,13 +398,6 @@ Turn on/off scroll-to-bottom on keypress; resource
 Turn on/off scrolling with the scrollback buffer as new lines appear.
 This only takes effect if \fB\-si\fR is also given; resource
 \&\fBscrollWithBuffer\fR.
-.IP "\fB\-sr\fR|\fB+sr\fR" 4
-.IX Item "-sr|+sr"
-Put scrollbar on right/left; resource \fBscrollBar_right\fR.
-.IP "\fB\-st\fR|\fB+st\fR" 4
-.IX Item "-st|+st"
-Display rxvt (non XTerm/NeXT) scrollbar without/with a trough;
-resource \fBscrollBar_floating\fR.
 .IP "\fB\-ptab\fR|\fB+ptab\fR" 4
 .IX Item "-ptab|+ptab"
 If enabled (default), \*(L"Horizontal Tab\*(R" characters are being stored as
@@ -450,7 +457,7 @@ Run the command with its command-line arguments in the \fB@@RXVT_NAME@@\fR
 window; also sets the window title and icon name to be the basename of
 the program being executed if neither \fI\-title\fR (\fI\-T\fR) nor \fI\-n\fR are
 given on the command line. If this option is used, it must be the last
-on the command\-line. If there is no \fB\-e\fR option then the default is to
+on the command-line. If there is no \fB\-e\fR option then the default is to
 run the program specified by the \fB\s-1SHELL\s0\fR environment variable or,
 failing that, \fI\fIsh\fI\|(1)\fR.
 .Sp
@@ -458,7 +465,7 @@ Please note that you must specify a program with arguments. If you want to
 run shell commands, you have to specify the shell, like this:
 .Sp
 .Vb 1
-\&  @@RXVT_NAME@@ -e sh -c "shell commands"
+\&  @@RXVT_NAME@@ \-e sh \-c "shell commands"
 .Ve
 .IP "\fB\-title\fR \fItext\fR" 4
 .IX Item "-title text"
@@ -493,8 +500,8 @@ for more info.
 .IP "\fB\-tcw\fR" 4
 .IX Item "-tcw"
 Change the meaning of triple-click selection with the left mouse
-button. Only effective when the original (non\-perl) selection code is
-in\-use. Instead of selecting a full line it will extend the selection to
+button. Only effective when the original (non-perl) selection code is
+in-use. Instead of selecting a full line it will extend the selection to
 the end of the logical line only. resource \fBtripleclickwords\fR.
 .IP "\fB\-insecure\fR" 4
 .IX Item "-insecure"
@@ -558,9 +565,9 @@ used (a longer example is in \fIdoc/embed\fR):
 .Sp
 .Vb 5
 \&   my $rxvt = new Gtk2::Socket;
-\&   $rxvt->signal_connect_after (realize => sub {
-\&      my $xid = $_[0]->window->get_xid;
-\&      system "@@RXVT_NAME@@ -embed $xid &";
+\&   $rxvt\->signal_connect_after (realize => sub {
+\&      my $xid = $_[0]\->window\->get_xid;
+\&      system "@@RXVT_NAME@@ \-embed $xid &";
 \&   });
 .Ve
 .IP "\fB\-pty\-fd\fR \fIfile descriptor\fR" 4
@@ -584,18 +591,14 @@ longer example is in \fIdoc/pty\-fd\fR):
 .Vb 2
 \&   use IO::Pty;
 \&   use Fcntl;
-.Ve
-.Sp
-.Vb 4
+\&
 \&   my $pty = new IO::Pty;
-\&   fcntl $pty, F_SETFD, 0; # clear close-on-exec
-\&   system "@@RXVT_NAME@@ -pty-fd " . (fileno $pty) . "&";
+\&   fcntl $pty, F_SETFD, 0; # clear close\-on\-exec
+\&   system "@@RXVT_NAME@@ \-pty\-fd " . (fileno $pty) . "&";
 \&   close $pty;
-.Ve
-.Sp
-.Vb 3
+\&
 \&   # now communicate with rxvt
-\&   my $slave = $pty->slave;
+\&   my $slave = $pty\->slave;
 \&   while (<$slave>) { print $slave "got <$_>\en" }
 .Ve
 .IP "\fB\-pe\fR \fIstring\fR" 4
@@ -606,7 +609,7 @@ this terminal instance. See resource \fBperl-ext\fR for details.
 .IX Header "RESOURCES"
 Note: `@@RXVT_NAME@@ \-\-help' gives a list of all resources (long
 options) compiled into your version. All resources are also available as
-long\-options.
+long-options.
 .PP
 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
@@ -614,12 +617,12 @@ starts. @@RXVT_NAME@@ will consult the following files/resources in order,
 with later settings overwriting earlier ones:
 .PP
 .Vb 6
-\&  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
+\&  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>
-\&  6. resources specified via -xrm on the commandline
+\&  5. $XENVIRONMENT file OR $HOME/.Xdefaults\-<nodename>
+\&  6. resources specified via \-xrm on the commandline
 .Ve
 .PP
 Note that when reading X resources, \fB@@RXVT_NAME@@\fR recognizes two class
@@ -773,18 +776,18 @@ Additional operations can be specified after colon \fB:op1:op2...\fR.
 Supported operations are:
 .Sp
 .Vb 8
-\&  tile        force background image to be tiled and not scaled. Equivalent to 0x0,
-\&  propscale   will scale image keeping proportions,
-\&  auto        will scale image to match window size. Equivalent to 100x100;
-\&  hscale      will scale image horizontally to the window size;
-\&  vscale      will scale image vertically to the window size;
-\&  scale       will scale image to match window size;
-\&  root        will tile image as if it was a root window background, auto-adjusting
-\&              whenever terminal window moves.
+\&  tile        force background image to be tiled and not scaled. Equivalent to 0x0
+\&  propscale   will scale image keeping proportions
+\&  auto        will scale image to match window size. Equivalent to 100x100
+\&  hscale      will scale image horizontally to the window size
+\&  vscale      will scale image vertically to the window size
+\&  scale       will scale image to match window size
+\&  root        will tile image as if it was a root window background, auto\-adjusting
+\&              whenever terminal window moves
 .Ve
 .Sp
 If used in conjunction with \fB\-tr\fR option, the specified pixmap will be
-blended over transparency image using either alpha\-blending, or any
+blended over transparency image using either alpha-blending, or any
 other blending type, specified with \fB\-blt \*(L"type\*(R"\fR option.
 .IP "\fBpath:\fR \fIpath\fR" 4
 .IX Item "path: path"
@@ -809,8 +812,8 @@ For example, this font resource
 .Sp
 .Vb 5
 \&   URxvt.font: 9x15bold,\e
-\&               -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\e
-\&               -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \e
+\&               \-misc\-fixed\-bold\-r\-normal\-\-15\-140\-75\-75\-c\-90\-iso10646\-1,\e
+\&               \-misc\-fixed\-medium\-r\-normal\-\-15\-140\-75\-75\-c\-90\-iso10646\-1, \e
 \&               [codeset=JISX0208]xft:Kochi Gothic:antialias=false, \e
 \&               xft:Code2000:antialias=false
 .Ve
@@ -821,7 +824,7 @@ it is named first) and thus defines the character cell grid to be 9 pixels
 wide and 15 pixels high.
 .Sp
 The second font is just used to add additional unicode characters not in
-the base font, likewise the third, which is unfortunately non\-bold, but
+the base font, likewise the third, which is unfortunately non-bold, but
 the bold version of the font does contain less characters, so this is a
 useful supplement.
 .Sp
@@ -842,7 +845,7 @@ remaining unicode characters.
 The font list to use for displaying \fBbold\fR, \fIitalic\fR or \fB\f(BIbold
 italic\fB\fR characters, respectively.
 .Sp
-If specified and non\-empty, then the syntax is the same as for the
+If specified and non-empty, then the syntax is the same as for the
 \&\fBfont\fR\-resource, and the given font list will be used as is, which makes
 it possible to substitute completely different font styles for bold and
 italic.
@@ -860,10 +863,6 @@ option \fB\-is\fR, the default), bold/blink font styles imply high
 intensity foreground/background colours. Disabling this option (\fBFalse\fR,
 option \fB+is\fR) disables this behaviour, the high intensity colours are not
 reachable.
-.IP "\fBscrollstyle:\fR \fImode\fR" 4
-.IX Item "scrollstyle: mode"
-Set scrollbar style to \fBrxvt\fR, \fBplain\fR, \fBnext\fR or \fBxterm\fR. \fBplain\fR is
-the author's favourite.
 .IP "\fBtitle:\fR \fIstring\fR" 4
 .IX Item "title: string"
 Set window title string, the default title is the command-line
@@ -896,22 +895,26 @@ the shell; option \fB\-ls\fR. \fBFalse\fR: start as a normal sub-shell
 \&\fBTrue\fR: inhibit writing record into the system log file \fButmp\fR;
 option \fB\-ut\fR. \fBFalse\fR: write record into the system log file \fButmp\fR
 [default]; option \fB+ut\fR.
-.IP "\fBprint\-pipe:\fR \fIstring\fR" 4
+.IP "\fBprint-pipe:\fR \fIstring\fR" 4
 .IX Item "print-pipe: string"
 Specify a command pipe for vt100 printer [default \fI\fIlpr\fI\|(1)\fR]. Use
 \&\fBPrint\fR to initiate a screen dump to the printer and \fBCtrl-Print\fR or
 \&\fBShift-Print\fR to include the scrollback as well.
 .Sp
-The string will be interpreted as if typed into the shell as\-is.
+The string will be interpreted as if typed into the shell as-is.
 .Sp
 Example:
 .Sp
 .Vb 1
-\&   URxvt.print-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)
+\&   URxvt.print\-pipe: cat > $(TMPDIR=$HOME mktemp urxvt.XXXXXX)
 .Ve
 .Sp
 This creates a new file in your home directory with the screen contents
 every time you hit \f(CW\*(C`Print\*(C'\fR.
+.IP "\fBscrollstyle:\fR \fImode\fR" 4
+.IX Item "scrollstyle: mode"
+Set scrollbar style to \fBrxvt\fR, \fBplain\fR, \fBnext\fR or \fBxterm\fR. \fBplain\fR is
+the author's favourite.
 .IP "\fBscrollBar:\fR \fIboolean\fR" 4
 .IX Item "scrollBar: boolean"
 \&\fBTrue\fR: enable the scrollbar [default]; option \fB\-sb\fR. \fBFalse\fR:
@@ -1066,7 +1069,7 @@ default. (Note that many other terminals, including xterm, have these
 sequences enabled by default, which doesn't make it safer, though).
 .Sp
 You can enable them by setting this boolean resource or specifying
-\&\fB\-insecure\fR as an option. At the moment, this enables display\-answer,
+\&\fB\-insecure\fR as an option. At the moment, this enables display-answer,
 locale, findfont, icon label and window title requests.
 .IP "\fBmodifier:\fR \fImodifier\fR" 4
 .IX Item "modifier: modifier"
@@ -1075,7 +1078,7 @@ Set the key to be interpreted as the Meta key to: \fBalt\fR, \fBmeta\fR,
 \&\fB\-mod\fR.
 .IP "\fBanswerbackString:\fR \fIstring\fR" 4
 .IX Item "answerbackString: string"
-Specify the reply rxvt-unicode sends to the shell when an \s-1ENQ\s0 (control\-E)
+Specify the reply rxvt-unicode sends to the shell when an \s-1ENQ\s0 (control-E)
 character is passed through. It may contain escape values as described
 in the entry on \fBkeysym\fR following.
 .IP "\fBsecondaryScreen:\fR \fIboolean\fR" 4
@@ -1125,15 +1128,15 @@ should be a character not used by the strings.
 Its usage can be demonstrated by an example:
 .Sp
 .Vb 1
-\&  URxvt.keysym.M-C-0x61:    list|\e033<M-C-|abc|>
+\&  URxvt.keysym.M\-C\-0x61:    list|\e033<M\-C\-|abc|>
 .Ve
 .Sp
 The above line is equivalent to the following three lines:
 .Sp
 .Vb 3
-\&  URxvt.keysym.Meta-Control-0x61:    \e033<M-C-a>
-\&  URxvt.keysym.Meta-Control-0x62:    \e033<M-C-b>
-\&  URxvt.keysym.Meta-Control-0x63:    \e033<M-C-c>
+\&  URxvt.keysym.Meta\-Control\-0x61:    \e033<M\-C\-a>
+\&  URxvt.keysym.Meta\-Control\-0x62:    \e033<M\-C\-b>
+\&  URxvt.keysym.Meta\-Control\-0x63:    \e033<M\-C\-c>
 .Ve
 .Sp
 If \fIstring\fR takes the form of \f(CW\*(C`command:STRING\*(C'\fR, the specified \fB\s-1STRING\s0\fR
@@ -1142,7 +1145,7 @@ example the following means "change the current locale to \f(CW\*(C`zh_CN.GBK\*(
 when Control-Meta-c is being pressed":
 .Sp
 .Vb 1
-\&  URxvt.keysym.M-C-c: command:\e033]701;zh_CN.GBK\e007
+\&  URxvt.keysym.M\-C\-c: command:\e033]701;zh_CN.GBK\e007
 .Ve
 .Sp
 If \fIstring\fR takes the form \f(CW\*(C`perl:STRING\*(C'\fR, then the specified \fB\s-1STRING\s0\fR
@@ -1151,7 +1154,7 @@ manpage. For example, the \fIselection\fR extension (activated via
 \&\f(CW\*(C`@@RXVT_NAME@@ \-pe selection\*(C'\fR) listens for \f(CW\*(C`selection:rot13\*(C'\fR events:
 .Sp
 .Vb 1
-\&  URxvt.keysym.M-C-c: perl:selection:rot13
+\&  URxvt.keysym.M\-C\-c: perl:selection:rot13
 .Ve
 .Sp
 Due the the large number of modifier combinations, a defined key mapping
@@ -1168,7 +1171,7 @@ user-defined keymap using the \f(CW\*(C`builtin:\*(C'\fR replacement:
 .Sp
 .Vb 2
 \&  URxvt.keysym.Insert: <my insert key sequence>
-\&  URxvt.keysym.S-Insert: builtin:
+\&  URxvt.keysym.S\-Insert: builtin:
 .Ve
 .Sp
 The first line defines a mapping for \f(CW\*(C`Insert\*(C'\fR and \fIany\fR combination
@@ -1180,16 +1183,16 @@ the fonts \f(CW\*(C`suxuseuro\*(C'\fR and \f(CW\*(C`9x15bold\*(C'\fR, so you can
 font-switching at runtime:
 .Sp
 .Vb 2
-\&  URxvt.keysym.M-C-1: command:\e033]50;suxuseuro\e007
-\&  URxvt.keysym.M-C-2: command:\e033]50;9x15bold\e007
+\&  URxvt.keysym.M\-C\-1: command:\e033]50;suxuseuro\e007
+\&  URxvt.keysym.M\-C\-2: command:\e033]50;9x15bold\e007
 .Ve
 .Sp
 Other things are possible, e.g. resizing (see @@RXVT_NAME@@(7) for more
 info):
 .Sp
 .Vb 2
-\&  URxvt.keysym.M-C-3: command:\e033[8;25;80t
-\&  URxvt.keysym.M-C-4: command:\e033[8;48;110t
+\&  URxvt.keysym.M\-C\-3: command:\e033[8;25;80t
+\&  URxvt.keysym.M\-C\-4: command:\e033[8;48;110t
 .Ve
 .IP "\fBperl-ext-common\fR: \fIstring\fR" 4
 .IX Item "perl-ext-common: string"
@@ -1237,11 +1240,11 @@ See the @@RXVT_NAME@@\fIperl\fR\|(3) manpage.
 .IX Item "selection.pattern-idx: perl-regex"
 Additional selection patterns, see the @@RXVT_NAME@@\fIperl\fR\|(3) manpage for
 details.
-.IP "\fBselection\-autotransform.\f(BIidx\fB\fR: \fIperl-transform\fR" 4
+.IP "\fBselection-autotransform.\f(BIidx\fB\fR: \fIperl-transform\fR" 4
 .IX Item "selection-autotransform.idx: perl-transform"
 Selection auto-transform patterns, see the @@RXVT_NAME@@\fIperl\fR\|(3) manpage
 for details.
-.IP "\fBsearchable\-scrollback:\fR \fIkeysym\fR" 4
+.IP "\fBsearchable-scrollback:\fR \fIkeysym\fR" 4
 .IX Item "searchable-scrollback: keysym"
 Sets the hotkey that starts the incremental scrollback buffer search
 (default: \f(CW\*(C`M\-s\*(C'\fR).
@@ -1310,19 +1313,19 @@ inserted too.
 .SH "CHANGING FONTS"
 .IX Header "CHANGING FONTS"
 Changing fonts (or font sizes, respectively) via the keypad is not yet
-supported in rxvt\-unicode. Bug me if you need this.
+supported in rxvt-unicode. Bug me if you need this.
 .PP
 You can, however, switch fonts at runtime using escape sequences, e.g.:
 .PP
 .Vb 1
-\&   printf '\ee]710;%s\e007' "9x15bold,xft:Kochi Gothic"
+\&   printf \*(Aq\ee]710;%s\e007\*(Aq "9x15bold,xft:Kochi Gothic"
 .Ve
 .PP
 You can use keyboard shortcuts, too:
 .PP
 .Vb 2
-\&   URxvt.keysym.M-C-1: command:\e033]710;suxuseuro\e007\e033]711;suxuseuro\e007
-\&   URxvt.keysym.M-C-2: command:\e033]710;9x15bold\e007\e033]711;9x15bold\e007
+\&   URxvt.keysym.M\-C\-1: command:\e033]710;suxuseuro\e007\e033]711;suxuseuro\e007
+\&   URxvt.keysym.M\-C\-2: command:\e033]710;9x15bold\e007\e033]711;9x15bold\e007
 .Ve
 .PP
 rxvt-unicode will automatically re-apply these fonts to the output so far.
@@ -1333,8 +1336,9 @@ and character codes using the keyboard. It consists of 4 parts. The
 first part is available if rxvt-unicode has been compiled with
 \&\f(CW\*(C`\-\-enable\-frills\*(C'\fR, the rest is available when rxvt-unicode was compiled
 with \f(CW\*(C`\-\-enable\-iso14755\*(C'\fR.
-.IP "* 5.1: Basic method" 4
-.IX Item "5.1: Basic method"
+.IP "\(bu" 4
+5.1: Basic method
+.Sp
 This allows you to enter unicode characters using their hexcode.
 .Sp
 Start by pressing and holding both \f(CW\*(C`Control\*(C'\fR and \f(CW\*(C`Shift\*(C'\fR, then enter
@@ -1349,8 +1353,9 @@ address, which you cannot type. Fortunately, the card has the e\-mail
 address printed as hexcodes, e.g. \f(CW\*(C`671d 65e5\*(C'\fR. You can enter this easily
 by pressing \f(CW\*(C`Control\*(C'\fR and \f(CW\*(C`Shift\*(C'\fR, followed by \f(CW\*(C`6\-7\-1\-D\-SPACE\-6\-5\-E\-5\*(C'\fR,
 followed by releasing the modifier keys.
-.IP "* 5.2: Keyboard symbols entry method" 4
-.IX Item "5.2: Keyboard symbols entry method"
+.IP "\(bu" 4
+5.2: Keyboard symbols entry method
+.Sp
 This mode lets you input characters representing the keycap symbols of
 your keyboard, if representable in the current locale encoding.
 .Sp
@@ -1360,13 +1365,15 @@ invoke its usual function but instead will insert the corresponding
 keycap symbol. The symbol will only be entered when the key has been
 released, otherwise pressing e.g. \f(CW\*(C`Shift\*(C'\fR would enter the symbol for
 \&\f(CW\*(C`ISO Level 2 Switch\*(C'\fR, although your intention might have been to enter a
-reverse tab (Shift\-Tab).
-.IP "* 5.3: Screen-selection entry method" 4
-.IX Item "5.3: Screen-selection entry method"
+reverse tab (Shift-Tab).
+.IP "\(bu" 4
+5.3: Screen-selection entry method
+.Sp
 While this is implemented already (it's basically the selection
 mechanism), it could be extended by displaying a unicode character map.
-.IP "* 5.4: Feedback method for identifying displayed characters for later input" 4
-.IX Item "5.4: Feedback method for identifying displayed characters for later input"
+.IP "\(bu" 4
+5.4: Feedback method for identifying displayed characters for later input
+.Sp
 This method lets you display the unicode character code associated with
 characters already displayed.
 .Sp
@@ -1415,7 +1422,6 @@ color15	(bright white)	= White
 foreground		= Black
 background		= White
 .TE
-
 .PP
 It is also possible to specify the colour values of \fBforeground\fR,
 \&\fBbackground\fR, \fBcursorColor\fR, \fBcursorColor2\fR, \fBcolorBD\fR, \fBcolorUL\fR as
@@ -1442,28 +1448,50 @@ on White.
 .Sh "\s-1ALPHA\s0 \s-1CHANNEL\s0 \s-1SUPPORT\s0"
 .IX Subsection "ALPHA CHANNEL SUPPORT"
 If Xft support has been compiled in and as long as Xft/Xrender/X don't get
-their act together, rxvt-unicode will support \f(CW\*(C`rgba:rrrr/gggg/bbbb/aaaa\*(C'\fR
-(recommended, but \fB\s-1MUST\s0\fR have 4 digits/component) colour specifications,
-in addition to the ones provided by X, where the additional A component
-specifies opacity (alpha) values. The minimum value of \f(CW0\fR is completely
-transparent). You can also prefix any color with \f(CW\*(C`[percent]\*(C'\fR, where
-\&\f(CW\*(C`percent\*(C'\fR is a decimal percentage (0\-100) that specifies the opacity of
-the color, where \f(CW0\fR is completely transparent and \f(CW100\fR is completelxy
-opaque.
+their act together, rxvt-unicode will do it's own alpha channel management:
+.PP
+You can prefix any color with an opaquenes percentage enclosed in
+brackets, i.e. \f(CW\*(C`[percent]\*(C'\fR, where \f(CW\*(C`percent\*(C'\fR is a decimal percentage
+(0\-100) that specifies the opacity of the color, where \f(CW0\fR is completely
+transparent and \f(CW100\fR is completely opaque. For example, \f(CW\*(C`[50]red\*(C'\fR is a
+half-transparent red, while \f(CW\*(C`[95]#00ff00\*(C'\fR is an almost opaque green. This
+is the recommended format to specify transparency values, and works with
+all ways to specify a colour.
+.PP
+For complete control, rxvt-unicode also supports
+\&\f(CW\*(C`rgba:rrrr/gggg/bbbb/aaaa\*(C'\fR (exactly four hex digits/component) colour
+specifications, where the additional \f(CW\*(C`aaaa\*(C'\fR component specifies opacity
+(alpha) values. The minimum value of \f(CW0000\fR is completely transparent,
+while \f(CW\*(C`ffff\*(C'\fR is completely opaque). The two example colours from
+earlier could also be specified as \f(CW\*(C`rgba:ff00/0000/0000/8000\*(C'\fR and
+\&\f(CW\*(C`rgba:0000/ff00/0000/f332\*(C'\fR.
 .PP
-You probably need to specify \fB\*(L"\-depth 32\*(R"\fR, too, and have the luck that
-your X\-server uses \s-1ARGB\s0 pixel layout, as X is far from just supporting
-\&\s-1ARGB\s0 visuals out of the box, and rxvt-unicode just fudges around.
+You probably need to specify \fB\*(L"\-depth 32\*(R"\fR, too, to force a visual with
+alpha channels, and have the luck that your X\-server uses \s-1ARGB\s0 pixel
+layout, as X is far from just supporting \s-1ARGB\s0 visuals out of the box, and
+rxvt-unicode just fudges around.
 .PP
-For example, the following selects an almost completely transparent red
+For example, the following selects an almost completely transparent black
 background, and an almost opaque pink foreground:
 .PP
 .Vb 1
-\&   @@RXVT_NAME@@ -depth 32 -bg rgba:0000/0000/0000/aaaa -fg "[80]pink"
+\&   @@RXVT_NAME@@ \-depth 32 \-bg rgba:0000/0000/0000/4444 \-fg "[80]pink"
 .Ve
 .PP
-\&\fIPlease note that transparency of any kind if completely unsupported by
-the author. Don't bug him with installation questions!\fR
+When not using a background image, then the interpretation of the
+alpha channel is up to your compositing manager (most interpret it as
+transparency of course).
+.PP
+When using a background pixmap or pseudo-transparency, then the background
+colour will always behave as if it were completely transparent (so the
+background image shows instead), regardless of how it was specified, while
+other colours will either be transparent as specified (the background
+image will show through) on servers supporting the \s-1RENDER\s0 extension, or
+fully opaque on servers not supporting the \s-1RENDER\s0 \s-1EXTENSION\s0.
+.PP
+Please note that due to bugs in Xft, specifying alpha values might result
+in garbage being displayed when the X\-server does not support the \s-1RENDER\s0
+extension.
 .SH "ENVIRONMENT"
 .IX Header "ENVIRONMENT"
 \&\fB@@RXVT_NAME@@\fR sets and/or uses the following environment variables:
@@ -1507,7 +1535,7 @@ The shell to be used for command execution, defaults to \f(CW\*(C`/bin/sh\*(C'\f
 The unix domain socket path used by @@RXVT_NAME@@c(1) and
 @@RXVT_NAME@@d(1).
 .Sp
-Default \fI$HOME/.rxvt\-unicode\-\fI<nodename\fI\fR.
+Default \fI\f(CI$HOME\fI/.rxvt\-unicode\-\fI<nodename\fI\fR.
 .IP "\fB\s-1HOME\s0\fR" 4
 .IX Item "HOME"
 Used to locate the default directory for the unix domain socket for
@@ -1558,10 +1586,10 @@ Project Coordinator (changes.txt 2.21a to 2.4.5)
 .IX Item "Geoff Wing <gcw@pobox.com>"
 Rewrote screen display and text selection routines.
 .Sp
-Project Coordinator (changes.txt 2.4.6 \- rxvt\-unicode)
+Project Coordinator (changes.txt 2.4.6 \- rxvt-unicode)
 .IP "Marc Alexander Lehmann <rxvt\-unicode@schmorp.de>" 4
 .IX Item "Marc Alexander Lehmann <rxvt-unicode@schmorp.de>"
-Forked rxvt\-unicode, unicode support, rewrote almost all the code, perl
+Forked rxvt-unicode, unicode support, rewrote almost all the code, perl
 extension, random hacks, numerous bugfixes and extensions.
 .Sp
 Project Coordinator (Changes 1.0 \-)
diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod

index a7da0722f0c34a255a97863f7bbae47392c3b1c8..

index ..23807092b69e6e41a4bd75c4183422db94ba424e 100644

--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -103,6 +103,11 @@ B<DISPLAY> environment variable is used.
 Compile I<xft>: Attempt to find a visual with the given bit depth;
 resource B<depth>.

+[Please note that many X servers (and libXft) are buggy with
+respect to C<-depth 32> and/or alpha channels, and will cause all sorts
+of graphical corruption. This is harmless, but we can't do anything about
+this, so watch out]
+
 =item B<-geometry> I<geom>

 Window geometry (B<-g> still respected); resource B<geometry>.
diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in

index 5bfae095411c46435731d10f2ca0b12f36ed6bec..

index ..80863cf1134015c6e80a811bd8b5fcc9ec066294 100644

--- a/doc/rxvt.7.man.in
+++ b/doc/rxvt.7.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35
+.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -25,11 +25,11 @@
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-
@@ -48,22 +48,25 @@
 .    ds R" ''
 'br\}
 .\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
 .\" If the F register is turned on, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
-.if \nF \{\
+.ie \nF \{\
 .    de IX
 .    tm Index:\\$1\t\\n%\t"\\$2"
 ..
 .    nr % 0
 .    rr F
 .\}
-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+.    de IX
+..
+.\}
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -129,24 +132,24 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 7"
-.TH @@RXVT_NAME@@ 7 "2007-12-24" "8.9" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 7 "2008-01-25" "8.9" "RXVT-UNICODE"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
 .SH "NAME"
 RXVT REFERENCE \- FAQ, command sequences and other background information
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 .Vb 2
 \&   # set a new font set
-\&   printf '\e33]50;%s\e007' 9x15,xft:Kochi" Mincho"
-.Ve
-.PP
-.Vb 2
-\&   # change the locale and tell rxvt-unicode about it
-\&   export LC_CTYPE=ja_JP.EUC-JP; printf "\e33]701;$LC_CTYPE\e007"
-.Ve
-.PP
-.Vb 2
+\&   printf \*(Aq\e33]50;%s\e007\*(Aq 9x15,xft:Kochi" Mincho"
+\&
+\&   # change the locale and tell rxvt\-unicode about it
+\&   export LC_CTYPE=ja_JP.EUC\-JP; printf "\e33]701;$LC_CTYPE\e007"
+\&
 \&   # set window title
-\&   printf '\e33]2;%s\e007' "new window title"
+\&   printf \*(Aq\e33]2;%s\e007\*(Aq "new window title"
 .Ve
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
@@ -169,7 +172,7 @@ Before sending me mail, you could go to \s-1IRC:\s0 \f(CW\*(C`irc.freenode.net\*
 channel \f(CW\*(C`#rxvt\-unicode\*(C'\fR has some rxvt-unicode enthusiasts that might be
 interested in learning about new and exciting problems (but not FAQs :).
 .PP
-\fIDoes it support tabs, can I have a tabbed rxvt\-unicode?\fR
+\fIDoes it support tabs, can I have a tabbed rxvt-unicode?\fR
 .IX Subsection "Does it support tabs, can I have a tabbed rxvt-unicode?"
 .PP
 Beginning with version 7.3, there is a perl extension that implements a
@@ -177,11 +180,9 @@ simple tabbed terminal. It is installed by default, so any of these should
 give you tabs:
 .PP
 .Vb 1
-\&   @@URXVT_NAME@@ -pe tabbed
-.Ve
-.PP
-.Vb 1
-\&   URxvt.perl-ext-common: default,tabbed
+\&   @@URXVT_NAME@@ \-pe tabbed
+\&
+\&   URxvt.perl\-ext\-common: default,tabbed
 .Ve
 .PP
 It will also work fine with tabbing functionality of many window managers
@@ -229,8 +230,8 @@ If you want to start @@URXVT_NAME@@d automatically whenever you run
 .Vb 6
 \&   #!/bin/sh
 \&   @@URXVT_NAME@@c "$@"
-\&   if [ $? -eq 2 ]; then
-\&      @@URXVT_NAME@@d -q -o -f
+\&   if [ $? \-eq 2 ]; then
+\&      @@URXVT_NAME@@d \-q \-o \-f
 \&      @@URXVT_NAME@@c "$@"
 \&   fi
 .Ve
@@ -263,14 +264,14 @@ snippets:
 .PP
 .Vb 12
 \&   # Bourne/Korn/POSIX family of shells:
-\&   [ ${TERM:-foo} = foo ] && TERM=xterm # assume an xterm if we don't know
-\&   if [ ${TERM:-foo} = xterm ]; then
-\&      stty -icanon -echo min 0 time 15 # see if enhanced rxvt or not
-\&      echo -n '^[Z'
+\&   [ ${TERM:\-foo} = foo ] && TERM=xterm # assume an xterm if we don\*(Aqt know
+\&   if [ ${TERM:\-foo} = xterm ]; then
+\&      stty \-icanon \-echo min 0 time 15 # see if enhanced rxvt or not
+\&      echo \-n \*(Aq^[Z\*(Aq
 \&      read term_id
 \&      stty icanon echo
-\&      if [ ""${term_id} = '^[[?1;2C' -a ${DISPLAY:-foo} = foo ]; then
-\&         echo -n '^[[7n'        # query the rxvt we are in for the DISPLAY string
+\&      if [ ""${term_id} = \*(Aq^[[?1;2C\*(Aq \-a ${DISPLAY:\-foo} = foo ]; then
+\&         echo \-n \*(Aq^[[7n\*(Aq        # query the rxvt we are in for the DISPLAY string
 \&         read DISPLAY           # set it in our local shell
 \&      fi
 \&   fi
@@ -296,8 +297,8 @@ already in use in this mode.
 .PP
 .Vb 3
 \&    text    data     bss     drs     rss filename
-\&   98398    1664      24   15695    1824 rxvt --disable-everything
-\&  188985    9048   66616   18222    1788 urxvt --disable-everything
+\&   98398    1664      24   15695    1824 rxvt \-\-disable\-everything
+\&  188985    9048   66616   18222    1788 urxvt \-\-disable\-everything
 .Ve
 .PP
 When you \f(CW\*(C`\-\-enable\-everything\*(C'\fR (which \fIis\fR unfair, as this involves xft
@@ -306,8 +307,8 @@ libc), the two diverge, but not unreasonably so.
 .PP
 .Vb 3
 \&    text    data     bss     drs     rss filename
-\&  163431    2152      24   20123    2060 rxvt --enable-everything
-\& 1035683   49680   66648   29096    3680 urxvt --enable-everything
+\&  163431    2152      24   20123    2060 rxvt \-\-enable\-everything
+\& 1035683   49680   66648   29096    3680 urxvt \-\-enable\-everything
 .Ve
 .PP
 The very large size of the text section is explained by the east-asian
@@ -353,17 +354,17 @@ system with a minimal config:
 \&   libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
 \&   libc.so.6 => /lib/libc.so.6 (0x00002aaaaadde000)
 \&   libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab01d000)
-\&   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)
+\&   /lib64/ld\-linux\-x86\-64.so.2 (0x00002aaaaaaab000)
 .Ve
 .PP
-And here is rxvt\-unicode:
+And here is rxvt-unicode:
 .PP
 .Vb 5
 \&   libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x00002aaaaabc3000)
 \&   libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x00002aaaaada2000)
 \&   libc.so.6 => /lib/libc.so.6 (0x00002aaaaaeb0000)
 \&   libdl.so.2 => /lib/libdl.so.2 (0x00002aaaab0ee000)
-\&   /lib64/ld-linux-x86-64.so.2 (0x00002aaaaaaab000)
+\&   /lib64/ld\-linux\-x86\-64.so.2 (0x00002aaaaaaab000)
 .Ve
 .PP
 No large bloated libraries (of course, none were linked in statically),
@@ -378,25 +379,25 @@ sasha@aftercode.net and do not bug the author about it. Also, if you can't
 get it working consider it a rite of passage: ... and you failed.
 .PP
 Here are four ways to get transparency. \fBDo\fR read the manpage and option
-descriptions for the programs mentioned and rxvt\-unicode. Really, do it!
+descriptions for the programs mentioned and rxvt-unicode. Really, do it!
 .PP
 1. Use transparent mode:
 .PP
 .Vb 2
 \&   Esetroot wallpaper.jpg
-\&   @@URXVT_NAME@@ -tr -tint red -sh 40
+\&   @@URXVT_NAME@@ \-tr \-tint red \-sh 40
 .Ve
 .PP
 That works. If you think it doesn't, you lack transparency and tinting
 support, or you are unable to read.
 .PP
-2. Use a simple pixmap and emulate pseudo\-transparency. This enables you
+2. Use a simple pixmap and emulate pseudo-transparency. This enables you
 to use effects other than tinting and shading: Just shade/tint/whatever
 your picture with gimp or any other tool:
 .PP
 .Vb 2
-\&   convert wallpaper.jpg -blur 20x20 -modulate 30 background.jpg
-\&   @@URXVT_NAME@@ -pixmap "background.jpg;:root"
+\&   convert wallpaper.jpg \-blur 20x20 \-modulate 30 background.jpg
+\&   @@URXVT_NAME@@ \-pixmap "background.jpg;:root"
 .Ve
 .PP
 That works. If you think it doesn't, you lack AfterImage support, or you
@@ -405,7 +406,7 @@ are unable to read.
 3. Use an \s-1ARGB\s0 visual:
 .PP
 .Vb 1
-\&   @@URXVT_NAME@@ -depth 32 -fg grey90 -bg rgba:0000/0000/4444/cccc
+\&   @@URXVT_NAME@@ \-depth 32 \-fg grey90 \-bg rgba:0000/0000/4444/cccc
 .Ve
 .PP
 This requires \s-1XFT\s0 support, and the support of your X\-server. If that
@@ -417,8 +418,8 @@ doesn't mean that your \s-1WM\s0 has the required kludges in place.
 4. Use xcompmgr and let it do the job:
 .PP
 .Vb 2
-\&  xprop -frame -f _NET_WM_WINDOW_OPACITY 32c \e
-\&        -set _NET_WM_WINDOW_OPACITY 0xc0000000
+\&  xprop \-frame \-f _NET_WM_WINDOW_OPACITY 32c \e
+\&        \-set _NET_WM_WINDOW_OPACITY 0xc0000000
 .Ve
 .PP
 Then click on a window you want to make transparent. Replace \f(CW0xc0000000\fR
@@ -466,7 +467,7 @@ rxvt-unicode might use reverse video to simulate the effect:
 .PP
 For some unexplainable reason, some rare programs assume a very weird
 colour palette when confronted with a terminal with more than the standard
-8 colours (rxvt\-unicode supports 88). The right fix is, of course, to fix
+8 colours (rxvt-unicode supports 88). The right fix is, of course, to fix
 these programs not to assume non-ISO colours without very good reasons.
 .PP
 In the meantime, you can either edit your \f(CW\*(C`rxvt\-unicode\*(C'\fR terminfo
@@ -480,7 +481,7 @@ Yes, using an escape sequence. Try something like this, which has the same
 effect as using the \f(CW\*(C`\-fn\*(C'\fR switch, and takes effect immediately:
 .PP
 .Vb 1
-\&   printf '\e33]50;%s\e007' "9x15bold,xft:Kochi Gothic"
+\&   printf \*(Aq\e33]50;%s\e007\*(Aq "9x15bold,xft:Kochi Gothic"
 .Ve
 .PP
 This is useful if you e.g. work primarily with japanese (and prefer a
@@ -542,7 +543,7 @@ color8\-15 are the corresponding high-intensity colors.
 .IX Subsection "I don't like the screen colors.  How do I change them?"
 .PP
 You can change the screen colors at run-time using \fI~/.Xdefaults\fR
-resources (or as long\-options).
+resources (or as long-options).
 .PP
 Here are values that are supposed to resemble a \s-1VGA\s0 screen,
 including the murky brown that passes for low-intensity yellow:
@@ -556,9 +557,7 @@ including the murky brown that passes for low-intensity yellow:
 \&   URxvt.color5:   #A800A8
 \&   URxvt.color6:   #00A8A8
 \&   URxvt.color7:   #A8A8A8
-.Ve
-.PP
-.Vb 8
+\&
 \&   URxvt.color8:   #000054
 \&   URxvt.color9:   #FF0054
 \&   URxvt.color10:  #00FF54
@@ -571,7 +570,7 @@ including the murky brown that passes for low-intensity yellow:
 .PP
 And here is a more complete set of non-standard colors.
 .PP
-.Vb 18
+.Vb 10
 \&   URxvt.cursorColor:  #dc74d1
 \&   URxvt.pointerColor: #dc74d1
 \&   URxvt.background:   #0e0e0e
@@ -618,7 +617,7 @@ In that case, select a font of your taste and add it to the font list,
 e.g.:
 .PP
 .Vb 1
-\&   @@URXVT_NAME@@ -fn basefont,font2,font3...
+\&   @@URXVT_NAME@@ \-fn basefont,font2,font3...
 .Ve
 .PP
 When rxvt-unicode sees a character, it will first look at the base
@@ -653,7 +652,8 @@ runtime (the internal data structure has no problem with using different
 fonts for the same character at the same time, but no interface for this
 has been designed yet).
 .PP
-Until then, you might get away with switching fonts at runtime (see \*(L"Can I switch the fonts at runtime?\*(R" later in this document).
+Until then, you might get away with switching fonts at runtime (see \*(L"Can
+I switch the fonts at runtime?\*(R" later in this document).
 .PP
 \fIHow can I make mplayer display video correctly?\fR
 .IX Subsection "How can I make mplayer display video correctly?"
@@ -661,7 +661,7 @@ Until then, you might get away with switching fonts at runtime (see \*(L"Can I s
 We are working on it, in the meantime, as a workaround, use something like:
 .PP
 .Vb 1
-\&   @@URXVT_NAME@@ -b 600 -geometry 20x1 -e sh -c 'mplayer -wid $WINDOWID file...'
+\&   @@URXVT_NAME@@ \-b 600 \-geometry 20x1 \-e sh \-c \*(Aqmplayer \-wid $WINDOWID file...\*(Aq
 .Ve
 .Sh "Keyboard, Mouse & User Interaction"
 .IX Subsection "Keyboard, Mouse & User Interaction"
@@ -672,7 +672,7 @@ If you want to select e.g. alphanumeric words, you can use the following
 setting:
 .PP
 .Vb 1
-\&   URxvt.selection.pattern-0: ([[:word:]]+)
+\&   URxvt.selection.pattern\-0: ([[:word:]]+)
 .Ve
 .PP
 If you click more than twice, the selection will be extended
@@ -681,7 +681,7 @@ more and more.
 To get a selection that is very similar to the old code, try this pattern:
 .PP
 .Vb 1
-\&   URxvt.selection.pattern-0: ([^"&'()*,;<=>?@[\e\e\e\e]^`{|})]+)
+\&   URxvt.selection.pattern\-0: ([^"&\*(Aq()*,;<=>?@[\e\e\e\e]^\`{|})]+)
 .Ve
 .PP
 Please also note that the \fILeftClick Shift-LeftClick\fR combination also
@@ -701,7 +701,7 @@ example, to disable the \fBselection-popup\fR and \fBoption-popup\fR, specify
 this \fBperl-ext-common\fR resource:
 .PP
 .Vb 1
-\&   URxvt.perl-ext-common: default,-selection-popup,-option-popup
+\&   URxvt.perl\-ext\-common: default,\-selection\-popup,\-option\-popup
 .Ve
 .PP
 This will keep the default extensions, but disable the two popup
@@ -710,7 +710,7 @@ scrollback search mode is triggered by \fBM\-s\fR. You can move it to any
 other combination either by setting the \fBsearchable-scrollback\fR resource:
 .PP
 .Vb 1
-\&   URxvt.searchable-scrollback: CM-s
+\&   URxvt.searchable\-scrollback: CM\-s
 .Ve
 .PP
 \fIThe cursor moves when selecting text in the current input line, how do I switch this off?\fR
@@ -731,7 +731,7 @@ You can permanently switch this feature off by disabling the \f(CW\*(C`readline\
 extension:
 .PP
 .Vb 1
-\&   URxvt.perl-ext-common: default,-readline
+\&   URxvt.perl\-ext\-common: default,\-readline
 .Ve
 .PP
 \fIMy numerical keypad acts weird and generates differing output?\fR
@@ -793,15 +793,13 @@ started from a terminal (say, from a menu or by remote shell), then the
 system value of `erase', which corresponds to \s-1CERASE\s0 in <termios.h>, will
 be used (which may not be the same as your stty setting).
 .PP
-For starting a new rxvt\-unicode:
+For starting a new rxvt-unicode:
 .PP
 .Vb 3
 \&   # use Backspace = ^H
 \&   $ stty erase ^H
 \&   $ @@URXVT_NAME@@
-.Ve
-.PP
-.Vb 3
+\&
 \&   # use Backspace = ^?
 \&   $ stty erase ^?
 \&   $ @@URXVT_NAME@@
@@ -809,18 +807,16 @@ For starting a new rxvt\-unicode:
 .PP
 Toggle with \f(CW\*(C`ESC [ 36 h\*(C'\fR / \f(CW\*(C`ESC [ 36 l\*(C'\fR.
 .PP
-For an existing rxvt\-unicode:
+For an existing rxvt-unicode:
 .PP
 .Vb 3
 \&   # use Backspace = ^H
 \&   $ stty erase ^H
-\&   $ echo -n "^[[36h"
-.Ve
-.PP
-.Vb 3
+\&   $ echo \-n "^[[36h"
+\&
 \&   # use Backspace = ^?
 \&   $ stty erase ^?
-\&   $ echo -n "^[[36l"
+\&   $ echo \-n "^[[36l"
 .Ve
 .PP
 This helps satisfy some of the Backspace discrepancies that occur, but
@@ -840,7 +836,7 @@ some editors (vim I'm told) expect Backspace = ^H,
 .PP
 Perhaps someday this will all be resolved in a consistent manner.
 .PP
-\fII don't like the key\-bindings.  How do I change them?\fR
+\fII don't like the key-bindings.  How do I change them?\fR
 .IX Subsection "I don't like the key-bindings.  How do I change them?"
 .PP
 There are some compile-time selections available via configure. Unless
@@ -849,26 +845,26 @@ use the `keysym' resource to alter the keystrings associated with keysyms.
 .PP
 Here's an example for a URxvt session started using \f(CW\*(C`@@URXVT_NAME@@ \-name URxvt\*(C'\fR
 .PP
-.Vb 20
+.Vb 10
 \&   URxvt.keysym.Home:          \e033[1~
 \&   URxvt.keysym.End:           \e033[4~
-\&   URxvt.keysym.C-apostrophe:  \e033<C-'>
-\&   URxvt.keysym.C-slash:       \e033<C-/>
-\&   URxvt.keysym.C-semicolon:   \e033<C-;>
-\&   URxvt.keysym.C-grave:       \e033<C-`>
-\&   URxvt.keysym.C-comma:       \e033<C-,>
-\&   URxvt.keysym.C-period:      \e033<C-.>
-\&   URxvt.keysym.C-0x60:        \e033<C-`>
-\&   URxvt.keysym.C-Tab:         \e033<C-Tab>
-\&   URxvt.keysym.C-Return:      \e033<C-Return>
-\&   URxvt.keysym.S-Return:      \e033<S-Return>
-\&   URxvt.keysym.S-space:       \e033<S-Space>
-\&   URxvt.keysym.M-Up:          \e033<M-Up>
-\&   URxvt.keysym.M-Down:        \e033<M-Down>
-\&   URxvt.keysym.M-Left:        \e033<M-Left>
-\&   URxvt.keysym.M-Right:       \e033<M-Right>
-\&   URxvt.keysym.M-C-0:         list \e033<M-C- 0123456789 >
-\&   URxvt.keysym.M-C-a:         list \e033<M-C- abcdefghijklmnopqrstuvwxyz >
+\&   URxvt.keysym.C\-apostrophe:  \e033<C\-\*(Aq>
+\&   URxvt.keysym.C\-slash:       \e033<C\-/>
+\&   URxvt.keysym.C\-semicolon:   \e033<C\-;>
+\&   URxvt.keysym.C\-grave:       \e033<C\-\`>
+\&   URxvt.keysym.C\-comma:       \e033<C\-,>
+\&   URxvt.keysym.C\-period:      \e033<C\-.>
+\&   URxvt.keysym.C\-0x60:        \e033<C\-\`>
+\&   URxvt.keysym.C\-Tab:         \e033<C\-Tab>
+\&   URxvt.keysym.C\-Return:      \e033<C\-Return>
+\&   URxvt.keysym.S\-Return:      \e033<S\-Return>
+\&   URxvt.keysym.S\-space:       \e033<S\-Space>
+\&   URxvt.keysym.M\-Up:          \e033<M\-Up>
+\&   URxvt.keysym.M\-Down:        \e033<M\-Down>
+\&   URxvt.keysym.M\-Left:        \e033<M\-Left>
+\&   URxvt.keysym.M\-Right:       \e033<M\-Right>
+\&   URxvt.keysym.M\-C\-0:         list \e033<M\-C\- 0123456789 >
+\&   URxvt.keysym.M\-C\-a:         list \e033<M\-C\- abcdefghijklmnopqrstuvwxyz >
 \&   URxvt.keysym.F12:           command:\e033]701;zh_CN.GBK\e007
 .Ve
 .PP
@@ -894,7 +890,7 @@ required for your particular machine.
 \fICan I see a typical configuration?\fR
 .IX Subsection "Can I see a typical configuration?"
 .PP
-The default configuration tries to be xterm\-like, which I don't like that
+The default configuration tries to be xterm-like, which I don't like that
 much, but it's least surprise to regular users.
 .PP
 As a rxvt or rxvt-unicode user, you are practically supposed to invest
@@ -903,14 +899,14 @@ author's .Xdefaults entries, with comments on what they do. It's certainly
 not \fItypical\fR, but what's typical...
 .PP
 .Vb 2
-\&   URxvt.cutchars: "()*,<>[]{}|'
-\&   URxvt.print-pipe: cat >/tmp/xxx
+\&   URxvt.cutchars: "()*,<>[]{}|\*(Aq
+\&   URxvt.print\-pipe: cat >/tmp/xxx
 .Ve
 .PP
 These are just for testing stuff.
 .PP
 .Vb 2
-\&   URxvt.imLocale: ja_JP.UTF-8
+\&   URxvt.imLocale: ja_JP.UTF\-8
 \&   URxvt.preeditType: OnTheSpot,None
 .Ve
 .PP
@@ -920,12 +916,12 @@ type, which requires the \f(CW\*(C`xim\-onthespot\*(C'\fR perl extension but rew
 with correct-looking fonts.
 .PP
 .Vb 6
-\&   URxvt.perl-lib: /root/lib/urxvt
-\&   URxvt.perl-ext-common: default,selection-autotransform,selection-pastebin,xim-onthespot,remote-clipboard
-\&   URxvt.selection.pattern-0: ( at .*? line \e\ed+)
-\&   URxvt.selection.pattern-1: ^(/[^:]+):\e
-\&   URxvt.selection-autotransform.0: s/^([^:[:space:]]+):(\e\ed+):?$/:e \e\eQ$1\e\eE\e\ex0d:$2\e\ex0d/
-\&   URxvt.selection-autotransform.1: s/^ at (.*?) line (\e\ed+)$/:e \e\eQ$1\e\eE\e\ex0d:$2\e\ex0d/
+\&   URxvt.perl\-lib: /root/lib/urxvt
+\&   URxvt.perl\-ext\-common: default,selection\-autotransform,selection\-pastebin,xim\-onthespot,remote\-clipboard
+\&   URxvt.selection.pattern\-0: ( at .*? line \e\ed+)
+\&   URxvt.selection.pattern\-1: ^(/[^:]+):\e
+\&   URxvt.selection\-autotransform.0: s/^([^:[:space:]]+):(\e\ed+):?$/:e \e\eQ$1\e\eE\e\ex0d:$2\e\ex0d/
+\&   URxvt.selection\-autotransform.1: s/^ at (.*?) line (\e\ed+)$/:e \e\eQ$1\e\eE\e\ex0d:$2\e\ex0d/
 .Ve
 .PP
 This is my perl configuration. The first two set the perl library
@@ -957,7 +953,7 @@ scrollback buffer.
 \&   URxvt.highlightColor:   #f0f0f0
 .Ve
 .PP
-Some colours. Not sure which ones are being used or even non\-defaults, but
+Some colours. Not sure which ones are being used or even non-defaults, but
 these are in my .Xdefaults. Most notably, they set foreground/background
 to light gray/black, and also make sure that the colour 7 matches the
 default foreground colour.
@@ -976,7 +972,7 @@ is mostly a nice effect.
 \&   URxvt.utmpInhibit:      true
 .Ve
 .PP
-Uh, well, should be mostly self\-explanatory. By specifying some defaults
+Uh, well, should be mostly self-explanatory. By specifying some defaults
 manually, I can quickly switch them for testing.
 .PP
 .Vb 1
@@ -1012,12 +1008,12 @@ I once thought this is a great idea.
 .PP
 .Vb 9
 \&   urxvt.font:             9x15bold,\e
-\&                           -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1,\e
-\&                           -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1, \e
+\&                           \-misc\-fixed\-bold\-r\-normal\-\-15\-140\-75\-75\-c\-90\-iso10646\-1,\e
+\&                           \-misc\-fixed\-medium\-r\-normal\-\-15\-140\-75\-75\-c\-90\-iso10646\-1, \e
 \&                           [codeset=JISX0208]xft:Kochi Gothic, \e
 \&                           xft:Bitstream Vera Sans Mono:autohint=true, \e
 \&                           xft:Code2000:antialias=false
-\&   urxvt.boldFont:         -xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-15
+\&   urxvt.boldFont:         \-xos4\-terminus\-bold\-r\-normal\-\-14\-140\-72\-72\-c\-80\-iso8859\-15
 \&   urxvt.italicFont:       xft:Bitstream Vera Sans Mono:italic:autohint=true
 \&   urxvt.boldItalicFont:   xft:Bitstream Vera Sans Mono:bold:italic:autohint=true
 .Ve
@@ -1029,10 +1025,10 @@ font (different glyphs for \f(CW\*(C`;\*(C'\fR and many other harmless character
 while the second font is actually the \f(CW\*(C`9x15bold\*(C'\fR from XFree4/XOrg. The
 bold version has less chars than the medium version, so I use it for rare
 characters, too. When editing sources with vim, I use italic for comments
-and other stuff, which looks quite good with Bitstream Vera anti\-aliased.
+and other stuff, which looks quite good with Bitstream Vera anti-aliased.
 .PP
 Terminus is a quite bad font (many very wrong glyphs), but for most of my
-purposes, it works, and gives a different look, as my normal (Non\-bold)
+purposes, it works, and gives a different look, as my normal (Non-bold)
 font is already bold, and I want to see a difference between bold and
 normal fonts.
 .PP
@@ -1049,8 +1045,8 @@ defaults:
 \&   IRC*font:               suxuseuro
 \&   IRC*boldFont:           suxuseuro
 \&   IRC*colorBD:            white
-\&   IRC*keysym.M-C-1:       command:\e033]710;suxuseuro\e007\e033]711;suxuseuro\e007
-\&   IRC*keysym.M-C-2:       command:\e033]710;9x15bold\e007\e033]711;9x15bold\e007
+\&   IRC*keysym.M\-C\-1:       command:\e033]710;suxuseuro\e007\e033]711;suxuseuro\e007
+\&   IRC*keysym.M\-C\-2:       command:\e033]710;9x15bold\e007\e033]711;9x15bold\e007
 .Ve
 .PP
 \&\f(CW\*(C`Alt\-Shift\-1\*(C'\fR and \f(CW\*(C`Alt\-Shift\-2\*(C'\fR switch between two different font
@@ -1063,11 +1059,11 @@ The above is all in my \f(CW\*(C`.Xdefaults\*(C'\fR (I don't use \f(CW\*(C`.Xres
 file for different hosts, for example, on ym main desktop, I use:
 .PP
 .Vb 5
-\&   URxvt.keysym.C-M-q: command:\e033[3;5;5t
-\&   URxvt.keysym.C-M-y: command:\e033[3;5;606t
-\&   URxvt.keysym.C-M-e: command:\e033[3;1605;5t
-\&   URxvt.keysym.C-M-c: command:\e033[3;1605;606t
-\&   URxvt.keysym.C-M-p: perl:test
+\&   URxvt.keysym.C\-M\-q: command:\e033[3;5;5t
+\&   URxvt.keysym.C\-M\-y: command:\e033[3;5;606t
+\&   URxvt.keysym.C\-M\-e: command:\e033[3;1605;5t
+\&   URxvt.keysym.C\-M\-c: command:\e033[3;1605;606t
+\&   URxvt.keysym.C\-M\-p: perl:test
 .Ve
 .PP
 The first for keysym definitions allow me to quickly bring some windows
@@ -1083,9 +1079,9 @@ Well, why, indeed? It does, in a way very similar to other X
 applications. Most importantly, this means that if you or your \s-1OS\s0 loads
 resources into the X display (the right way to do it), rxvt-unicode will
 ignore any resource files in your home directory. It will only read
-\&\fI$HOME/.Xdefaults\fR when no resources are attached to the display.
+\&\fI\f(CI$HOME\fI/.Xdefaults\fR when no resources are attached to the display.
 .PP
-If you have or use an \fI$HOME/.Xresources\fR file, chances are that
+If you have or use an \fI\f(CI$HOME\fI/.Xresources\fR file, chances are that
 resources are loaded into your X\-server. In this case, you have to
 re-login after every change (or run \fIxrdb \-merge \f(CI$HOME\fI/.Xresources\fR).
 .PP
@@ -1110,13 +1106,13 @@ be done like this (with ncurses' infocmp and works as user and admin):
 .PP
 .Vb 2
 \&   REMOTE=remotesystem.domain
-\&   infocmp rxvt-unicode | ssh $REMOTE "mkdir -p .terminfo && cat >/tmp/ti && tic /tmp/ti"
+\&   infocmp rxvt\-unicode | ssh $REMOTE "mkdir \-p .terminfo && cat >/tmp/ti && tic /tmp/ti"
 .Ve
 .PP
 \&... or by installing rxvt-unicode normally on the remote system,
 .PP
 One some systems you might need to set \f(CW$TERMINFO\fR to the full path of
-\&\fI$HOME/.terminfo\fR for this to work.
+\&\fI\f(CI$HOME\fI/.terminfo\fR for this to work.
 .PP
 If you cannot or do not want to do this, then you can simply set
 \&\f(CW\*(C`TERM=rxvt\*(C'\fR or even \f(CW\*(C`TERM=xterm\*(C'\fR, and live with the small number of
@@ -1159,13 +1155,13 @@ You can also create a termcap entry by using terminfo's infocmp program
 like this:
 .PP
 .Vb 1
-\&   infocmp -C rxvt-unicode
+\&   infocmp \-C rxvt\-unicode
 .Ve
 .PP
 Or you could use this termcap entry, generated by the command above:
 .PP
-.Vb 20
-\&   rxvt-unicode|rxvt-unicode terminal (X Window System):\e
+.Vb 10
+\&   rxvt\-unicode|rxvt\-unicode terminal (X Window System):\e
 \&           :am:bw:eo:km:mi:ms:xn:xo:\e
 \&           :co#80:it#8:li#24:lm#0:\e
 \&           :AL=\eE[%dL:DC=\eE[%dP:DL=\eE[%dM:DO=\eE[%dB:IC=\eE[%d@:\e
@@ -1196,13 +1192,13 @@ file. Needless to say, \f(CW\*(C`rxvt\-unicode\*(C'\fR is not in its default fil
 with most other terminals supporting colour). Either add:
 .PP
 .Vb 1
-\&   TERM rxvt-unicode
+\&   TERM rxvt\-unicode
 .Ve
 .PP
 to \f(CW\*(C`/etc/DIR_COLORS\*(C'\fR or simply add:
 .PP
 .Vb 1
-\&   alias ls='ls --color=auto'
+\&   alias ls=\*(Aqls \-\-color=auto\*(Aq
 .Ve
 .PP
 to your \f(CW\*(C`.profile\*(C'\fR or \f(CW\*(C`.bashrc\*(C'\fR.
@@ -1252,7 +1248,7 @@ The best thing is to fix your startup environment, as you will likely run
 into other problems. If nothing works you can try this in your .profile.
 .PP
 .Vb 1
-\&  printf '\e33]701;%s\e007' "$LC_CTYPE"   # $LANG or $LC_ALL are worth a try, too
+\&  printf \*(Aq\e33]701;%s\e007\*(Aq "$LC_CTYPE"   # $LANG or $LC_ALL are worth a try, too
 .Ve
 .PP
 If this doesn't work, then maybe you use a \f(CW\*(C`LC_CTYPE\*(C'\fR specification not
@@ -1307,7 +1303,7 @@ locale. Common names for locales are \f(CW\*(C`en_US.UTF\-8\*(C'\fR, \f(CW\*(C`d
 Rxvt-unicode ignores all other locale categories, and except for
 the encoding, ignores country or language-specific settings,
 i.e. \f(CW\*(C`de_DE.UTF\-8\*(C'\fR and \f(CW\*(C`ja_JP.UTF\-8\*(C'\fR are the normally same to
-rxvt\-unicode.
+rxvt-unicode.
 .PP
 If you want to use a specific encoding you have to make sure you start
 rxvt-unicode with the correct \f(CW\*(C`LC_CTYPE\*(C'\fR category.
@@ -1316,10 +1312,10 @@ rxvt-unicode with the correct \f(CW\*(C`LC_CTYPE\*(C'\fR category.
 .IX Subsection "Can I switch locales at runtime?"
 .PP
 Yes, using an escape sequence. Try something like this, which sets
-rxvt\-unicode's idea of \f(CW\*(C`LC_CTYPE\*(C'\fR.
+rxvt-unicode's idea of \f(CW\*(C`LC_CTYPE\*(C'\fR.
 .PP
 .Vb 1
-\&  printf '\e33]701;%s\e007' ja_JP.SJIS
+\&  printf \*(Aq\e33]701;%s\e007\*(Aq ja_JP.SJIS
 .Ve
 .PP
 See also the previous answer.
@@ -1330,14 +1326,14 @@ one locale (e.g. \f(CW\*(C`de_DE.UTF\-8\*(C'\fR) but some programs don't support
 first switches to a locale supported by xjdic and back later:
 .PP
 .Vb 3
-\&   printf '\e33]701;%s\e007' ja_JP.SJIS
-\&   xjdic -js
-\&   printf '\e33]701;%s\e007' de_DE.UTF-8
+\&   printf \*(Aq\e33]701;%s\e007\*(Aq ja_JP.SJIS
+\&   xjdic \-js
+\&   printf \*(Aq\e33]701;%s\e007\*(Aq de_DE.UTF\-8
 .Ve
 .PP
 You can also use xterm's \f(CW\*(C`luit\*(C'\fR program, which usually works fine, except
 for some locales where character width differs between program\- and
-rxvt\-unicode\-locales.
+rxvt-unicode-locales.
 .PP
 \fII have problems getting my input method working.\fR
 .IX Subsection "I have problems getting my input method working."
@@ -1355,8 +1351,8 @@ For example, \fBkinput2\fR does not support \s-1UTF\-8\s0 locales, you should us
 .IP "\- Make sure your \s-1XIM\s0 server is actually running." 4
 .IX Item "- Make sure your XIM server is actually running."
 .PD 0
-.ie n .IP "\- Make sure the ""XMODIFIERS""\fR environment variable is set correctly when \fIstarting rxvt\-unicode." 4
-.el .IP "\- Make sure the \f(CWXMODIFIERS\fR environment variable is set correctly when \fIstarting\fR rxvt\-unicode." 4
+.ie n .IP "\- Make sure the ""XMODIFIERS""\fR environment variable is set correctly when \fIstarting rxvt-unicode." 4
+.el .IP "\- Make sure the \f(CWXMODIFIERS\fR environment variable is set correctly when \fIstarting\fR rxvt-unicode." 4
 .IX Item "- Make sure the XMODIFIERS environment variable is set correctly when starting rxvt-unicode."
 .PD
 When you want to use e.g. \fBkinput2\fR, it must be set to
@@ -1364,9 +1360,9 @@ When you want to use e.g. \fBkinput2\fR, it must be set to
 method servers are running with this command:
 .Sp
 .Vb 1
-\&   xprop -root XIM_SERVERS
+\&   xprop \-root XIM_SERVERS
 .Ve
-.IP "*" 4
+.IP "" 4
 .PP
 \fIMy input method wants <some encoding> but I want \s-1UTF\-8\s0, what can I do?\fR
 .IX Subsection "My input method wants <some encoding> but I want UTF-8, what can I do?"
@@ -1375,7 +1371,7 @@ You can specify separate locales for the input method and the rest of the
 terminal, using the resource \f(CW\*(C`imlocale\*(C'\fR:
 .PP
 .Vb 1
-\&   URxvt.imlocale: ja_JP.EUC-JP
+\&   URxvt.imlocale: ja_JP.EUC\-JP
 .Ve
 .PP
 Now you can start your terminal with \f(CW\*(C`LC_CTYPE=ja_JP.UTF\-8\*(C'\fR and still
@@ -1418,7 +1414,7 @@ might encounter the same issue.
 .PP
 You should build one binary with the default options. \fIconfigure\fR
 now enables most useful options, and the trend goes to making them
-runtime\-switchable, too, so there is usually no drawback to enabling them,
+runtime-switchable, too, so there is usually no drawback to enabling them,
 except higher disk and possibly memory usage. The perl interpreter should
 be enabled, as important functionality (menus, selection, likely more in
 the future) depends on it.
@@ -1468,7 +1464,7 @@ However, that means rxvt-unicode only works in \f(CW\*(C`POSIX\*(C'\fR, \f(CW\*(
 \&\f(CW\*(C`UTF\-8\*(C'\fR locales under FreeBSD (which all use Unicode as \fBwchar_t\fR.
 .PP
 \&\f(CW\*(C`_\|_STDC_ISO_10646_\|_\*(C'\fR is the only sane way to support multi-language
-apps in an \s-1OS\s0, as using a locale-dependent (and non\-standardized)
+apps in an \s-1OS\s0, as using a locale-dependent (and non-standardized)
 representation of \fBwchar_t\fR makes it impossible to convert between
 \&\fBwchar_t\fR (as used by X11 and your applications) and any other encoding
 without implementing OS-specific-wrappers for each and every locale. There
@@ -1505,7 +1501,7 @@ to 8\-bit encodings.
 urxvt uses the system wcwidth function to know the information about
 the width of characters, so on systems with incorrect locale data you
 will likely get bad results. Two notorious examples are Solaris 9,
-where single-width characters like U+2514 are reported as double\-width,
+where single-width characters like U+2514 are reported as double-width,
 and Darwin 8, where combining chars are reported having width 1.
 .PP
 The solution is to upgrade your system or switch to a better one. A
@@ -1547,45 +1543,45 @@ A text parameter composed of printable characters.
 .ie n .IP "\fB\fB""ENQ""\fB\fR" 4
 .el .IP "\fB\f(CBENQ\fB\fR" 4
 .IX Item "ENQ"
-Enquiry (Ctrl\-E) = Send Device Attributes (\s-1DA\s0)
+Enquiry (Ctrl-E) = Send Device Attributes (\s-1DA\s0)
 request attributes from terminal. See \fB\f(CB\*(C`ESC [ Ps c\*(C'\fB\fR.
 .ie n .IP "\fB\fB""BEL""\fB\fR" 4
 .el .IP "\fB\f(CBBEL\fB\fR" 4
 .IX Item "BEL"
-Bell (Ctrl\-G)
+Bell (Ctrl-G)
 .ie n .IP "\fB\fB""BS""\fB\fR" 4
 .el .IP "\fB\f(CBBS\fB\fR" 4
 .IX Item "BS"
-Backspace (Ctrl\-H)
+Backspace (Ctrl-H)
 .ie n .IP "\fB\fB""TAB""\fB\fR" 4
 .el .IP "\fB\f(CBTAB\fB\fR" 4
 .IX Item "TAB"
-Horizontal Tab (\s-1HT\s0) (Ctrl\-I)
+Horizontal Tab (\s-1HT\s0) (Ctrl-I)
 .ie n .IP "\fB\fB""LF""\fB\fR" 4
 .el .IP "\fB\f(CBLF\fB\fR" 4
 .IX Item "LF"
-Line Feed or New Line (\s-1NL\s0) (Ctrl\-J)
+Line Feed or New Line (\s-1NL\s0) (Ctrl-J)
 .ie n .IP "\fB\fB""VT""\fB\fR" 4
 .el .IP "\fB\f(CBVT\fB\fR" 4
 .IX Item "VT"
-Vertical Tab (Ctrl\-K) same as \fB\f(CB\*(C`LF\*(C'\fB\fR
+Vertical Tab (Ctrl-K) same as \fB\f(CB\*(C`LF\*(C'\fB\fR
 .ie n .IP "\fB\fB""FF""\fB\fR" 4
 .el .IP "\fB\f(CBFF\fB\fR" 4
 .IX Item "FF"
-Form Feed or New Page (\s-1NP\s0) (Ctrl\-L) same as \fB\f(CB\*(C`LF\*(C'\fB\fR
+Form Feed or New Page (\s-1NP\s0) (Ctrl-L) same as \fB\f(CB\*(C`LF\*(C'\fB\fR
 .ie n .IP "\fB\fB""CR""\fB\fR" 4
 .el .IP "\fB\f(CBCR\fB\fR" 4
 .IX Item "CR"
-Carriage Return (Ctrl\-M)
+Carriage Return (Ctrl-M)
 .ie n .IP "\fB\fB""SO""\fB\fR" 4
 .el .IP "\fB\f(CBSO\fB\fR" 4
 .IX Item "SO"
-Shift Out (Ctrl\-N), invokes the G1 character set.
+Shift Out (Ctrl-N), invokes the G1 character set.
 Switch to Alternate Character Set
 .ie n .IP "\fB\fB""SI""\fB\fR" 4
 .el .IP "\fB\f(CBSI\fB\fR" 4
 .IX Item "SI"
-Shift In (Ctrl\-O), invokes the G0 character set (the default).
+Shift In (Ctrl-O), invokes the G0 character set (the default).
 Switch to Standard Character Set
 .ie n .IP "\fB\fB""SPC""\fB\fR" 4
 .el .IP "\fB\f(CBSPC\fB\fR" 4
@@ -1691,7 +1687,6 @@ C = 5 	Finnish character set unimplemented
 C = C 	Finnish character set unimplemented
 C = K 	German character set unimplemented
 .TE
-
 .PP

 .IX Xref "CSI"
@@ -1750,7 +1745,6 @@ Ps = 0	Clear Below (default)
 Ps = 1	Clear Above
 Ps = 2	Clear All
 .TE
-
 .ie n .IP "\fB\fB""ESC [ Ps K""\fB\fR" 4
 .el .IP "\fB\f(CBESC [ Ps K\fB\fR" 4
 .IX Item "ESC [ Ps K"
@@ -1761,7 +1755,6 @@ Ps = 0	Clear to Right (default)
 Ps = 1	Clear to Left
 Ps = 2	Clear All
 .TE
-
 .ie n .IP "\fB\fB""ESC [ Ps L""\fB\fR" 4
 .el .IP "\fB\f(CBESC [ Ps L\fB\fR" 4
 .IX Item "ESC [ Ps L"
@@ -1789,7 +1782,6 @@ Ps = 0	Tab Set (HTS)
 Ps = 2	Tab Clear (TBC), Clear Current Column (default)
 Ps = 5	Tab Clear (TBC), Clear All
 .TE
-
 .ie n .IP "\fB\fB""ESC [ Ps X""\fB\fR" 4
 .el .IP "\fB\f(CBESC [ Ps X\fB\fR" 4
 .IX Item "ESC [ Ps X"
@@ -1798,9 +1790,9 @@ Erase \fB\f(CB\*(C`Ps\*(C'\fB\fR Character(s) [default: 1] (\s-1ECH\s0)
 .el .IP "\fB\f(CBESC [ Ps Z\fB\fR" 4
 .IX Item "ESC [ Ps Z"
 Move backward \fB\f(CB\*(C`Ps\*(C'\fB\fR [default: 1] tab stops
-.ie n .IP "\fB\fB""ESC [ Ps '""\fB\fR" 4
-.el .IP "\fB\f(CBESC [ Ps '\fB\fR" 4
-.IX Item "ESC [ Ps '"
+.ie n .IP "\fB\fB""ESC [ Ps \*(Aq""\fB\fR" 4
+.el .IP "\fB\f(CBESC [ Ps \*(Aq\fB\fR" 4
+.IX Item "ESC [ Ps "
 See \fB\f(CB\*(C`ESC [ Ps G\*(C'\fB\fR
 .ie n .IP "\fB\fB""ESC [ Ps a""\fB\fR" 4
 .el .IP "\fB\f(CBESC [ Ps a\fB\fR" 4
@@ -1834,7 +1826,6 @@ l l .
 Ps = 0	Clear Current Column (default)
 Ps = 3	Clear All (TBC)
 .TE
-
 .ie n .IP "\fB\fB""ESC [ Pm h""\fB\fR" 4
 .el .IP "\fB\f(CBESC [ Pm h\fB\fR" 4
 .IX Item "ESC [ Pm h"
@@ -1849,7 +1840,6 @@ Ps = 0	print screen (MC0)
 Ps = 4	disable transparent print mode (MC4)
 Ps = 5	enable transparent print mode (MC5)
 .TE
-
 .ie n .IP "\fB\fB""ESC [ Pm l""\fB\fR" 4
 .el .IP "\fB\f(CBESC [ Pm l\fB\fR" 4
 .IX Item "ESC [ Pm l"
@@ -1863,7 +1853,6 @@ l l .
 h	Insert Mode (SMIR)
 l	Replace Mode (RMIR)
 .TE
-
 .PD 0
 .ie n .IP "\fB\fB""Ps = 20""\fB\fR (partially implemented)" 4
 .el .IP "\fB\f(CBPs = 20\fB\fR (partially implemented)" 4
@@ -1873,7 +1862,6 @@ l l .
 h	Automatic Newline (LNM)
 l	Normal Linefeed (LNM)
 .TE
-
 .RE
 .RS 4
 .RE
@@ -1912,7 +1900,6 @@ Ps = 96 / 106	fg/bg Bright Cyan
 Ps = 97 / 107	fg/bg Bright White
 Ps = 99 / 109	fg/bg Bright Default
 .TE
-
 .ie n .IP "\fB\fB""ESC [ Ps n""\fB\fR" 4
 .el .IP "\fB\f(CBESC [ Ps n\fB\fR" 4
 .IX Item "ESC [ Ps n"
@@ -1924,7 +1911,6 @@ Ps = 6	Report Cursor Position (CPR) [row;column] as ESC [ r ; c R
 Ps = 7	Request Display Name
 Ps = 8	Request Version Number (place in window title)
 .TE
-
 .ie n .IP "\fB\fB""ESC [ Ps;Ps r""\fB\fR" 4
 .el .IP "\fB\f(CBESC [ Ps;Ps r\fB\fR" 4
 .IX Item "ESC [ Ps;Ps r"
@@ -1957,7 +1943,6 @@ Ps = 20	Reports icon label (ESC ] L NAME \234)
 Ps = 21	Reports window title (ESC ] l NAME \234)
 Ps = 24..	Set window height to Ps rows
 .TE
-
 .ie n .IP "\fB\fB""ESC [ u""\fB\fR" 4
 .el .IP "\fB\f(CBESC [ u\fB\fR" 4
 .IX Item "ESC [ u"
@@ -2000,7 +1985,6 @@ l l .
 h	Application Cursor Keys
 l	Normal Cursor Keys
 .TE
-
 .PD 0
 .ie n .IP "\fB\fB""Pm = 2""\fB\fR (\s-1ANSI/VT52\s0 mode)" 4
 .el .IP "\fB\f(CBPm = 2\fB\fR (\s-1ANSI/VT52\s0 mode)" 4
@@ -2010,7 +1994,6 @@ l l .
 h	Enter VT52 mode
 l	Enter VT52 mode
 .TE
-
 .ie n .IP "\fB\fB""Pm = 3""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 3\fB\fR" 4
 .IX Item "Pm = 3"
@@ -2019,7 +2002,6 @@ l l .
 h	132 Column Mode (DECCOLM)
 l	80 Column Mode (DECCOLM)
 .TE
-
 .ie n .IP "\fB\fB""Pm = 4""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 4\fB\fR" 4
 .IX Item "Pm = 4"
@@ -2028,7 +2010,6 @@ l l .
 h	Smooth (Slow) Scroll (DECSCLM)
 l	Jump (Fast) Scroll (DECSCLM)
 .TE
-
 .ie n .IP "\fB\fB""Pm = 5""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 5\fB\fR" 4
 .IX Item "Pm = 5"
@@ -2037,7 +2018,6 @@ l l .
 h	Reverse Video (DECSCNM)
 l	Normal Video (DECSCNM)
 .TE
-
 .ie n .IP "\fB\fB""Pm = 6""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 6\fB\fR" 4
 .IX Item "Pm = 6"
@@ -2046,7 +2026,6 @@ l l .
 h	Origin Mode (DECOM)
 l	Normal Cursor Mode (DECOM)
 .TE
-
 .ie n .IP "\fB\fB""Pm = 7""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 7\fB\fR" 4
 .IX Item "Pm = 7"
@@ -2055,7 +2034,6 @@ l l .
 h	Wraparound Mode (DECAWM)
 l	No Wraparound Mode (DECAWM)
 .TE
-
 .ie n .IP "\fB\fB""Pm = 8""\fB\fR \fIunimplemented\fR" 4
 .el .IP "\fB\f(CBPm = 8\fB\fR \fIunimplemented\fR" 4
 .IX Item "Pm = 8 unimplemented"
@@ -2064,7 +2042,6 @@ l l .
 h	Auto-repeat Keys (DECARM)
 l	No Auto-repeat Keys (DECARM)
 .TE
-
 .ie n .IP "\fB\fB""Pm = 9""\fB\fR X10 XTerm" 4
 .el .IP "\fB\f(CBPm = 9\fB\fR X10 XTerm" 4
 .IX Item "Pm = 9 X10 XTerm"
@@ -2073,7 +2050,6 @@ l l .
 h	Send Mouse X & Y on button press.
 l	No mouse reporting.
 .TE
-
 .ie n .IP "\fB\fB""Pm = 25""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 25\fB\fR" 4
 .IX Item "Pm = 25"
@@ -2082,16 +2058,14 @@ l l .
 h	Visible cursor {cnorm/cvvis}
 l	Invisible cursor {civis}
 .TE
-
 .ie n .IP "\fB\fB""Pm = 30""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 30\fB\fR" 4
 .IX Item "Pm = 30"
 .TS
 l l .
-h	scrollBar visisble
-l	scrollBar invisisble
+h	scrollBar visible
+l	scrollBar invisible
 .TE
-
 .ie n .IP "\fB\fB""Pm = 35""\fB\fR (\fBrxvt\fR)" 4
 .el .IP "\fB\f(CBPm = 35\fB\fR (\fBrxvt\fR)" 4
 .IX Item "Pm = 35 (rxvt)"
@@ -2100,7 +2074,6 @@ l l .
 h	Allow XTerm Shift+key sequences
 l	Disallow XTerm Shift+key sequences
 .TE
-
 .ie n .IP "\fB\fB""Pm = 38""\fB\fR \fIunimplemented\fR" 4
 .el .IP "\fB\f(CBPm = 38\fB\fR \fIunimplemented\fR" 4
 .IX Item "Pm = 38 unimplemented"
@@ -2114,7 +2087,6 @@ l l .
 h	Allow 80/132 Mode
 l	Disallow 80/132 Mode
 .TE
-
 .PD 0
 .ie n .IP "\fB\fB""Pm = 44""\fB\fR \fIunimplemented\fR" 4
 .el .IP "\fB\f(CBPm = 44\fB\fR \fIunimplemented\fR" 4
@@ -2124,7 +2096,6 @@ l l .
 h	Turn On Margin Bell
 l	Turn Off Margin Bell
 .TE
-
 .ie n .IP "\fB\fB""Pm = 45""\fB\fR \fIunimplemented\fR" 4
 .el .IP "\fB\f(CBPm = 45\fB\fR \fIunimplemented\fR" 4
 .IX Item "Pm = 45 unimplemented"
@@ -2133,7 +2104,6 @@ l l .
 h	Reverse-wraparound Mode
 l	No Reverse-wraparound Mode
 .TE
-
 .ie n .IP "\fB\fB""Pm = 46""\fB\fR \fIunimplemented\fR" 4
 .el .IP "\fB\f(CBPm = 46\fB\fR \fIunimplemented\fR" 4
 .IX Item "Pm = 46 unimplemented"
@@ -2145,7 +2115,6 @@ l l .
 h	Use Alternate Screen Buffer
 l	Use Normal Screen Buffer
 .TE
-
 .PD

 .IX Xref "Priv66"
@@ -2157,7 +2126,6 @@ l l .
 h	Application Keypad (DECPAM) == ESC =
 l	Normal Keypad (DECPNM) == ESC >
 .TE
-
 .PD 0
 .ie n .IP "\fB\fB""Pm = 67""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 67\fB\fR" 4
@@ -2167,7 +2135,6 @@ l l .
 h	Backspace key sends BS (DECBKM)
 l	Backspace key sends DEL
 .TE
-
 .ie n .IP "\fB\fB""Pm = 1000""\fB\fR (X11 XTerm)" 4
 .el .IP "\fB\f(CBPm = 1000\fB\fR (X11 XTerm)" 4
 .IX Item "Pm = 1000 (X11 XTerm)"
@@ -2176,7 +2143,6 @@ l l .
 h	Send Mouse X & Y on button press and release.
 l	No mouse reporting.
 .TE
-
 .ie n .IP "\fB\fB""Pm = 1001""\fB\fR (X11 XTerm) \fIunimplemented\fR" 4
 .el .IP "\fB\f(CBPm = 1001\fB\fR (X11 XTerm) \fIunimplemented\fR" 4
 .IX Item "Pm = 1001 (X11 XTerm) unimplemented"
@@ -2185,7 +2151,6 @@ l l .
 h	Use Hilite Mouse Tracking.
 l	No mouse reporting.
 .TE
-
 .ie n .IP "\fB\fB""Pm = 1002""\fB\fR (X11 XTerm)" 4
 .el .IP "\fB\f(CBPm = 1002\fB\fR (X11 XTerm)" 4
 .IX Item "Pm = 1002 (X11 XTerm)"
@@ -2194,7 +2159,6 @@ l l .
 h	Send Mouse X & Y on button press and release, and motion with a button pressed.
 l	No mouse reporting.
 .TE
-
 .ie n .IP "\fB\fB""Pm = 1003""\fB\fR (X11 XTerm)" 4
 .el .IP "\fB\f(CBPm = 1003\fB\fR (X11 XTerm)" 4
 .IX Item "Pm = 1003 (X11 XTerm)"
@@ -2203,7 +2167,6 @@ l l .
 h	Send Mouse X & Y on button press and release, and motion.
 l	No mouse reporting.
 .TE
-
 .ie n .IP "\fB\fB""Pm = 1010""\fB\fR (\fBrxvt\fR)" 4
 .el .IP "\fB\f(CBPm = 1010\fB\fR (\fBrxvt\fR)" 4
 .IX Item "Pm = 1010 (rxvt)"
@@ -2212,7 +2175,6 @@ l l .
 h	Don't scroll to bottom on TTY output
 l	Scroll to bottom on TTY output
 .TE
-
 .ie n .IP "\fB\fB""Pm = 1011""\fB\fR (\fBrxvt\fR)" 4
 .el .IP "\fB\f(CBPm = 1011\fB\fR (\fBrxvt\fR)" 4
 .IX Item "Pm = 1011 (rxvt)"
@@ -2221,7 +2183,6 @@ l l .
 h	Scroll to bottom when a key is pressed
 l	Don't scroll to bottom when a key is pressed
 .TE
-
 .ie n .IP "\fB\fB""Pm = 1021""\fB\fR (\fBrxvt\fR)" 4
 .el .IP "\fB\f(CBPm = 1021\fB\fR (\fBrxvt\fR)" 4
 .IX Item "Pm = 1021 (rxvt)"
@@ -2230,7 +2191,6 @@ l l .
 h	Bold/italic implies high intensity (see option -is)
 l	Font styles have no effect on intensity (Compile styles)
 .TE
-
 .ie n .IP "\fB\fB""Pm = 1047""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 1047\fB\fR" 4
 .IX Item "Pm = 1047"
@@ -2239,7 +2199,6 @@ l l .
 h	Use Alternate Screen Buffer
 l	Use Normal Screen Buffer - clear Alternate Screen Buffer if returning from it
 .TE
-
 .ie n .IP "\fB\fB""Pm = 1048""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 1048\fB\fR" 4
 .IX Item "Pm = 1048"
@@ -2248,7 +2207,6 @@ l l .
 h	Save cursor position
 l	Restore cursor position
 .TE
-
 .ie n .IP "\fB\fB""Pm = 1049""\fB\fR" 4
 .el .IP "\fB\f(CBPm = 1049\fB\fR" 4
 .IX Item "Pm = 1049"
@@ -2257,7 +2215,14 @@ l l .
 h	Use Alternate Screen Buffer - clear Alternate Screen Buffer if switching to it
 l	Use Normal Screen Buffer
 .TE
-
+.ie n .IP "\fB\fB""Pm = 2004""\fB\fR" 4
+.el .IP "\fB\f(CBPm = 2004\fB\fR" 4
+.IX Item "Pm = 2004"
+.TS
+l l .
+h	Enable bracketed paste mode - prepend / append to the pasted text the control sequences ESC [ 200 ~ / ESC [ 201 ~
+l	Disable bracketed paste mode
+.TE
 .RE
 .RS 4
 .RE
@@ -2280,19 +2245,19 @@ Ps = 1	Change Icon Name to Pt
 Ps = 2	Change Window Title to Pt
 Ps = 3	If Pt starts with a ?, query the (STRING) property of the window and return it. If Pt contains a =, set the named property to the given value, else delete the specified property.
 Ps = 4	Pt is a semi-colon separated sequence of one or more semi-colon separated number/name pairs, where number is an index to a colour and name is the name of a colour. Each pair causes the numbered colour to be changed to name. Numbers 0-7 corresponds to low-intensity (normal) colours and 8-15 corresponds to high-intensity colours. 0=black, 1=red, 2=green, 3=yellow, 4=blue, 5=magenta, 6=cyan, 7=white
-Ps = 10	Change colour of text foreground to Pt (NB: may change in future)
-Ps = 11	Change colour of text background to Pt (NB: may change in future)
+Ps = 10	Change colour of text foreground to Pt
+Ps = 11	Change colour of text background to Pt
 Ps = 12	Change colour of text cursor foreground to Pt
 Ps = 13	Change colour of mouse foreground to Pt
 Ps = 17	Change colour of highlight characters to Pt
 Ps = 18	Change colour of bold characters to Pt [deprecated, see 706]
 Ps = 19	Change colour of underlined characters to Pt [deprecated, see 707]
 Ps = 20	Change background pixmap parameters (see section BACKGROUND IMAGE) (Compile AfterImage).
-Ps = 39	Change default foreground colour to Pt.
+Ps = 39	Change default foreground colour to Pt. [deprecated, use 10]
 Ps = 46	Change Log File to Pt unimplemented
-Ps = 49	Change default background colour to Pt.
+Ps = 49	Change default background colour to Pt. [deprecated, use 11]
 Ps = 50	Set fontset to Pt, with the following special values of Pt (rxvt) #+n change up n #-n change down n if n is missing of 0, a value of 1 is used empty change to font0 n change to font n
-Ps = 55	Log all scrollback buffer and all of screen to Pt
+Ps = 55	Log all scrollback buffer and all of screen to Pt [disabled]
 Ps = 701	Change current locale to Pt, or, if Pt is ?, return the current locale (Compile frills).
 Ps = 702	Request version if Pt is ?, returning rxvt-unicode, the resource name, the major and minor version numbers, e.g. ESC ] 702 ; rxvt-unicode ; urxvt ; 7 ; 4 ST.
 Ps = 704	Change colour of italic characters to Pt
@@ -2307,12 +2272,11 @@ Ps = 720	Move viewing window up by Pt lines, or clear scrollback buffer if Pt =
 Ps = 721	Move viewing window down by Pt lines, or clear scrollback buffer if Pt = 0 (Compile frills).
 Ps = 777	Call the perl extension with the given string, which should be of the form extension:parameters (Compile perl).
 .TE
-
 .SH "BACKGROUND IMAGE"
 .IX Header "BACKGROUND IMAGE"
-For the \s-1BACGROUND\s0 \s-1IMAGE\s0 XTerm escape sequence \fB\f(CB\*(C`ESC ] 20 ; Pt ST\*(C'\fB\fR then value
+For the \s-1BACKGROUND\s0 \s-1IMAGE\s0 XTerm escape sequence \fB\f(CB\*(C`ESC ] 20 ; Pt ST\*(C'\fB\fR the value
 of \fB\f(CB\*(C`Pt\*(C'\fB\fR can be the name of the background image file followed by a
-sequence of scaling/positioning commands separated by semi\-colons. The
+sequence of scaling/positioning commands separated by semi-colons. The
 scaling/positioning commands are as follows:
 .IP "query scale/position" 4
 .IX Item "query scale/position"
@@ -2375,7 +2339,6 @@ l l .
 2	Button3 pressed
 3	button released (X11 mouse report)
 .TE
-
 .PP
 The upper bits of \fB\f(CB\*(C`<b>\*(C'\fB\fR indicate the modifiers when the
 button was pressed and are added together (X11 mouse report only):
@@ -2389,7 +2352,6 @@ l l .
 16	Control
 32	Double Click (rxvt extension)
 .TE
-
 Col = \fB\f(CB\*(C`<x> \- SPACE\*(C'\fB\fR
 .Sp
 Row = \fB\f(CB\*(C`<y> \- SPACE\*(C'\fB\fR
@@ -2463,7 +2425,6 @@ XK_KP_7	7			ESC O w
 XK_KP_8	8			ESC O x
 XK_KP_9	9			ESC O y
 .TE
-
 .SH "CONFIGURE OPTIONS"
 .IX Header "CONFIGURE OPTIONS"
 General hint: if you get compile errors, then likely your configuration
@@ -2485,7 +2446,7 @@ or you can start with a minimal configuration by specifying
 you want.
 .IP "\-\-enable\-xft (default: enabled)" 4
 .IX Item "--enable-xft (default: enabled)"
-Add support for Xft (anti\-aliases, among others) fonts. Xft fonts are
+Add support for Xft (anti-aliases, among others) fonts. Xft fonts are
 slower and require lots of memory, but as long as you don't use them, you
 don't pay for them.
 .IP "\-\-enable\-font\-styles (default: on)" 4
@@ -2510,7 +2471,6 @@ jp	common japanese encodings
 jp_ext	rarely used but big japanese encodings
 kr	korean encodings
 .TE
-
 .IP "\-\-enable\-xim (default: on)" 4
 .IX Item "--enable-xim (default: on)"
 Add support for \s-1XIM\s0 (X Input Method) protocol. This allows using
@@ -2631,31 +2591,31 @@ disable this.
 A non-exhaustive list of features enabled by \f(CW\*(C`\-\-enable\-frills\*(C'\fR (possibly
 in combination with other switches) is:
 .Sp
-.Vb 18
-\&  MWM-hints
-\&  EWMH-hints (pid, utf8 names) and protocols (ping)
+.Vb 10
+\&  MWM\-hints
+\&  EWMH\-hints (pid, utf8 names) and protocols (ping)
 \&  urgency hint
-\&  seperate underline colour (-underlineColor)
-\&  settable border widths and borderless switch (-w, -b, -bl)
-\&  visual depth selection (-depth)
-\&  settable extra linespacing /-lsp)
-\&  iso-14755 5.1 (basic) support
-\&  tripleclickwords (-tcw)
-\&  settable insecure mode (-insecure)
+\&  seperate underline colour (\-underlineColor)
+\&  settable border widths and borderless switch (\-w, \-b, \-bl)
+\&  visual depth selection (\-depth)
+\&  settable extra linespacing /\-lsp)
+\&  iso\-14755 5.1 (basic) support
+\&  tripleclickwords (\-tcw)
+\&  settable insecure mode (\-insecure)
 \&  keysym remapping support
-\&  cursor blinking and underline cursor (-cb, -uc)
-\&  XEmbed support (-embed)
-\&  user-pty (-pty-fd)
-\&  hold on exit (-hold)
-\&  compile in built-in block graphics
-\&  skip builtin block graphics (-sbg)
-\&  separate highlightcolor support (-hc)
+\&  cursor blinking and underline cursor (\-cb, \-uc)
+\&  XEmbed support (\-embed)
+\&  user\-pty (\-pty\-fd)
+\&  hold on exit (\-hold)
+\&  compile in built\-in block graphics
+\&  skip builtin block graphics (\-sbg)
+\&  separate highlightcolor support (\-hc)
 .Ve
 .Sp
 It also enables some non-essential features otherwise disabled, such as:
 .Sp
 .Vb 11
-\&  some round-trip time optimisations
+\&  some round\-trip time optimisations
 \&  nearest color allocation on pseudocolor screens
 \&  UTF8_STRING support for selection
 \&  sgr modes 90..97 and 100..107
@@ -2718,7 +2678,7 @@ Look for the libAfterImage config script in \s-1DIR\s0.
 Set the basename for the installed binaries, resulting
 in \f(CW\*(C`urxvt\*(C'\fR, \f(CW\*(C`urxvtd\*(C'\fR etc.). Specify \f(CW\*(C`\-\-with\-name=rxvt\*(C'\fR to replace with
 \&\f(CW\*(C`rxvt\*(C'\fR.
-.IP "\-\-with\-term=NAME (default: rxvt\-unicode)" 4
+.IP "\-\-with\-term=NAME (default: rxvt-unicode)" 4
 .IX Item "--with-term=NAME (default: rxvt-unicode)"
 Change the environmental variable for the terminal to \s-1NAME\s0.
 .IP "\-\-with\-terminfo=PATH" 4
@@ -2734,3 +2694,12 @@ Marc Lehmann <rxvt@schmorp.de> converted this document to pod and
 reworked it from the original Rxvt documentation, which was done by Geoff
 Wing <gcw@pobox.com>, who in turn used the XTerm documentation and other
 sources.
+.SH "POD ERRORS"
+.IX Header "POD ERRORS"
+Hey! \fBThe above document had some coding errors, which are explained below:\fR
+.IP "Around line 2681:" 4
+.IX Item "Around line 2681:"
+=back doesn't take any parameters, but you said =back  X<Mouse>
+.IP "Around line 2759:" 4
+.IX Item "Around line 2759:"
+=back doesn't take any parameters, but you said =back  X<KeyCodes>
diff --git a/doc/rxvtperl.3.man.in b/doc/rxvtperl.3.man.in

index dfe2d884b27f23409491c37e5871c9fbe8e07322..

index ..c440026d1b6e048ca63a2d254ddddfd0c178d6c0 100644

--- a/doc/rxvtperl.3.man.in
+++ b/doc/rxvtperl.3.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35
+.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -25,11 +25,11 @@
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-
@@ -48,22 +48,25 @@
 .    ds R" ''
 'br\}
 .\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
 .\" If the F register is turned on, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
-.if \nF \{\
+.ie \nF \{\
 .    de IX
 .    tm Index:\\$1\t\\n%\t"\\$2"
 ..
 .    nr % 0
 .    rr F
 .\}
-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
+.el \{\
+.    de IX
+..
+.\}
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -129,28 +132,26 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 3"
-.TH @@RXVT_NAME@@ 3 "2007-12-24" "8.9" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 3 "2008-01-25" "8.9" "RXVT-UNICODE"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
 .SH "NAME"
 @@RXVT_NAME@@perl \- rxvt\-unicode's embedded perl interpreter
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 .Vb 1
 \&   # create a file grab_test in $HOME:
-.Ve
-.PP
-.Vb 4
+\&
 \&   sub on_sel_grab {
-\&      warn "you selected ", $_[0]->selection;
+\&      warn "you selected ", $_[0]\->selection;
 \&      ()
 \&   }
-.Ve
-.PP
-.Vb 1
+\&
 \&   # start a @@RXVT_NAME@@ using it:
-.Ve
-.PP
-.Vb 1
-\&   @@RXVT_NAME@@ --perl-lib $HOME -pe grab_test
+\&
+\&   @@RXVT_NAME@@ \-\-perl\-lib $HOME \-pe grab_test
 .Ve
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
@@ -163,8 +164,8 @@ thus must be encoded as \s-1UTF\-8\s0.
 Each script will only ever be loaded once, even in @@RXVT_NAME@@d, where
 scripts will be shared (but not enabled) for all terminals.
 .PP
-You can disable the embedded perl interpreter by setting both \*(L"perl\-ext\*(R"
-and \*(L"perl\-ext\-common\*(R" resources to the empty string.
+You can disable the embedded perl interpreter by setting both \*(L"perl-ext\*(R"
+and \*(L"perl-ext-common\*(R" resources to the empty string.
 .SH "PREPACKAGED EXTENSIONS"
 .IX Header "PREPACKAGED EXTENSIONS"
 This section describes the extensions delivered with this release. You can
@@ -173,18 +174,18 @@ find them in \fI@@RXVT_LIBDIR@@/urxvt/perl/\fR.
 You can activate them like this:
 .PP
 .Vb 1
-\&  @@RXVT_NAME@@ -pe <extensionname>
+\&  @@RXVT_NAME@@ \-pe <extensionname>
 .Ve
 .PP
 Or by adding them to the resource for extensions loaded by default:
 .PP
 .Vb 1
-\&  URxvt.perl-ext-common: default,selection-autotransform
+\&  URxvt.perl\-ext\-common: default,selection\-autotransform
 .Ve
 .IP "selection (enabled by default)" 4
 .IX Item "selection (enabled by default)"
 (More) intelligent selection. This extension tries to be more intelligent
-when the user extends selections (double\-click and further clicks). Right
+when the user extends selections (double-click and further clicks). Right
 now, it tries to select words, urls and complete shell-quoted
 arguments, which is very convenient, too, if your \fIls\fR supports
 \&\f(CW\*(C`\-\-quoting\-style=shell\*(C'\fR.
@@ -197,8 +198,8 @@ them in increasing order of length. You can add your own regexes by
 specifying resources of the form:
 .Sp
 .Vb 3
-\&   URxvt.selection.pattern-0: perl-regex
-\&   URxvt.selection.pattern-1: perl-regex
+\&   URxvt.selection.pattern\-0: perl\-regex
+\&   URxvt.selection.pattern\-1: perl\-regex
 \&   ...
 .Ve
 .Sp
@@ -208,7 +209,7 @@ the match. For example, the following adds a regex that matches everything
 between two vertical bars:
 .Sp
 .Vb 1
-\&   URxvt.selection.pattern-0: \e\e|([^|]+)\e\e|
+\&   URxvt.selection.pattern\-0: \e\e|([^|]+)\e\e|
 .Ve
 .Sp
 Another example: Programs I use often output \*(L"absolute path: \*(R" at the
@@ -217,7 +218,7 @@ pattern matches the filename (note, there is a single space at the very
 end):
 .Sp
 .Vb 1
-\&   URxvt.selection.pattern-0: ^(/[^:]+):\e
+\&   URxvt.selection.pattern\-0: ^(/[^:]+):\e
 .Ve
 .Sp
 You can look at the source of the selection extension to see more
@@ -230,7 +231,7 @@ This extension also offers following bindable keyboard commands:
 Rot\-13 the selection when activated. Used via keyboard trigger:
 .Sp
 .Vb 1
-\&   URxvt.keysym.C-M-r: perl:selection:rot13
+\&   URxvt.keysym.C\-M\-r: perl:selection:rot13
 .Ve
 .RE
 .RS 4
@@ -254,8 +255,8 @@ The following will add an entry \f(CW\*(C`myoption\*(C'\fR that changes
 \&\f(CW\*(C`$self\-\*(C'\fR{myoption}>:
 .Sp
 .Vb 3
-\&   push @{ $self->{term}{option_popup_hook} }, sub {
-\&      ("my option" => $myoption, sub { $self->{myoption} = $_[0] })
+\&   push @{ $self\->{term}{option_popup_hook} }, sub {
+\&      ("my option" => $myoption, sub { $self\->{myoption} = $_[0] })
 \&   };
 .Ve
 .IP "selection-popup (enabled by default)" 4
@@ -279,7 +280,7 @@ the selection to \f(CW\*(C`b\*(C'\fRs, but only if the selection currently conta
 \&\f(CW\*(C`a\*(C'\fRs:
 .Sp
 .Vb 4
-\&   push @{ $self->{term}{selection_popup_hook} }, sub {
+\&   push @{ $self\->{term}{selection_popup_hook} }, sub {
 \&      /a/ ? ("a to b" => sub { s/a/b/g }
 \&          : ()
 \&   };
@@ -339,8 +340,8 @@ It works by specifying perl snippets (most useful is a single \f(CW\*(C`s///\*(C
 operator) that modify \f(CW$_\fR as resources:
 .Sp
 .Vb 3
-\&   URxvt.selection-autotransform.0: transform
-\&   URxvt.selection-autotransform.1: transform
+\&   URxvt.selection\-autotransform.0: transform
+\&   URxvt.selection\-autotransform.1: transform
 \&   ...
 .Ve
 .Sp
@@ -349,14 +350,14 @@ For example, the following will transform selections of the form
 $word\*(C'\fR:
 .Sp
 .Vb 1
-\&   URxvt.selection-autotransform.0: s/^([^:[:space:]]+):(\e\ed+):?$/vi +$2 \e\eQ$1\e\eE\e\ex0d/
+\&   URxvt.selection\-autotransform.0: s/^([^:[:space:]]+):(\e\ed+):?$/vi +$2 \e\eQ$1\e\eE\e\ex0d/
 .Ve
 .Sp
 And this example matches the same,but replaces it with vi-commands you can
 paste directly into your (vi :) editor:
 .Sp
 .Vb 1
-\&   URxvt.selection-autotransform.0: s/^([^:[:space:]]+(\e\ed+):?$/:e \e\eQ$1\e\eE\e\ex0d:$2\e\ex0d/
+\&   URxvt.selection\-autotransform.0: s/^([^:[:space:]]+(\e\ed+):?$/:e \e\eQ$1\e\eE\e\ex0d:$2\e\ex0d/
 .Ve
 .Sp
 Of course, this can be modified to suit your needs and your editor :)
@@ -365,8 +366,8 @@ To expand the example above to typical perl error messages (\*(L"\s-1XXX\s0 at
 \&\s-1FILENAME\s0 line \s-1YYY\s0.\*(R"), you need a slightly more elaborate solution:
 .Sp
 .Vb 2
-\&   URxvt.selection.pattern-0: ( at .*? line \e\ed+[,.])
-\&   URxvt.selection-autotransform.0: s/^ at (.*?) line (\e\ed+)[,.]$/:e \e\eQ$1\eE\e\ex0d:$2\e\ex0d/
+\&   URxvt.selection.pattern\-0: ( at .*? line \e\ed+[,.])
+\&   URxvt.selection\-autotransform.0: s/^ at (.*?) line (\e\ed+)[,.]$/:e \e\eQ$1\eE\e\ex0d:$2\e\ex0d/
 .Ve
 .Sp
 The first line tells the selection code to treat the unchanging part of
@@ -388,10 +389,10 @@ with a resource class of \f(CW\*(C`URxvt.tabbed\*(C'\fR. In addition, it support
 following four resources (shown with defaults):
 .Sp
 .Vb 4
-\&   URxvt.tabbed.tabbar-fg: <colour-index, default 3>
-\&   URxvt.tabbed.tabbar-bg: <colour-index, default 0>
-\&   URxvt.tabbed.tab-fg:    <colour-index, default 0>
-\&   URxvt.tabbed.tab-bg:    <colour-index, default 1>
+\&   URxvt.tabbed.tabbar\-fg: <colour\-index, default 3>
+\&   URxvt.tabbed.tabbar\-bg: <colour\-index, default 0>
+\&   URxvt.tabbed.tab\-fg:    <colour\-index, default 0>
+\&   URxvt.tabbed.tab\-bg:    <colour\-index, default 1>
 .Ve
 .Sp
 See \fI\s-1COLOR\s0 \s-1AND\s0 \s-1GRAPHICS\s0\fR in the @@RXVT_NAME@@(1) manpage for valid
@@ -405,7 +406,7 @@ middle), the program specified in the \f(CW\*(C`matcher.launcher\*(C'\fR resourc
 (default, the \f(CW\*(C`urlLauncher\*(C'\fR resource, \f(CW\*(C`sensible\-browser\*(C'\fR) will be started
 with the matched text as first argument.  The default configuration is
 suitable for matching URLs and launching a web browser, like the
-former \*(L"mark\-urls\*(R" extension.
+former \*(L"mark-urls\*(R" extension.
 .Sp
 The default pattern to match URLs can be overridden with the
 \&\f(CW\*(C`matcher.pattern.0\*(C'\fR resource, and additional patterns can be specified
@@ -418,11 +419,11 @@ Simply bind a keysym to \*(L"perl:matcher\*(R" as seen in the example below.
 Example configuration:
 .Sp
 .Vb 7
-\&    URxvt.perl-ext:           default,matcher
-\&    URxvt.urlLauncher:        sensible-browser
-\&    URxvt.keysym.C-Delete:    perl:matcher
+\&    URxvt.perl\-ext:           default,matcher
+\&    URxvt.urlLauncher:        sensible\-browser
+\&    URxvt.keysym.C\-Delete:    perl:matcher
 \&    URxvt.matcher.button:     1
-\&    URxvt.matcher.pattern.1:  \e\ebwww\e\e.[\e\ew-]+\e\e.[\e\ew./?&@#-]*[\e\ew/-]
+\&    URxvt.matcher.pattern.1:  \e\ebwww\e\e.[\e\ew\-]+\e\e.[\e\ew./?&@#\-]*[\e\ew/\-]
 \&    URxvt.matcher.pattern.2:  \e\eB(/\e\eS+?):(\e\ed+)(?=:|$)
 \&    URxvt.matcher.launcher.2: gvim +$2 $1
 .Ve
@@ -437,7 +438,7 @@ You enable it by specifying this extension and a preedit style of
 \&\f(CW\*(C`OnTheSpot\*(C'\fR, i.e.:
 .Sp
 .Vb 1
-\&   @@RXVT_NAME@@ -pt OnTheSpot -pe xim-onthespot
+\&   @@RXVT_NAME@@ \-pt OnTheSpot \-pe xim\-onthespot
 .Ve
 .IP "kuake<hotkey>" 4
 .IX Item "kuake<hotkey>"
@@ -483,8 +484,8 @@ the selection data on \s-1STDOUT\s0 (also in \s-1UTF\-8\s0).
 The defaults (which are likely useless to you) use rsh and cat:
 .Sp
 .Vb 2
-\&   URxvt.remote-selection.store: rsh ruth 'cat >/tmp/distributed-selection'
-\&   URxvt.remote-selection.fetch: rsh ruth 'cat /tmp/distributed-selection'
+\&   URxvt.remote\-selection.store: rsh ruth \*(Aqcat >/tmp/distributed\-selection\*(Aq
+\&   URxvt.remote\-selection.fetch: rsh ruth \*(Aqcat /tmp/distributed\-selection\*(Aq
 .Ve
 .IP "selection-pastebin" 4
 .IX Item "selection-pastebin"
@@ -497,14 +498,14 @@ It listens to the \f(CW\*(C`selection\-pastebin:remote\-pastebin\*(C'\fR keyboar
 i.e.
 .Sp
 .Vb 1
-\&   URxvt.keysym.C-M-e: perl:selection-pastebin:remote-pastebin
+\&   URxvt.keysym.C\-M\-e: perl:selection\-pastebin:remote\-pastebin
 .Ve
 .Sp
 Pressing this combination runs a command with \f(CW\*(C`%\*(C'\fR replaced by the name of
 the textfile. This command can be set via a resource:
 .Sp
 .Vb 1
-\&   URxvt.selection-pastebin.cmd: rsync -apP % ruth:/var/www/www.ta-sa.org/files/txt/.
+\&   URxvt.selection\-pastebin.cmd: rsync \-apP % ruth:/var/www/www.ta\-sa.org/files/txt/.
 .Ve
 .Sp
 And the default is likely not useful to anybody but the few people around
@@ -518,7 +519,7 @@ in the \f(CW\*(C`selection\-pastebin\-url\*(C'\fR resource (again, the % is the
 for the filename):
 .Sp
 .Vb 1
-\&   URxvt.selection-pastebin.url: http://www.ta-sa.org/files/txt/%
+\&   URxvt.selection\-pastebin.url: http://www.ta\-sa.org/files/txt/%
 .Ve
 .Sp
 \&\fINote to xrdb users:\fR xrdb uses the C preprocessor, which might interpret
@@ -547,16 +548,19 @@ terminal is destroyed.
 .PP
 Argument names also often indicate the type of a parameter. Here are some
 hints on what they mean:
-.IP "$text" 4
+.ie n .IP "$text" 4
+.el .IP "\f(CW$text\fR" 4
 .IX Item "$text"
 Rxvt-unicodes special way of encoding text, where one \*(L"unicode\*(R" character
 always represents one screen cell. See ROW_t for a discussion of this format.
-.IP "$string" 4
+.ie n .IP "$string" 4
+.el .IP "\f(CW$string\fR" 4
 .IX Item "$string"
 A perl text string, with an emphasis on \fItext\fR. It can store all unicode
 characters and is to be distinguished with text encoded in a specific
-encoding (often locale\-specific) and binary data.
-.IP "$octets" 4
+encoding (often locale-specific) and binary data.
+.ie n .IP "$octets" 4
+.el .IP "\f(CW$octets\fR" 4
 .IX Item "$octets"
 Either binary data or \- more common \- a text string encoded in a
 locale-specific way.
@@ -574,19 +578,19 @@ Although it isn't a \f(CW\*(C`urxvt::term\*(C'\fR object, you can call all metho
 \&\f(CW\*(C`urxvt::term\*(C'\fR class on this object.
 .PP
 It has the following methods and data members:
-.ie n .IP "$urxvt_term = $self\->{term}" 4
-.el .IP "$urxvt_term = \f(CW$self\fR\->{term}" 4
+.ie n .IP "$urxvt_term\fR = \f(CW$self\->{term}" 4
+.el .IP "\f(CW$urxvt_term\fR = \f(CW$self\fR\->{term}" 4
 .IX Item "$urxvt_term = $self->{term}"
 Returns the \f(CW\*(C`urxvt::term\*(C'\fR object associated with this instance of the
 extension. This member \fImust not\fR be changed in any way.
-.ie n .IP "$self\->enable ($hook_name => $cb\fR, [$hook_name => \f(CW$cb..])" 4
-.el .IP "$self\->enable ($hook_name => \f(CW$cb\fR, [$hook_name => \f(CW$cb\fR..])" 4
+.ie n .IP "$self\fR\->enable ($hook_name => \f(CW$cb\fR, [$hook_name => \f(CW$cb..])" 4
+.el .IP "\f(CW$self\fR\->enable ($hook_name => \f(CW$cb\fR, [$hook_name => \f(CW$cb\fR..])" 4
 .IX Item "$self->enable ($hook_name => $cb, [$hook_name => $cb..])"
 Dynamically enable the given hooks (named without the \f(CW\*(C`on_\*(C'\fR prefix) for
 this extension, replacing any previous hook. This is useful when you want
 to overwrite time-critical hooks only temporarily.
-.ie n .IP "$self\->disable ($hook_name[, $hook_name..])" 4
-.el .IP "$self\->disable ($hook_name[, \f(CW$hook_name\fR..])" 4
+.ie n .IP "$self\fR\->disable ($hook_name[, \f(CW$hook_name..])" 4
+.el .IP "\f(CW$self\fR\->disable ($hook_name[, \f(CW$hook_name\fR..])" 4
 .IX Item "$self->disable ($hook_name[, $hook_name..])"
 Dynamically disable the given hooks.
 .Sh "Hooks"
@@ -806,11 +810,11 @@ focus out processing.
 .IX Item "on_unmap_notify $term, $event"
 .PD
 Called whenever the corresponding X event is received for the terminal If
-the hook returns true, then the even will be ignored by rxvt\-unicode.
+the hook returns true, then the even will be ignored by rxvt-unicode.
 .Sp
 The event is a hash with most values as named by Xlib (see the XEvent
 manpage), with the additional members \f(CW\*(C`row\*(C'\fR and \f(CW\*(C`col\*(C'\fR, which are the
-(real, not screen\-based) row and column under the mouse cursor.
+(real, not screen-based) row and column under the mouse cursor.
 .Sp
 \&\f(CW\*(C`on_key_press\*(C'\fR additionally receives the string rxvt-unicode would
 output, if any, in locale-specific encoding.
@@ -832,22 +836,26 @@ format=32, \s-1WM_PROTOCOLS\s0 or \s-1WM_PROTOCOLS:WM_DELETE_WINDOW\s0).
 .ie n .Sh "Variables in the ""urxvt"" Package"
 .el .Sh "Variables in the \f(CWurxvt\fP Package"
 .IX Subsection "Variables in the urxvt Package"
-.IP "$urxvt::LIBDIR" 4
+.ie n .IP "$urxvt::LIBDIR" 4
+.el .IP "\f(CW$urxvt::LIBDIR\fR" 4
 .IX Item "$urxvt::LIBDIR"
 The rxvt-unicode library directory, where, among other things, the perl
 modules and scripts are stored.
-.ie n .IP "$urxvt::RESCLASS, $urxvt::RESCLASS" 4
-.el .IP "$urxvt::RESCLASS, \f(CW$urxvt::RESCLASS\fR" 4
+.ie n .IP "$urxvt::RESCLASS\fR, \f(CW$urxvt::RESCLASS" 4
+.el .IP "\f(CW$urxvt::RESCLASS\fR, \f(CW$urxvt::RESCLASS\fR" 4
 .IX Item "$urxvt::RESCLASS, $urxvt::RESCLASS"
 The resource class and name rxvt-unicode uses to look up X resources.
-.IP "$urxvt::RXVTNAME" 4
+.ie n .IP "$urxvt::RXVTNAME" 4
+.el .IP "\f(CW$urxvt::RXVTNAME\fR" 4
 .IX Item "$urxvt::RXVTNAME"
 The basename of the installed binaries, usually \f(CW\*(C`urxvt\*(C'\fR.
-.IP "$urxvt::TERM" 4
+.ie n .IP "$urxvt::TERM" 4
+.el .IP "\f(CW$urxvt::TERM\fR" 4
 .IX Item "$urxvt::TERM"
 The current terminal. This variable stores the current \f(CW\*(C`urxvt::term\*(C'\fR
 object, whenever a callback/hook is executing.
-.IP "@urxvt::TERM_INIT" 4
+.ie n .IP "@urxvt::TERM_INIT" 4
+.el .IP "\f(CW@urxvt::TERM_INIT\fR" 4
 .IX Item "@urxvt::TERM_INIT"
 All code references in this array will be called as methods of the next newly
 created \f(CW\*(C`urxvt::term\*(C'\fR object (during the \f(CW\*(C`on_init\*(C'\fR phase). The array
@@ -856,7 +864,8 @@ so references can push themselves onto it again if they so desire.
 .Sp
 This complements to the perl-eval command line option, but gets executed
 first.
-.IP "@urxvt::TERM_EXT" 4
+.ie n .IP "@urxvt::TERM_EXT" 4
+.el .IP "\f(CW@urxvt::TERM_EXT\fR" 4
 .IX Item "@urxvt::TERM_EXT"
 Works similar to \f(CW@TERM_INIT\fR, but contains perl package/class names, which
 get registered as normal extensions after calling the hooks in \f(CW@TERM_INIT\fR
@@ -881,13 +890,15 @@ Using this function has the advantage that its output ends up in the
 correct place, e.g. on stderr of the connecting urxvtc client.
 .Sp
 Messages have a size limit of 1023 bytes currently.
-.IP "@terms = urxvt::termlist" 4
+.ie n .IP "@terms = urxvt::termlist" 4
+.el .IP "\f(CW@terms\fR = urxvt::termlist" 4
 .IX Item "@terms = urxvt::termlist"
 Returns all urxvt::term objects that exist in this process, regardless of
 whether they are started, being destroyed etc., so be careful. Only term
 objects that have perl extensions attached will be returned (because there
 is no urxvt::term objet associated with others).
-.IP "$time = urxvt::NOW" 4
+.ie n .IP "$time = urxvt::NOW" 4
+.el .IP "\f(CW$time\fR = urxvt::NOW" 4
 .IX Item "$time = urxvt::NOW"
 Returns the \*(L"current time\*(R" (as per the event loop).
 .IP "urxvt::CurrentTime" 4
@@ -909,49 +920,52 @@ similar information for each screen cell.
 The following \*(L"macros\*(R" deal with changes in rendition sets. You should
 never just create a bitset, you should always modify an existing one,
 as they contain important information required for correct operation of
-rxvt\-unicode.
-.IP "$rend = urxvt::DEFAULT_RSTYLE" 4
+rxvt-unicode.
+.ie n .IP "$rend = urxvt::DEFAULT_RSTYLE" 4
+.el .IP "\f(CW$rend\fR = urxvt::DEFAULT_RSTYLE" 4
 .IX Item "$rend = urxvt::DEFAULT_RSTYLE"
 Returns the default rendition, as used when the terminal is starting up or
 being reset. Useful as a base to start when creating renditions.
-.IP "$rend = urxvt::OVERLAY_RSTYLE" 4
+.ie n .IP "$rend = urxvt::OVERLAY_RSTYLE" 4
+.el .IP "\f(CW$rend\fR = urxvt::OVERLAY_RSTYLE" 4
 .IX Item "$rend = urxvt::OVERLAY_RSTYLE"
 Return the rendition mask used for overlays by default.
-.IP "$rendbit = urxvt::RS_Bold, RS_Italic, RS_Blink, RS_RVid, RS_Uline" 4
+.ie n .IP "$rendbit = urxvt::RS_Bold, RS_Italic, RS_Blink, RS_RVid, RS_Uline" 4
+.el .IP "\f(CW$rendbit\fR = urxvt::RS_Bold, RS_Italic, RS_Blink, RS_RVid, RS_Uline" 4
 .IX Item "$rendbit = urxvt::RS_Bold, RS_Italic, RS_Blink, RS_RVid, RS_Uline"
 Return the bit that enabled bold, italic, blink, reverse-video and
 underline, respectively. To enable such a style, just logically \s-1OR\s0 it into
 the bitset.
-.ie n .IP "$foreground = urxvt::GET_BASEFG $rend" 4
-.el .IP "$foreground = urxvt::GET_BASEFG \f(CW$rend\fR" 4
+.ie n .IP "$foreground\fR = urxvt::GET_BASEFG \f(CW$rend" 4
+.el .IP "\f(CW$foreground\fR = urxvt::GET_BASEFG \f(CW$rend\fR" 4
 .IX Item "$foreground = urxvt::GET_BASEFG $rend"
 .PD 0
-.ie n .IP "$background = urxvt::GET_BASEBG $rend" 4
-.el .IP "$background = urxvt::GET_BASEBG \f(CW$rend\fR" 4
+.ie n .IP "$background\fR = urxvt::GET_BASEBG \f(CW$rend" 4
+.el .IP "\f(CW$background\fR = urxvt::GET_BASEBG \f(CW$rend\fR" 4
 .IX Item "$background = urxvt::GET_BASEBG $rend"
 .PD
 Return the foreground/background colour index, respectively.
-.ie n .IP "$rend = urxvt::SET_FGCOLOR $rend\fR, \f(CW$new_colour" 4
-.el .IP "$rend = urxvt::SET_FGCOLOR \f(CW$rend\fR, \f(CW$new_colour\fR" 4
+.ie n .IP "$rend\fR = urxvt::SET_FGCOLOR \f(CW$rend\fR, \f(CW$new_colour" 4
+.el .IP "\f(CW$rend\fR = urxvt::SET_FGCOLOR \f(CW$rend\fR, \f(CW$new_colour\fR" 4
 .IX Item "$rend = urxvt::SET_FGCOLOR $rend, $new_colour"
 .PD 0
-.ie n .IP "$rend = urxvt::SET_BGCOLOR $rend\fR, \f(CW$new_colour" 4
-.el .IP "$rend = urxvt::SET_BGCOLOR \f(CW$rend\fR, \f(CW$new_colour\fR" 4
+.ie n .IP "$rend\fR = urxvt::SET_BGCOLOR \f(CW$rend\fR, \f(CW$new_colour" 4
+.el .IP "\f(CW$rend\fR = urxvt::SET_BGCOLOR \f(CW$rend\fR, \f(CW$new_colour\fR" 4
 .IX Item "$rend = urxvt::SET_BGCOLOR $rend, $new_colour"
-.ie n .IP "$rend = urxvt::SET_COLOR $rend\fR, \f(CW$new_fg\fR, \f(CW$new_bg" 4
-.el .IP "$rend = urxvt::SET_COLOR \f(CW$rend\fR, \f(CW$new_fg\fR, \f(CW$new_bg\fR" 4
+.ie n .IP "$rend\fR = urxvt::SET_COLOR \f(CW$rend\fR, \f(CW$new_fg\fR, \f(CW$new_bg" 4
+.el .IP "\f(CW$rend\fR = urxvt::SET_COLOR \f(CW$rend\fR, \f(CW$new_fg\fR, \f(CW$new_bg\fR" 4
 .IX Item "$rend = urxvt::SET_COLOR $rend, $new_fg, $new_bg"
 .PD
 Replace the foreground/background colour in the rendition mask with the
 specified one.
-.ie n .IP "$value = urxvt::GET_CUSTOM $rend" 4
-.el .IP "$value = urxvt::GET_CUSTOM \f(CW$rend\fR" 4
+.ie n .IP "$value\fR = urxvt::GET_CUSTOM \f(CW$rend" 4
+.el .IP "\f(CW$value\fR = urxvt::GET_CUSTOM \f(CW$rend\fR" 4
 .IX Item "$value = urxvt::GET_CUSTOM $rend"
 Return the \*(L"custom\*(R" value: Every rendition has 5 bits for use by
 extensions. They can be set and changed as you like and are initially
 zero.
-.ie n .IP "$rend = urxvt::SET_CUSTOM $rend\fR, \f(CW$new_value" 4
-.el .IP "$rend = urxvt::SET_CUSTOM \f(CW$rend\fR, \f(CW$new_value\fR" 4
+.ie n .IP "$rend\fR = urxvt::SET_CUSTOM \f(CW$rend\fR, \f(CW$new_value" 4
+.el .IP "\f(CW$rend\fR = urxvt::SET_CUSTOM \f(CW$rend\fR, \f(CW$new_value\fR" 4
 .IX Item "$rend = urxvt::SET_CUSTOM $rend, $new_value"
 Change the custom value.
 .ie n .Sh "The ""urxvt::anyevent"" Class"
@@ -966,8 +980,8 @@ work.
 .ie n .Sh "The ""urxvt::term"" Class"
 .el .Sh "The \f(CWurxvt::term\fP Class"
 .IX Subsection "The urxvt::term Class"
-.ie n .IP "$term = new urxvt::term $envhashref\fR, \f(CW$rxvtname, [arg...]" 4
-.el .IP "$term = new urxvt::term \f(CW$envhashref\fR, \f(CW$rxvtname\fR, [arg...]" 4
+.ie n .IP "$term\fR = new urxvt::term \f(CW$envhashref\fR, \f(CW$rxvtname, [arg...]" 4
+.el .IP "\f(CW$term\fR = new urxvt::term \f(CW$envhashref\fR, \f(CW$rxvtname\fR, [arg...]" 4
 .IX Item "$term = new urxvt::term $envhashref, $rxvtname, [arg...]"
 Creates a new terminal, very similar as if you had started it with system
 \&\f(CW\*(C`$rxvtname, arg...\*(C'\fR. \f(CW$envhashref\fR must be a reference to a \f(CW%ENV\fR\-like
@@ -978,13 +992,14 @@ couldn't be created.  Returns \f(CW\*(C`undef\*(C'\fR if the new instance didn't
 initialise perl, and the terminal object otherwise. The \f(CW\*(C`init\*(C'\fR and
 \&\f(CW\*(C`start\*(C'\fR hooks will be called before this call returns, and are free to
 refer to global data (which is race free).
-.IP "$term\->destroy" 4
+.ie n .IP "$term\->destroy" 4
+.el .IP "\f(CW$term\fR\->destroy" 4
 .IX Item "$term->destroy"
 Destroy the terminal object (close the window, free resources
 etc.). Please note that @@RXVT_NAME@@ will not exit as long as any event
 watchers (timers, io watchers) are still active.
-.ie n .IP "$term\->exec_async ($cmd[, @args])" 4
-.el .IP "$term\->exec_async ($cmd[, \f(CW@args\fR])" 4
+.ie n .IP "$term\fR\->exec_async ($cmd[, \f(CW@args])" 4
+.el .IP "\f(CW$term\fR\->exec_async ($cmd[, \f(CW@args\fR])" 4
 .IX Item "$term->exec_async ($cmd[, @args])"
 Works like the combination of the \f(CW\*(C`fork\*(C'\fR/\f(CW\*(C`exec\*(C'\fR builtins, which executes
 (\*(L"starts\*(R") programs in the background. This function takes care of setting
@@ -992,8 +1007,8 @@ the user environment before exec'ing the command (e.g. \f(CW\*(C`PATH\*(C'\fR) a
 be preferred over explicit calls to \f(CW\*(C`exec\*(C'\fR or \f(CW\*(C`system\*(C'\fR.
 .Sp
 Returns the pid of the subprocess or \f(CW\*(C`undef\*(C'\fR on error.
-.ie n .IP "$isset = $term\fR\->option ($optval[, \f(CW$set])" 4
-.el .IP "$isset = \f(CW$term\fR\->option ($optval[, \f(CW$set\fR])" 4
+.ie n .IP "$isset\fR = \f(CW$term\fR\->option ($optval[, \f(CW$set])" 4
+.el .IP "\f(CW$isset\fR = \f(CW$term\fR\->option ($optval[, \f(CW$set\fR])" 4
 .IX Item "$isset = $term->option ($optval[, $set])"
 Returns true if the option specified by \f(CW$optval\fR is enabled, and
 optionally change it. All option values are stored by name in the hash
@@ -1005,13 +1020,13 @@ source file \fI/src/optinc.h\fR to see the actual list:
 .Vb 6
 \& borderLess console cursorBlink cursorUnderline hold iconic insecure
 \& intensityStyles jumpScroll loginShell mapAlert meta8 mouseWheelScrollPage
-\& override-redirect pastableTabs pointerBlank reverseVideo scrollBar
+\& override\-redirect pastableTabs pointerBlank reverseVideo scrollBar
 \& scrollBar_floating scrollBar_right scrollTtyKeypress scrollTtyOutput
 \& scrollWithBuffer secondaryScreen secondaryScroll skipBuiltinGlyphs
 \& transparent tripleclickwords utmpInhibit visualBell
 .Ve
-.ie n .IP "$value = $term\fR\->resource ($name[, \f(CW$newval])" 4
-.el .IP "$value = \f(CW$term\fR\->resource ($name[, \f(CW$newval\fR])" 4
+.ie n .IP "$value\fR = \f(CW$term\fR\->resource ($name[, \f(CW$newval])" 4
+.el .IP "\f(CW$value\fR = \f(CW$term\fR\->resource ($name[, \f(CW$newval\fR])" 4
 .IX Item "$value = $term->resource ($name[, $newval])"
 Returns the current resource value associated with a given name and
 optionally sets a new value. Setting values is most useful in the \f(CW\*(C`init\*(C'\fR
@@ -1032,7 +1047,7 @@ Here is a likely non-exhaustive list of resource names, not all of which
 are supported in every build, please see the source file \fI/src/rsinc.h\fR
 to see the actual list:
 .Sp
-.Vb 13
+.Vb 10
 \&  answerbackstring backgroundPixmap backspace_key boldFont boldItalicFont
 \&  borderLess color cursorBlink cursorUnderline cutchars delete_key
 \&  display_name embed ext_bwidth fade font geometry hold iconName
@@ -1047,24 +1062,24 @@ to see the actual list:
 \&  transient_for transparent transparent_all tripleclickwords utmpInhibit
 \&  visualBell
 .Ve
-.ie n .IP "$value = $term\->x_resource ($pattern)" 4
-.el .IP "$value = \f(CW$term\fR\->x_resource ($pattern)" 4
+.ie n .IP "$value\fR = \f(CW$term\->x_resource ($pattern)" 4
+.el .IP "\f(CW$value\fR = \f(CW$term\fR\->x_resource ($pattern)" 4
 .IX Item "$value = $term->x_resource ($pattern)"
 Returns the X\-Resource for the given pattern, excluding the program or
 class name, i.e.  \f(CW\*(C`$term\->x_resource ("boldFont")\*(C'\fR should return the
-same value as used by this instance of rxvt\-unicode. Returns \f(CW\*(C`undef\*(C'\fR if no
+same value as used by this instance of rxvt-unicode. Returns \f(CW\*(C`undef\*(C'\fR if no
 resource with that pattern exists.
 .Sp
 This method should only be called during the \f(CW\*(C`on_start\*(C'\fR hook, as there is
 only one resource database per display, and later invocations might return
 the wrong resources.
-.ie n .IP "$success = $term\fR\->parse_keysym ($keysym_spec, \f(CW$command_string)" 4
-.el .IP "$success = \f(CW$term\fR\->parse_keysym ($keysym_spec, \f(CW$command_string\fR)" 4
+.ie n .IP "$success\fR = \f(CW$term\fR\->parse_keysym ($keysym_spec, \f(CW$command_string)" 4
+.el .IP "\f(CW$success\fR = \f(CW$term\fR\->parse_keysym ($keysym_spec, \f(CW$command_string\fR)" 4
 .IX Item "$success = $term->parse_keysym ($keysym_spec, $command_string)"
 Adds a keymap translation exactly as specified via a resource. See the
 \&\f(CW\*(C`keysym\*(C'\fR resource in the @@RXVT_NAME@@(1) manpage.
-.ie n .IP "$rend = $term\->rstyle ([$new_rstyle])" 4
-.el .IP "$rend = \f(CW$term\fR\->rstyle ([$new_rstyle])" 4
+.ie n .IP "$rend\fR = \f(CW$term\->rstyle ([$new_rstyle])" 4
+.el .IP "\f(CW$rend\fR = \f(CW$term\fR\->rstyle ([$new_rstyle])" 4
 .IX Item "$rend = $term->rstyle ([$new_rstyle])"
 Return and optionally change the current rendition. Text that is output by
 the terminal application will use this style.
@@ -1086,29 +1101,29 @@ set it (which is usually bad as applications don't expect that).
 .PD
 Return the current values of the selection mark, begin or end positions,
 and optionally set them to new values.
-.ie n .IP "$term\->selection_make ($eventtime[, $rectangular])" 4
-.el .IP "$term\->selection_make ($eventtime[, \f(CW$rectangular\fR])" 4
+.ie n .IP "$term\fR\->selection_make ($eventtime[, \f(CW$rectangular])" 4
+.el .IP "\f(CW$term\fR\->selection_make ($eventtime[, \f(CW$rectangular\fR])" 4
 .IX Item "$term->selection_make ($eventtime[, $rectangular])"
 Tries to make a selection as set by \f(CW\*(C`selection_beg\*(C'\fR and
 \&\f(CW\*(C`selection_end\*(C'\fR. If \f(CW$rectangular\fR is true (default: false), a
 rectangular selection will be made. This is the prefered function to make
 a selection.
-.ie n .IP "$success = $term\->selection_grab ($eventtime)" 4
-.el .IP "$success = \f(CW$term\fR\->selection_grab ($eventtime)" 4
+.ie n .IP "$success\fR = \f(CW$term\->selection_grab ($eventtime)" 4
+.el .IP "\f(CW$success\fR = \f(CW$term\fR\->selection_grab ($eventtime)" 4
 .IX Item "$success = $term->selection_grab ($eventtime)"
 Try to request the primary selection text from the server (for example, as
 set by the next method). No visual feedback will be given. This function
 is mostly useful from within \f(CW\*(C`on_sel_grab\*(C'\fR hooks.
-.ie n .IP "$oldtext = $term\->selection ([$newtext])" 4
-.el .IP "$oldtext = \f(CW$term\fR\->selection ([$newtext])" 4
+.ie n .IP "$oldtext\fR = \f(CW$term\->selection ([$newtext])" 4
+.el .IP "\f(CW$oldtext\fR = \f(CW$term\fR\->selection ([$newtext])" 4
 .IX Item "$oldtext = $term->selection ([$newtext])"
 Return the current selection text and optionally replace it by \f(CW$newtext\fR.
-.ie n .IP "$term\->overlay_simple ($x, $y\fR, \f(CW$text)" 4
-.el .IP "$term\->overlay_simple ($x, \f(CW$y\fR, \f(CW$text\fR)" 4
+.ie n .IP "$term\fR\->overlay_simple ($x, \f(CW$y\fR, \f(CW$text)" 4
+.el .IP "\f(CW$term\fR\->overlay_simple ($x, \f(CW$y\fR, \f(CW$text\fR)" 4
 .IX Item "$term->overlay_simple ($x, $y, $text)"
 Create a simple multi-line overlay box. See the next method for details.
-.ie n .IP "$term\->overlay ($x, $y\fR, \f(CW$width\fR, \f(CW$height\fR[, \f(CW$rstyle\fR[, \f(CW$border]])" 4
-.el .IP "$term\->overlay ($x, \f(CW$y\fR, \f(CW$width\fR, \f(CW$height\fR[, \f(CW$rstyle\fR[, \f(CW$border\fR]])" 4
+.ie n .IP "$term\fR\->overlay ($x, \f(CW$y\fR, \f(CW$width\fR, \f(CW$height\fR[, \f(CW$rstyle\fR[, \f(CW$border]])" 4
+.el .IP "\f(CW$term\fR\->overlay ($x, \f(CW$y\fR, \f(CW$width\fR, \f(CW$height\fR[, \f(CW$rstyle\fR[, \f(CW$border\fR]])" 4
 .IX Item "$term->overlay ($x, $y, $width, $height[, $rstyle[, $border]])"
 Create a new (empty) overlay at the given position with the given
 width/height. \f(CW$rstyle\fR defines the initial rendition style
@@ -1125,57 +1140,61 @@ as long as the perl object is referenced.
 .Sp
 The methods currently supported on \f(CW\*(C`urxvt::overlay\*(C'\fR objects are:
 .RS 4
-.ie n .IP "$overlay\->set ($x, $y\fR, \f(CW$text\fR, \f(CW$rend)" 4
-.el .IP "$overlay\->set ($x, \f(CW$y\fR, \f(CW$text\fR, \f(CW$rend\fR)" 4
+.ie n .IP "$overlay\fR\->set ($x, \f(CW$y\fR, \f(CW$text\fR, \f(CW$rend)" 4
+.el .IP "\f(CW$overlay\fR\->set ($x, \f(CW$y\fR, \f(CW$text\fR, \f(CW$rend\fR)" 4
 .IX Item "$overlay->set ($x, $y, $text, $rend)"
 Similar to \f(CW\*(C`$term\->ROW_t\*(C'\fR and \f(CW\*(C`$term\->ROW_r\*(C'\fR in that it puts
-text in rxvt\-unicode's special encoding and an array of rendition values
+text in rxvt-unicode's special encoding and an array of rendition values
 at a specific position inside the overlay.
-.IP "$overlay\->hide" 4
+.ie n .IP "$overlay\->hide" 4
+.el .IP "\f(CW$overlay\fR\->hide" 4
 .IX Item "$overlay->hide"
 If visible, hide the overlay, but do not destroy it.
-.IP "$overlay\->show" 4
+.ie n .IP "$overlay\->show" 4
+.el .IP "\f(CW$overlay\fR\->show" 4
 .IX Item "$overlay->show"
 If hidden, display the overlay again.
 .RE
 .RS 4
 .RE
-.ie n .IP "$popup = $term\->popup ($event)" 4
-.el .IP "$popup = \f(CW$term\fR\->popup ($event)" 4
+.ie n .IP "$popup\fR = \f(CW$term\->popup ($event)" 4
+.el .IP "\f(CW$popup\fR = \f(CW$term\fR\->popup ($event)" 4
 .IX Item "$popup = $term->popup ($event)"
 Creates a new \f(CW\*(C`urxvt::popup\*(C'\fR object that implements a popup menu. The
 \&\f(CW$event\fR \fImust\fR be the event causing the menu to pop up (a button event,
 currently).
-.ie n .IP "$cellwidth = $term\->strwidth ($string)" 4
-.el .IP "$cellwidth = \f(CW$term\fR\->strwidth ($string)" 4
+.ie n .IP "$cellwidth\fR = \f(CW$term\->strwidth ($string)" 4
+.el .IP "\f(CW$cellwidth\fR = \f(CW$term\fR\->strwidth ($string)" 4
 .IX Item "$cellwidth = $term->strwidth ($string)"
 Returns the number of screen-cells this string would need. Correctly
 accounts for wide and combining characters.
-.ie n .IP "$octets = $term\->locale_encode ($string)" 4
-.el .IP "$octets = \f(CW$term\fR\->locale_encode ($string)" 4
+.ie n .IP "$octets\fR = \f(CW$term\->locale_encode ($string)" 4
+.el .IP "\f(CW$octets\fR = \f(CW$term\fR\->locale_encode ($string)" 4
 .IX Item "$octets = $term->locale_encode ($string)"
 Convert the given text string into the corresponding locale encoding.
-.ie n .IP "$string = $term\->locale_decode ($octets)" 4
-.el .IP "$string = \f(CW$term\fR\->locale_decode ($octets)" 4
+.ie n .IP "$string\fR = \f(CW$term\->locale_decode ($octets)" 4
+.el .IP "\f(CW$string\fR = \f(CW$term\fR\->locale_decode ($octets)" 4
 .IX Item "$string = $term->locale_decode ($octets)"
 Convert the given locale-encoded octets into a perl string.
-.ie n .IP "$term\->scr_xor_span ($beg_row, $beg_col\fR, \f(CW$end_row\fR, \f(CW$end_col\fR[, \f(CW$rstyle])" 4
-.el .IP "$term\->scr_xor_span ($beg_row, \f(CW$beg_col\fR, \f(CW$end_row\fR, \f(CW$end_col\fR[, \f(CW$rstyle\fR])" 4
+.ie n .IP "$term\fR\->scr_xor_span ($beg_row, \f(CW$beg_col\fR, \f(CW$end_row\fR, \f(CW$end_col\fR[, \f(CW$rstyle])" 4
+.el .IP "\f(CW$term\fR\->scr_xor_span ($beg_row, \f(CW$beg_col\fR, \f(CW$end_row\fR, \f(CW$end_col\fR[, \f(CW$rstyle\fR])" 4
 .IX Item "$term->scr_xor_span ($beg_row, $beg_col, $end_row, $end_col[, $rstyle])"
 XORs the rendition values in the given span with the provided value
 (default: \f(CW\*(C`RS_RVid\*(C'\fR), which \fI\s-1MUST\s0 \s-1NOT\s0\fR contain font styles. Useful in
 refresh hooks to provide effects similar to the selection.
-.ie n .IP "$term\->scr_xor_rect ($beg_row, $beg_col\fR, \f(CW$end_row\fR, \f(CW$end_col\fR[, \f(CW$rstyle1\fR[, \f(CW$rstyle2]])" 4
-.el .IP "$term\->scr_xor_rect ($beg_row, \f(CW$beg_col\fR, \f(CW$end_row\fR, \f(CW$end_col\fR[, \f(CW$rstyle1\fR[, \f(CW$rstyle2\fR]])" 4
+.ie n .IP "$term\fR\->scr_xor_rect ($beg_row, \f(CW$beg_col\fR, \f(CW$end_row\fR, \f(CW$end_col\fR[, \f(CW$rstyle1\fR[, \f(CW$rstyle2]])" 4
+.el .IP "\f(CW$term\fR\->scr_xor_rect ($beg_row, \f(CW$beg_col\fR, \f(CW$end_row\fR, \f(CW$end_col\fR[, \f(CW$rstyle1\fR[, \f(CW$rstyle2\fR]])" 4
 .IX Item "$term->scr_xor_rect ($beg_row, $beg_col, $end_row, $end_col[, $rstyle1[, $rstyle2]])"
 Similar to \f(CW\*(C`scr_xor_span\*(C'\fR, but xors a rectangle instead. Trailing
 whitespace will additionally be xored with the \f(CW$rstyle2\fR, which defaults
 to \f(CW\*(C`RS_RVid | RS_Uline\*(C'\fR, which removes reverse video again and underlines
 it instead. Both styles \fI\s-1MUST\s0 \s-1NOT\s0\fR contain font styles.
-.IP "$term\->scr_bell" 4
+.ie n .IP "$term\->scr_bell" 4
+.el .IP "\f(CW$term\fR\->scr_bell" 4
 .IX Item "$term->scr_bell"
 Ring the bell!
-.IP "$term\->scr_add_lines ($string)" 4
+.ie n .IP "$term\->scr_add_lines ($string)" 4
+.el .IP "\f(CW$term\fR\->scr_add_lines ($string)" 4
 .IX Item "$term->scr_add_lines ($string)"
 Write the given text string to the screen, as if output by the application
 running inside the terminal. It may not contain command sequences (escape
@@ -1185,157 +1204,164 @@ string is a normal text string, not in locale-dependent encoding.
 Normally its not a good idea to use this function, as programs might be
 confused by changes in cursor position or scrolling. Its useful inside a
 \&\f(CW\*(C`on_add_lines\*(C'\fR hook, though.
-.IP "$term\->scr_change_screen ($screen)" 4
+.ie n .IP "$term\->scr_change_screen ($screen)" 4
+.el .IP "\f(CW$term\fR\->scr_change_screen ($screen)" 4
 .IX Item "$term->scr_change_screen ($screen)"
 Switch to given screen \- 0 primary, 1 secondary.
-.IP "$term\->cmd_parse ($octets)" 4
+.ie n .IP "$term\->cmd_parse ($octets)" 4
+.el .IP "\f(CW$term\fR\->cmd_parse ($octets)" 4
 .IX Item "$term->cmd_parse ($octets)"
 Similar to \f(CW\*(C`scr_add_lines\*(C'\fR, but the argument must be in the
 locale-specific encoding of the terminal and can contain command sequences
 (escape codes) that will be interpreted.
-.IP "$term\->tt_write ($octets)" 4
+.ie n .IP "$term\->tt_write ($octets)" 4
+.el .IP "\f(CW$term\fR\->tt_write ($octets)" 4
 .IX Item "$term->tt_write ($octets)"
 Write the octets given in \f(CW$data\fR to the tty (i.e. as program input). To
 pass characters instead of octets, you should convert your strings first
 to the locale-specific encoding using \f(CW\*(C`$term\->locale_encode\*(C'\fR.
-.ie n .IP "$old_events = $term\->pty_ev_events ([$new_events])" 4
-.el .IP "$old_events = \f(CW$term\fR\->pty_ev_events ([$new_events])" 4
+.ie n .IP "$old_events\fR = \f(CW$term\->pty_ev_events ([$new_events])" 4
+.el .IP "\f(CW$old_events\fR = \f(CW$term\fR\->pty_ev_events ([$new_events])" 4
 .IX Item "$old_events = $term->pty_ev_events ([$new_events])"
 Replaces the event mask of the pty watcher by the given event mask. Can
 be used to suppress input and output handling to the pty/tty. See the
 description of \f(CW\*(C`urxvt::timer\->events\*(C'\fR. Make sure to always restore
 the previous value.
-.ie n .IP "$fd = $term\->pty_fd" 4
-.el .IP "$fd = \f(CW$term\fR\->pty_fd" 4
+.ie n .IP "$fd\fR = \f(CW$term\->pty_fd" 4
+.el .IP "\f(CW$fd\fR = \f(CW$term\fR\->pty_fd" 4
 .IX Item "$fd = $term->pty_fd"
 Returns the master file descriptor for the pty in use, or \f(CW\*(C`\-1\*(C'\fR if no pty
 is used.
-.ie n .IP "$windowid = $term\->parent" 4
-.el .IP "$windowid = \f(CW$term\fR\->parent" 4
+.ie n .IP "$windowid\fR = \f(CW$term\->parent" 4
+.el .IP "\f(CW$windowid\fR = \f(CW$term\fR\->parent" 4
 .IX Item "$windowid = $term->parent"
 Return the window id of the toplevel window.
-.ie n .IP "$windowid = $term\->vt" 4
-.el .IP "$windowid = \f(CW$term\fR\->vt" 4
+.ie n .IP "$windowid\fR = \f(CW$term\->vt" 4
+.el .IP "\f(CW$windowid\fR = \f(CW$term\fR\->vt" 4
 .IX Item "$windowid = $term->vt"
 Return the window id of the terminal window.
-.IP "$term\->vt_emask_add ($x_event_mask)" 4
+.ie n .IP "$term\->vt_emask_add ($x_event_mask)" 4
+.el .IP "\f(CW$term\fR\->vt_emask_add ($x_event_mask)" 4
 .IX Item "$term->vt_emask_add ($x_event_mask)"
 Adds the specified events to the vt event mask. Useful e.g. when you want
 to receive pointer events all the times:
 .Sp
 .Vb 1
-\&   $term->vt_emask_add (urxvt::PointerMotionMask);
+\&   $term\->vt_emask_add (urxvt::PointerMotionMask);
 .Ve
-.IP "$term\->focus_in" 4
+.ie n .IP "$term\->focus_in" 4
+.el .IP "\f(CW$term\fR\->focus_in" 4
 .IX Item "$term->focus_in"
 .PD 0
-.IP "$term\->focus_out" 4
+.ie n .IP "$term\->focus_out" 4
+.el .IP "\f(CW$term\fR\->focus_out" 4
 .IX Item "$term->focus_out"
-.ie n .IP "$term\->key_press ($state, $keycode\fR[, \f(CW$time])" 4
-.el .IP "$term\->key_press ($state, \f(CW$keycode\fR[, \f(CW$time\fR])" 4
+.ie n .IP "$term\fR\->key_press ($state, \f(CW$keycode\fR[, \f(CW$time])" 4
+.el .IP "\f(CW$term\fR\->key_press ($state, \f(CW$keycode\fR[, \f(CW$time\fR])" 4
 .IX Item "$term->key_press ($state, $keycode[, $time])"
-.ie n .IP "$term\->key_release ($state, $keycode\fR[, \f(CW$time])" 4
-.el .IP "$term\->key_release ($state, \f(CW$keycode\fR[, \f(CW$time\fR])" 4
+.ie n .IP "$term\fR\->key_release ($state, \f(CW$keycode\fR[, \f(CW$time])" 4
+.el .IP "\f(CW$term\fR\->key_release ($state, \f(CW$keycode\fR[, \f(CW$time\fR])" 4
 .IX Item "$term->key_release ($state, $keycode[, $time])"
 .PD
 Deliver various fake events to to terminal.
-.ie n .IP "$window_width = $term\->width" 4
-.el .IP "$window_width = \f(CW$term\fR\->width" 4
+.ie n .IP "$window_width\fR = \f(CW$term\->width" 4
+.el .IP "\f(CW$window_width\fR = \f(CW$term\fR\->width" 4
 .IX Item "$window_width = $term->width"
 .PD 0
-.ie n .IP "$window_height = $term\->height" 4
-.el .IP "$window_height = \f(CW$term\fR\->height" 4
+.ie n .IP "$window_height\fR = \f(CW$term\->height" 4
+.el .IP "\f(CW$window_height\fR = \f(CW$term\fR\->height" 4
 .IX Item "$window_height = $term->height"
-.ie n .IP "$font_width = $term\->fwidth" 4
-.el .IP "$font_width = \f(CW$term\fR\->fwidth" 4
+.ie n .IP "$font_width\fR = \f(CW$term\->fwidth" 4
+.el .IP "\f(CW$font_width\fR = \f(CW$term\fR\->fwidth" 4
 .IX Item "$font_width = $term->fwidth"
-.ie n .IP "$font_height = $term\->fheight" 4
-.el .IP "$font_height = \f(CW$term\fR\->fheight" 4
+.ie n .IP "$font_height\fR = \f(CW$term\->fheight" 4
+.el .IP "\f(CW$font_height\fR = \f(CW$term\fR\->fheight" 4
 .IX Item "$font_height = $term->fheight"
-.ie n .IP "$font_ascent = $term\->fbase" 4
-.el .IP "$font_ascent = \f(CW$term\fR\->fbase" 4
+.ie n .IP "$font_ascent\fR = \f(CW$term\->fbase" 4
+.el .IP "\f(CW$font_ascent\fR = \f(CW$term\fR\->fbase" 4
 .IX Item "$font_ascent = $term->fbase"
-.ie n .IP "$terminal_rows = $term\->nrow" 4
-.el .IP "$terminal_rows = \f(CW$term\fR\->nrow" 4
+.ie n .IP "$terminal_rows\fR = \f(CW$term\->nrow" 4
+.el .IP "\f(CW$terminal_rows\fR = \f(CW$term\fR\->nrow" 4
 .IX Item "$terminal_rows = $term->nrow"
-.ie n .IP "$terminal_columns = $term\->ncol" 4
-.el .IP "$terminal_columns = \f(CW$term\fR\->ncol" 4
+.ie n .IP "$terminal_columns\fR = \f(CW$term\->ncol" 4
+.el .IP "\f(CW$terminal_columns\fR = \f(CW$term\fR\->ncol" 4
 .IX Item "$terminal_columns = $term->ncol"
-.ie n .IP "$has_focus = $term\->focus" 4
-.el .IP "$has_focus = \f(CW$term\fR\->focus" 4
+.ie n .IP "$has_focus\fR = \f(CW$term\->focus" 4
+.el .IP "\f(CW$has_focus\fR = \f(CW$term\fR\->focus" 4
 .IX Item "$has_focus = $term->focus"
-.ie n .IP "$is_mapped = $term\->mapped" 4
-.el .IP "$is_mapped = \f(CW$term\fR\->mapped" 4
+.ie n .IP "$is_mapped\fR = \f(CW$term\->mapped" 4
+.el .IP "\f(CW$is_mapped\fR = \f(CW$term\fR\->mapped" 4
 .IX Item "$is_mapped = $term->mapped"
-.ie n .IP "$max_scrollback = $term\->saveLines" 4
-.el .IP "$max_scrollback = \f(CW$term\fR\->saveLines" 4
+.ie n .IP "$max_scrollback\fR = \f(CW$term\->saveLines" 4
+.el .IP "\f(CW$max_scrollback\fR = \f(CW$term\fR\->saveLines" 4
 .IX Item "$max_scrollback = $term->saveLines"
-.ie n .IP "$nrow_plus_saveLines = $term\->total_rows" 4
-.el .IP "$nrow_plus_saveLines = \f(CW$term\fR\->total_rows" 4
+.ie n .IP "$nrow_plus_saveLines\fR = \f(CW$term\->total_rows" 4
+.el .IP "\f(CW$nrow_plus_saveLines\fR = \f(CW$term\fR\->total_rows" 4
 .IX Item "$nrow_plus_saveLines = $term->total_rows"
-.ie n .IP "$topmost_scrollback_row = $term\->top_row" 4
-.el .IP "$topmost_scrollback_row = \f(CW$term\fR\->top_row" 4
+.ie n .IP "$topmost_scrollback_row\fR = \f(CW$term\->top_row" 4
+.el .IP "\f(CW$topmost_scrollback_row\fR = \f(CW$term\fR\->top_row" 4
 .IX Item "$topmost_scrollback_row = $term->top_row"
 .PD
 Return various integers describing terminal characteristics.
-.ie n .IP "$x_display = $term\->display_id" 4
-.el .IP "$x_display = \f(CW$term\fR\->display_id" 4
+.ie n .IP "$x_display\fR = \f(CW$term\->display_id" 4
+.el .IP "\f(CW$x_display\fR = \f(CW$term\fR\->display_id" 4
 .IX Item "$x_display = $term->display_id"
-Return the \s-1DISPLAY\s0 used by rxvt\-unicode.
-.ie n .IP "$lc_ctype = $term\->locale" 4
-.el .IP "$lc_ctype = \f(CW$term\fR\->locale" 4
+Return the \s-1DISPLAY\s0 used by rxvt-unicode.
+.ie n .IP "$lc_ctype\fR = \f(CW$term\->locale" 4
+.el .IP "\f(CW$lc_ctype\fR = \f(CW$term\fR\->locale" 4
 .IX Item "$lc_ctype = $term->locale"
-Returns the \s-1LC_CTYPE\s0 category string used by this rxvt\-unicode.
-.ie n .IP "$env = $term\->env" 4
-.el .IP "$env = \f(CW$term\fR\->env" 4
+Returns the \s-1LC_CTYPE\s0 category string used by this rxvt-unicode.
+.ie n .IP "$env\fR = \f(CW$term\->env" 4
+.el .IP "\f(CW$env\fR = \f(CW$term\fR\->env" 4
 .IX Item "$env = $term->env"
 Returns a copy of the environment in effect for the terminal as a hashref
 similar to \f(CW\*(C`\e%ENV\*(C'\fR.
-.ie n .IP "@envv = $term\->envv" 4
-.el .IP "@envv = \f(CW$term\fR\->envv" 4
+.ie n .IP "@envv\fR = \f(CW$term\->envv" 4
+.el .IP "\f(CW@envv\fR = \f(CW$term\fR\->envv" 4
 .IX Item "@envv = $term->envv"
 Returns the environment as array of strings of the form \f(CW\*(C`VAR=VALUE\*(C'\fR.
-.ie n .IP "@argv = $term\->argv" 4
-.el .IP "@argv = \f(CW$term\fR\->argv" 4
+.ie n .IP "@argv\fR = \f(CW$term\->argv" 4
+.el .IP "\f(CW@argv\fR = \f(CW$term\fR\->argv" 4
 .IX Item "@argv = $term->argv"
 Return the argument vector as this terminal, similar to \f(CW@ARGV\fR, but
 includes the program name as first element.
-.ie n .IP "$modifiermask = $term\->ModLevel3Mask" 4
-.el .IP "$modifiermask = \f(CW$term\fR\->ModLevel3Mask" 4
+.ie n .IP "$modifiermask\fR = \f(CW$term\->ModLevel3Mask" 4
+.el .IP "\f(CW$modifiermask\fR = \f(CW$term\fR\->ModLevel3Mask" 4
 .IX Item "$modifiermask = $term->ModLevel3Mask"
 .PD 0
-.ie n .IP "$modifiermask = $term\->ModMetaMask" 4
-.el .IP "$modifiermask = \f(CW$term\fR\->ModMetaMask" 4
+.ie n .IP "$modifiermask\fR = \f(CW$term\->ModMetaMask" 4
+.el .IP "\f(CW$modifiermask\fR = \f(CW$term\fR\->ModMetaMask" 4
 .IX Item "$modifiermask = $term->ModMetaMask"
-.ie n .IP "$modifiermask = $term\->ModNumLockMask" 4
-.el .IP "$modifiermask = \f(CW$term\fR\->ModNumLockMask" 4
+.ie n .IP "$modifiermask\fR = \f(CW$term\->ModNumLockMask" 4
+.el .IP "\f(CW$modifiermask\fR = \f(CW$term\fR\->ModNumLockMask" 4
 .IX Item "$modifiermask = $term->ModNumLockMask"
 .PD
 Return the modifier masks corresponding to the \*(L"\s-1ISO\s0 Level 3 Shift\*(R" (often
 AltGr), the meta key (often Alt) and the num lock key, if applicable.
-.ie n .IP "$screen = $term\->current_screen" 4
-.el .IP "$screen = \f(CW$term\fR\->current_screen" 4
+.ie n .IP "$screen\fR = \f(CW$term\->current_screen" 4
+.el .IP "\f(CW$screen\fR = \f(CW$term\fR\->current_screen" 4
 .IX Item "$screen = $term->current_screen"
 Returns the currently displayed screen (0 primary, 1 secondary).
-.ie n .IP "$cursor_is_hidden = $term\->hidden_cursor" 4
-.el .IP "$cursor_is_hidden = \f(CW$term\fR\->hidden_cursor" 4
+.ie n .IP "$cursor_is_hidden\fR = \f(CW$term\->hidden_cursor" 4
+.el .IP "\f(CW$cursor_is_hidden\fR = \f(CW$term\fR\->hidden_cursor" 4
 .IX Item "$cursor_is_hidden = $term->hidden_cursor"
 Returns whether the cursor is currently hidden or not.
-.ie n .IP "$view_start = $term\->view_start ([$newvalue])" 4
-.el .IP "$view_start = \f(CW$term\fR\->view_start ([$newvalue])" 4
+.ie n .IP "$view_start\fR = \f(CW$term\->view_start ([$newvalue])" 4
+.el .IP "\f(CW$view_start\fR = \f(CW$term\fR\->view_start ([$newvalue])" 4
 .IX Item "$view_start = $term->view_start ([$newvalue])"
 Returns the row number of the topmost displayed line. Maximum value is
 \&\f(CW0\fR, which displays the normal terminal contents. Lower values scroll
 this many lines into the scrollback buffer.
-.IP "$term\->want_refresh" 4
+.ie n .IP "$term\->want_refresh" 4
+.el .IP "\f(CW$term\fR\->want_refresh" 4
 .IX Item "$term->want_refresh"
 Requests a screen refresh. At the next opportunity, rxvt-unicode will
 compare the on-screen display with its stored representation. If they
 differ, it redraws the differences.
 .Sp
 Used after changing terminal contents to display them.
-.ie n .IP "$text = $term\fR\->ROW_t ($row_number[, \f(CW$new_text\fR[, \f(CW$start_col]])" 4
-.el .IP "$text = \f(CW$term\fR\->ROW_t ($row_number[, \f(CW$new_text\fR[, \f(CW$start_col\fR]])" 4
+.ie n .IP "$text\fR = \f(CW$term\fR\->ROW_t ($row_number[, \f(CW$new_text\fR[, \f(CW$start_col]])" 4
+.el .IP "\f(CW$text\fR = \f(CW$term\fR\->ROW_t ($row_number[, \f(CW$new_text\fR[, \f(CW$start_col\fR]])" 4
 .IX Item "$text = $term->ROW_t ($row_number[, $new_text[, $start_col]])"
 Returns the text of the entire row with number \f(CW$row_number\fR. Row \f(CW0\fR
 is the topmost terminal line, row \f(CW\*(C`$term\->$ncol\-1\*(C'\fR is the bottommost
@@ -1360,8 +1386,8 @@ characters.
 .Sp
 The methods \f(CW\*(C`$term\->special_encode\*(C'\fR and \f(CW\*(C`$term\->special_decode\*(C'\fR
 can be used to convert normal strings into this encoding and vice versa.
-.ie n .IP "$rend = $term\fR\->ROW_r ($row_number[, \f(CW$new_rend\fR[, \f(CW$start_col]])" 4
-.el .IP "$rend = \f(CW$term\fR\->ROW_r ($row_number[, \f(CW$new_rend\fR[, \f(CW$start_col\fR]])" 4
+.ie n .IP "$rend\fR = \f(CW$term\fR\->ROW_r ($row_number[, \f(CW$new_rend\fR[, \f(CW$start_col]])" 4
+.el .IP "\f(CW$rend\fR = \f(CW$term\fR\->ROW_r ($row_number[, \f(CW$new_rend\fR[, \f(CW$start_col\fR]])" 4
 .IX Item "$rend = $term->ROW_r ($row_number[, $new_rend[, $start_col]])"
 Like \f(CW\*(C`$term\->ROW_t\*(C'\fR, but returns an arrayref with rendition
 bitsets. Rendition bitsets contain information about colour, font, font
@@ -1370,49 +1396,49 @@ styles and similar information. See also \f(CW\*(C`$term\->ROW_t\*(C'\fR.
 When setting rendition, the font mask will be ignored.
 .Sp
 See the section on \s-1RENDITION\s0, above.
-.ie n .IP "$length = $term\fR\->ROW_l ($row_number[, \f(CW$new_length])" 4
-.el .IP "$length = \f(CW$term\fR\->ROW_l ($row_number[, \f(CW$new_length\fR])" 4
+.ie n .IP "$length\fR = \f(CW$term\fR\->ROW_l ($row_number[, \f(CW$new_length])" 4
+.el .IP "\f(CW$length\fR = \f(CW$term\fR\->ROW_l ($row_number[, \f(CW$new_length\fR])" 4
 .IX Item "$length = $term->ROW_l ($row_number[, $new_length])"
 Returns the number of screen cells that are in use (\*(L"the line
 length\*(R"). Unlike the urxvt core, this returns \f(CW\*(C`$term\->ncol\*(C'\fR if the
 line is joined with the following one.
-.ie n .IP "$bool = $term\->is_longer ($row_number)" 4
-.el .IP "$bool = \f(CW$term\fR\->is_longer ($row_number)" 4
+.ie n .IP "$bool\fR = \f(CW$term\->is_longer ($row_number)" 4
+.el .IP "\f(CW$bool\fR = \f(CW$term\fR\->is_longer ($row_number)" 4
 .IX Item "$bool = $term->is_longer ($row_number)"
 Returns true if the row is part of a multiple-row logical \*(L"line\*(R" (i.e.
 joined with the following row), which means all characters are in use
 and it is continued on the next row (and possibly a continuation of the
 previous row(s)).
-.ie n .IP "$line = $term\->line ($row_number)" 4
-.el .IP "$line = \f(CW$term\fR\->line ($row_number)" 4
+.ie n .IP "$line\fR = \f(CW$term\->line ($row_number)" 4
+.el .IP "\f(CW$line\fR = \f(CW$term\fR\->line ($row_number)" 4
 .IX Item "$line = $term->line ($row_number)"
 Create and return a new \f(CW\*(C`urxvt::line\*(C'\fR object that stores information
 about the logical line that row \f(CW$row_number\fR is part of. It supports the
 following methods:
 .RS 4
-.ie n .IP "$text = $line\->t ([$new_text])" 4
-.el .IP "$text = \f(CW$line\fR\->t ([$new_text])" 4
+.ie n .IP "$text\fR = \f(CW$line\->t ([$new_text])" 4
+.el .IP "\f(CW$text\fR = \f(CW$line\fR\->t ([$new_text])" 4
 .IX Item "$text = $line->t ([$new_text])"
 Returns or replaces the full text of the line, similar to \f(CW\*(C`ROW_t\*(C'\fR
-.ie n .IP "$rend = $line\->r ([$new_rend])" 4
-.el .IP "$rend = \f(CW$line\fR\->r ([$new_rend])" 4
+.ie n .IP "$rend\fR = \f(CW$line\->r ([$new_rend])" 4
+.el .IP "\f(CW$rend\fR = \f(CW$line\fR\->r ([$new_rend])" 4
 .IX Item "$rend = $line->r ([$new_rend])"
 Returns or replaces the full rendition array of the line, similar to \f(CW\*(C`ROW_r\*(C'\fR
-.ie n .IP "$length = $line\->l" 4
-.el .IP "$length = \f(CW$line\fR\->l" 4
+.ie n .IP "$length\fR = \f(CW$line\->l" 4
+.el .IP "\f(CW$length\fR = \f(CW$line\fR\->l" 4
 .IX Item "$length = $line->l"
 Returns the length of the line in cells, similar to \f(CW\*(C`ROW_l\*(C'\fR.
-.ie n .IP "$rownum = $line\->beg" 4
-.el .IP "$rownum = \f(CW$line\fR\->beg" 4
+.ie n .IP "$rownum\fR = \f(CW$line\->beg" 4
+.el .IP "\f(CW$rownum\fR = \f(CW$line\fR\->beg" 4
 .IX Item "$rownum = $line->beg"
 .PD 0
-.ie n .IP "$rownum = $line\->end" 4
-.el .IP "$rownum = \f(CW$line\fR\->end" 4
+.ie n .IP "$rownum\fR = \f(CW$line\->end" 4
+.el .IP "\f(CW$rownum\fR = \f(CW$line\fR\->end" 4
 .IX Item "$rownum = $line->end"
 .PD
 Return the row number of the first/last row of the line, respectively.
-.ie n .IP "$offset = $line\fR\->offset_of ($row, \f(CW$col)" 4
-.el .IP "$offset = \f(CW$line\fR\->offset_of ($row, \f(CW$col\fR)" 4
+.ie n .IP "$offset\fR = \f(CW$line\fR\->offset_of ($row, \f(CW$col)" 4
+.el .IP "\f(CW$offset\fR = \f(CW$line\fR\->offset_of ($row, \f(CW$col\fR)" 4
 .IX Item "$offset = $line->offset_of ($row, $col)"
 Returns the character offset of the given row|col pair within the logical
 line. Works for rows outside the line, too, and returns corresponding
@@ -1424,84 +1450,90 @@ Translates a string offset into terminal coordinates again.
 .RE
 .RS 4
 .RE
-.ie n .IP "$text = $term\fR\->special_encode \f(CW$string" 4
-.el .IP "$text = \f(CW$term\fR\->special_encode \f(CW$string\fR" 4
+.ie n .IP "$text\fR = \f(CW$term\fR\->special_encode \f(CW$string" 4
+.el .IP "\f(CW$text\fR = \f(CW$term\fR\->special_encode \f(CW$string\fR" 4
 .IX Item "$text = $term->special_encode $string"
-Converts a perl string into the special encoding used by rxvt\-unicode,
+Converts a perl string into the special encoding used by rxvt-unicode,
 where one character corresponds to one screen cell. See
 \&\f(CW\*(C`$term\->ROW_t\*(C'\fR for details.
-.ie n .IP "$string = $term\fR\->special_decode \f(CW$text" 4
-.el .IP "$string = \f(CW$term\fR\->special_decode \f(CW$text\fR" 4
+.ie n .IP "$string\fR = \f(CW$term\fR\->special_decode \f(CW$text" 4
+.el .IP "\f(CW$string\fR = \f(CW$term\fR\->special_decode \f(CW$text\fR" 4
 .IX Item "$string = $term->special_decode $text"
 Converts rxvt-unicodes text representation into a perl string. See
 \&\f(CW\*(C`$term\->ROW_t\*(C'\fR for details.
-.ie n .IP "$success = $term\fR\->grab_button ($button, \f(CW$modifiermask\fR[, \f(CW$window\fR = \f(CW$term\->vt])" 4
-.el .IP "$success = \f(CW$term\fR\->grab_button ($button, \f(CW$modifiermask\fR[, \f(CW$window\fR = \f(CW$term\fR\->vt])" 4
+.ie n .IP "$success\fR = \f(CW$term\fR\->grab_button ($button, \f(CW$modifiermask\fR[, \f(CW$window\fR = \f(CW$term\->vt])" 4
+.el .IP "\f(CW$success\fR = \f(CW$term\fR\->grab_button ($button, \f(CW$modifiermask\fR[, \f(CW$window\fR = \f(CW$term\fR\->vt])" 4
 .IX Item "$success = $term->grab_button ($button, $modifiermask[, $window = $term->vt])"
 .PD 0
-.ie n .IP "$term\->ungrab_button ($button, $modifiermask\fR[, \f(CW$window\fR = \f(CW$term\->vt])" 4
-.el .IP "$term\->ungrab_button ($button, \f(CW$modifiermask\fR[, \f(CW$window\fR = \f(CW$term\fR\->vt])" 4
+.ie n .IP "$term\fR\->ungrab_button ($button, \f(CW$modifiermask\fR[, \f(CW$window\fR = \f(CW$term\->vt])" 4
+.el .IP "\f(CW$term\fR\->ungrab_button ($button, \f(CW$modifiermask\fR[, \f(CW$window\fR = \f(CW$term\fR\->vt])" 4
 .IX Item "$term->ungrab_button ($button, $modifiermask[, $window = $term->vt])"
 .PD
 Register/unregister a synchronous button grab. See the XGrabButton
 manpage.
-.ie n .IP "$success = $term\fR\->grab ($eventtime[, \f(CW$sync])" 4
-.el .IP "$success = \f(CW$term\fR\->grab ($eventtime[, \f(CW$sync\fR])" 4
+.ie n .IP "$success\fR = \f(CW$term\fR\->grab ($eventtime[, \f(CW$sync])" 4
+.el .IP "\f(CW$success\fR = \f(CW$term\fR\->grab ($eventtime[, \f(CW$sync\fR])" 4
 .IX Item "$success = $term->grab ($eventtime[, $sync])"
 Calls XGrabPointer and XGrabKeyboard in asynchronous (default) or
 synchronous (\f(CW$sync\fR is true). Also remembers the grab timestamp.
-.IP "$term\->allow_events_async" 4
+.ie n .IP "$term\->allow_events_async" 4
+.el .IP "\f(CW$term\fR\->allow_events_async" 4
 .IX Item "$term->allow_events_async"
 Calls XAllowEvents with AsyncBoth for the most recent grab.
-.IP "$term\->allow_events_sync" 4
+.ie n .IP "$term\->allow_events_sync" 4
+.el .IP "\f(CW$term\fR\->allow_events_sync" 4
 .IX Item "$term->allow_events_sync"
 Calls XAllowEvents with SyncBoth for the most recent grab.
-.IP "$term\->allow_events_replay" 4
+.ie n .IP "$term\->allow_events_replay" 4
+.el .IP "\f(CW$term\fR\->allow_events_replay" 4
 .IX Item "$term->allow_events_replay"
 Calls XAllowEvents with both ReplayPointer and ReplayKeyboard for the most
 recent grab.
-.IP "$term\->ungrab" 4
+.ie n .IP "$term\->ungrab" 4
+.el .IP "\f(CW$term\fR\->ungrab" 4
 .IX Item "$term->ungrab"
 Calls XUngrab for the most recent grab. Is called automatically on
 evaluation errors, as it is better to lose the grab in the error case as
 the session.
-.ie n .IP "$atom = $term\fR\->XInternAtom ($atom_name[, \f(CW$only_if_exists])" 4
-.el .IP "$atom = \f(CW$term\fR\->XInternAtom ($atom_name[, \f(CW$only_if_exists\fR])" 4
+.ie n .IP "$atom\fR = \f(CW$term\fR\->XInternAtom ($atom_name[, \f(CW$only_if_exists])" 4
+.el .IP "\f(CW$atom\fR = \f(CW$term\fR\->XInternAtom ($atom_name[, \f(CW$only_if_exists\fR])" 4
 .IX Item "$atom = $term->XInternAtom ($atom_name[, $only_if_exists])"
 .PD 0
-.ie n .IP "$atom_name = $term\->XGetAtomName ($atom)" 4
-.el .IP "$atom_name = \f(CW$term\fR\->XGetAtomName ($atom)" 4
+.ie n .IP "$atom_name\fR = \f(CW$term\->XGetAtomName ($atom)" 4
+.el .IP "\f(CW$atom_name\fR = \f(CW$term\fR\->XGetAtomName ($atom)" 4
 .IX Item "$atom_name = $term->XGetAtomName ($atom)"
-.ie n .IP "@atoms = $term\->XListProperties ($window)" 4
-.el .IP "@atoms = \f(CW$term\fR\->XListProperties ($window)" 4
+.ie n .IP "@atoms\fR = \f(CW$term\->XListProperties ($window)" 4
+.el .IP "\f(CW@atoms\fR = \f(CW$term\fR\->XListProperties ($window)" 4
 .IX Item "@atoms = $term->XListProperties ($window)"
 .ie n .IP "($type,$format,$octets) = $term\fR\->XGetWindowProperty ($window, \f(CW$property)" 4
 .el .IP "($type,$format,$octets) = \f(CW$term\fR\->XGetWindowProperty ($window, \f(CW$property\fR)" 4
 .IX Item "($type,$format,$octets) = $term->XGetWindowProperty ($window, $property)"
-.ie n .IP "$term\->XChangeWindowProperty ($window, $property\fR, \f(CW$type\fR, \f(CW$format\fR, \f(CW$octets)" 4
-.el .IP "$term\->XChangeWindowProperty ($window, \f(CW$property\fR, \f(CW$type\fR, \f(CW$format\fR, \f(CW$octets\fR)" 4
+.ie n .IP "$term\fR\->XChangeWindowProperty ($window, \f(CW$property\fR, \f(CW$type\fR, \f(CW$format\fR, \f(CW$octets)" 4
+.el .IP "\f(CW$term\fR\->XChangeWindowProperty ($window, \f(CW$property\fR, \f(CW$type\fR, \f(CW$format\fR, \f(CW$octets\fR)" 4
 .IX Item "$term->XChangeWindowProperty ($window, $property, $type, $format, $octets)"
-.ie n .IP "$term\->XDeleteProperty ($window, $property)" 4
-.el .IP "$term\->XDeleteProperty ($window, \f(CW$property\fR)" 4
+.ie n .IP "$term\fR\->XDeleteProperty ($window, \f(CW$property)" 4
+.el .IP "\f(CW$term\fR\->XDeleteProperty ($window, \f(CW$property\fR)" 4
 .IX Item "$term->XDeleteProperty ($window, $property)"
-.ie n .IP "$window = $term\->DefaultRootWindow" 4
-.el .IP "$window = \f(CW$term\fR\->DefaultRootWindow" 4
+.ie n .IP "$window\fR = \f(CW$term\->DefaultRootWindow" 4
+.el .IP "\f(CW$window\fR = \f(CW$term\fR\->DefaultRootWindow" 4
 .IX Item "$window = $term->DefaultRootWindow"
-.ie n .IP "$term\->XReparentWindow ($window, $parent\fR, [$x, \f(CW$y])" 4
-.el .IP "$term\->XReparentWindow ($window, \f(CW$parent\fR, [$x, \f(CW$y\fR])" 4
+.ie n .IP "$term\fR\->XReparentWindow ($window, \f(CW$parent\fR, [$x, \f(CW$y])" 4
+.el .IP "\f(CW$term\fR\->XReparentWindow ($window, \f(CW$parent\fR, [$x, \f(CW$y\fR])" 4
 .IX Item "$term->XReparentWindow ($window, $parent, [$x, $y])"
-.IP "$term\->XMapWindow ($window)" 4
+.ie n .IP "$term\->XMapWindow ($window)" 4
+.el .IP "\f(CW$term\fR\->XMapWindow ($window)" 4
 .IX Item "$term->XMapWindow ($window)"
-.IP "$term\->XUnmapWindow ($window)" 4
+.ie n .IP "$term\->XUnmapWindow ($window)" 4
+.el .IP "\f(CW$term\fR\->XUnmapWindow ($window)" 4
 .IX Item "$term->XUnmapWindow ($window)"
-.ie n .IP "$term\->XMoveResizeWindow ($window, $x\fR, \f(CW$y\fR, \f(CW$width\fR, \f(CW$height)" 4
-.el .IP "$term\->XMoveResizeWindow ($window, \f(CW$x\fR, \f(CW$y\fR, \f(CW$width\fR, \f(CW$height\fR)" 4
+.ie n .IP "$term\fR\->XMoveResizeWindow ($window, \f(CW$x\fR, \f(CW$y\fR, \f(CW$width\fR, \f(CW$height)" 4
+.el .IP "\f(CW$term\fR\->XMoveResizeWindow ($window, \f(CW$x\fR, \f(CW$y\fR, \f(CW$width\fR, \f(CW$height\fR)" 4
 .IX Item "$term->XMoveResizeWindow ($window, $x, $y, $width, $height)"
 .ie n .IP "($x, $y\fR, \f(CW$child_window\fR) = \f(CW$term\fR\->XTranslateCoordinates ($src, \f(CW$dst\fR, \f(CW$x\fR, \f(CW$y)" 4
 .el .IP "($x, \f(CW$y\fR, \f(CW$child_window\fR) = \f(CW$term\fR\->XTranslateCoordinates ($src, \f(CW$dst\fR, \f(CW$x\fR, \f(CW$y\fR)" 4
 .IX Item "($x, $y, $child_window) = $term->XTranslateCoordinates ($src, $dst, $x, $y)"
-.ie n .IP "$term\->XChangeInput ($window, $add_events\fR[, \f(CW$del_events])" 4
-.el .IP "$term\->XChangeInput ($window, \f(CW$add_events\fR[, \f(CW$del_events\fR])" 4
+.ie n .IP "$term\fR\->XChangeInput ($window, \f(CW$add_events\fR[, \f(CW$del_events])" 4
+.el .IP "\f(CW$term\fR\->XChangeInput ($window, \f(CW$add_events\fR[, \f(CW$del_events\fR])" 4
 .IX Item "$term->XChangeInput ($window, $add_events[, $del_events])"
 .PD
 Various X or X\-related functions. The \f(CW$term\fR object only serves as
@@ -1510,24 +1542,27 @@ directory onto the X functions of the same name.
 .ie n .Sh "The ""urxvt::popup"" Class"
 .el .Sh "The \f(CWurxvt::popup\fP Class"
 .IX Subsection "The urxvt::popup Class"
-.IP "$popup\->add_title ($title)" 4
+.ie n .IP "$popup\->add_title ($title)" 4
+.el .IP "\f(CW$popup\fR\->add_title ($title)" 4
 .IX Item "$popup->add_title ($title)"
 Adds a non-clickable title to the popup.
-.IP "$popup\->add_separator ([$sepchr])" 4
+.ie n .IP "$popup\->add_separator ([$sepchr])" 4
+.el .IP "\f(CW$popup\fR\->add_separator ([$sepchr])" 4
 .IX Item "$popup->add_separator ([$sepchr])"
 Creates a separator, optionally using the character given as \f(CW$sepchr\fR.
-.ie n .IP "$popup\->add_button ($text, $cb)" 4
-.el .IP "$popup\->add_button ($text, \f(CW$cb\fR)" 4
+.ie n .IP "$popup\fR\->add_button ($text, \f(CW$cb)" 4
+.el .IP "\f(CW$popup\fR\->add_button ($text, \f(CW$cb\fR)" 4
 .IX Item "$popup->add_button ($text, $cb)"
 Adds a clickable button to the popup. \f(CW$cb\fR is called whenever it is
 selected.
-.ie n .IP "$popup\->add_toggle ($text, $initial_value\fR, \f(CW$cb)" 4
-.el .IP "$popup\->add_toggle ($text, \f(CW$initial_value\fR, \f(CW$cb\fR)" 4
+.ie n .IP "$popup\fR\->add_toggle ($text, \f(CW$initial_value\fR, \f(CW$cb)" 4
+.el .IP "\f(CW$popup\fR\->add_toggle ($text, \f(CW$initial_value\fR, \f(CW$cb\fR)" 4
 .IX Item "$popup->add_toggle ($text, $initial_value, $cb)"
 Adds a toggle/checkbox item to the popup. The callback gets called
 whenever it gets toggled, with a boolean indicating its new value as its
 first argument.
-.IP "$popup\->show" 4
+.ie n .IP "$popup\->show" 4
+.el .IP "\f(CW$popup\fR\->show" 4
 .IX Item "$popup->show"
 Displays the popup (which is initially hidden).
 .ie n .Sh "The ""urxvt::timer"" Class"
@@ -1537,51 +1572,52 @@ This class implements timer watchers/events. Time is represented as a
 fractional number of seconds since the epoch. Example:
 .PP
 .Vb 8
-\&   $term->{overlay} = $term->overlay (-1, 0, 8, 1, urxvt::OVERLAY_RSTYLE, 0);
-\&   $term->{timer} = urxvt::timer
-\&                    ->new
-\&                    ->interval (1)
-\&                    ->cb (sub {
-\&                       $term->{overlay}->set (0, 0,
+\&   $term\->{overlay} = $term\->overlay (\-1, 0, 8, 1, urxvt::OVERLAY_RSTYLE, 0);
+\&   $term\->{timer} = urxvt::timer
+\&                    \->new
+\&                    \->interval (1)
+\&                    \->cb (sub {
+\&                       $term\->{overlay}\->set (0, 0,
 \&                          sprintf "%2d:%02d:%02d", (localtime urxvt::NOW)[2,1,0]);
 \&                    });
 .Ve
-.IP "$timer = new urxvt::timer" 4
+.ie n .IP "$timer = new urxvt::timer" 4
+.el .IP "\f(CW$timer\fR = new urxvt::timer" 4
 .IX Item "$timer = new urxvt::timer"
 Create a new timer object in started state. It is scheduled to fire
 immediately.
-.ie n .IP "$timer = $timer\fR\->cb (sub { my ($timer) = \f(CW@_; ... })" 4
-.el .IP "$timer = \f(CW$timer\fR\->cb (sub { my ($timer) = \f(CW@_\fR; ... })" 4
+.ie n .IP "$timer\fR = \f(CW$timer\fR\->cb (sub { my ($timer) = \f(CW@_; ... })" 4
+.el .IP "\f(CW$timer\fR = \f(CW$timer\fR\->cb (sub { my ($timer) = \f(CW@_\fR; ... })" 4
 .IX Item "$timer = $timer->cb (sub { my ($timer) = @_; ... })"
 Set the callback to be called when the timer triggers.
-.ie n .IP "$tstamp = $timer\->at" 4
-.el .IP "$tstamp = \f(CW$timer\fR\->at" 4
+.ie n .IP "$tstamp\fR = \f(CW$timer\->at" 4
+.el .IP "\f(CW$tstamp\fR = \f(CW$timer\fR\->at" 4
 .IX Item "$tstamp = $timer->at"
 Return the time this watcher will fire next.
-.ie n .IP "$timer = $timer\->set ($tstamp)" 4
-.el .IP "$timer = \f(CW$timer\fR\->set ($tstamp)" 4
+.ie n .IP "$timer\fR = \f(CW$timer\->set ($tstamp)" 4
+.el .IP "\f(CW$timer\fR = \f(CW$timer\fR\->set ($tstamp)" 4
 .IX Item "$timer = $timer->set ($tstamp)"
 Set the time the event is generated to \f(CW$tstamp\fR.
-.ie n .IP "$timer = $timer\->interval ($interval)" 4
-.el .IP "$timer = \f(CW$timer\fR\->interval ($interval)" 4
+.ie n .IP "$timer\fR = \f(CW$timer\->interval ($interval)" 4
+.el .IP "\f(CW$timer\fR = \f(CW$timer\fR\->interval ($interval)" 4
 .IX Item "$timer = $timer->interval ($interval)"
 Normally (and when \f(CW$interval\fR is \f(CW0\fR), the timer will automatically
-stop after it has fired once. If \f(CW$interval\fR is non\-zero, then the timer
+stop after it has fired once. If \f(CW$interval\fR is non-zero, then the timer
 is automatically rescheduled at the given intervals.
-.ie n .IP "$timer = $timer\->start" 4
-.el .IP "$timer = \f(CW$timer\fR\->start" 4
+.ie n .IP "$timer\fR = \f(CW$timer\->start" 4
+.el .IP "\f(CW$timer\fR = \f(CW$timer\fR\->start" 4
 .IX Item "$timer = $timer->start"
 Start the timer.
-.ie n .IP "$timer = $timer\->start ($tstamp)" 4
-.el .IP "$timer = \f(CW$timer\fR\->start ($tstamp)" 4
+.ie n .IP "$timer\fR = \f(CW$timer\->start ($tstamp)" 4
+.el .IP "\f(CW$timer\fR = \f(CW$timer\fR\->start ($tstamp)" 4
 .IX Item "$timer = $timer->start ($tstamp)"
 Set the event trigger time to \f(CW$tstamp\fR and start the timer.
-.ie n .IP "$timer = $timer\->after ($delay)" 4
-.el .IP "$timer = \f(CW$timer\fR\->after ($delay)" 4
+.ie n .IP "$timer\fR = \f(CW$timer\->after ($delay)" 4
+.el .IP "\f(CW$timer\fR = \f(CW$timer\fR\->after ($delay)" 4
 .IX Item "$timer = $timer->after ($delay)"
 Like \f(CW\*(C`start\*(C'\fR, but sets the expiry timer to c<urxvt::NOW + \f(CW$delay\fR>.
-.ie n .IP "$timer = $timer\->stop" 4
-.el .IP "$timer = \f(CW$timer\fR\->stop" 4
+.ie n .IP "$timer\fR = \f(CW$timer\->stop" 4
+.el .IP "\f(CW$timer\fR = \f(CW$timer\fR\->stop" 4
 .IX Item "$timer = $timer->stop"
 Stop the timer.
 .ie n .Sh "The ""urxvt::iow"" Class"
@@ -1590,43 +1626,44 @@ Stop the timer.
 This class implements io watchers/events. Example:
 .PP
 .Vb 12
-\&  $term->{socket} = ...
-\&  $term->{iow} = urxvt::iow
-\&                 ->new
-\&                 ->fd (fileno $term->{socket})
-\&                 ->events (urxvt::EV_READ)
-\&                 ->start
-\&                 ->cb (sub {
+\&  $term\->{socket} = ...
+\&  $term\->{iow} = urxvt::iow
+\&                 \->new
+\&                 \->fd (fileno $term\->{socket})
+\&                 \->events (urxvt::EV_READ)
+\&                 \->start
+\&                 \->cb (sub {
 \&                   my ($iow, $revents) = @_;
 \&                   # $revents must be 1 here, no need to check
-\&                   sysread $term->{socket}, my $buf, 8192
-\&                      or end-of-file;
+\&                   sysread $term\->{socket}, my $buf, 8192
+\&                      or end\-of\-file;
 \&                 });
 .Ve
-.IP "$iow = new urxvt::iow" 4
+.ie n .IP "$iow = new urxvt::iow" 4
+.el .IP "\f(CW$iow\fR = new urxvt::iow" 4
 .IX Item "$iow = new urxvt::iow"
 Create a new io watcher object in stopped state.
-.ie n .IP "$iow = $iow\fR\->cb (sub { my ($iow, \f(CW$reventmask\fR) = \f(CW@_; ... })" 4
-.el .IP "$iow = \f(CW$iow\fR\->cb (sub { my ($iow, \f(CW$reventmask\fR) = \f(CW@_\fR; ... })" 4
+.ie n .IP "$iow\fR = \f(CW$iow\fR\->cb (sub { my ($iow, \f(CW$reventmask\fR) = \f(CW@_; ... })" 4
+.el .IP "\f(CW$iow\fR = \f(CW$iow\fR\->cb (sub { my ($iow, \f(CW$reventmask\fR) = \f(CW@_\fR; ... })" 4
 .IX Item "$iow = $iow->cb (sub { my ($iow, $reventmask) = @_; ... })"
 Set the callback to be called when io events are triggered. \f(CW$reventmask\fR
 is a bitset as described in the \f(CW\*(C`events\*(C'\fR method.
-.ie n .IP "$iow = $iow\->fd ($fd)" 4
-.el .IP "$iow = \f(CW$iow\fR\->fd ($fd)" 4
+.ie n .IP "$iow\fR = \f(CW$iow\->fd ($fd)" 4
+.el .IP "\f(CW$iow\fR = \f(CW$iow\fR\->fd ($fd)" 4
 .IX Item "$iow = $iow->fd ($fd)"
 Set the file descriptor (not handle) to watch.
-.ie n .IP "$iow = $iow\->events ($eventmask)" 4
-.el .IP "$iow = \f(CW$iow\fR\->events ($eventmask)" 4
+.ie n .IP "$iow\fR = \f(CW$iow\->events ($eventmask)" 4
+.el .IP "\f(CW$iow\fR = \f(CW$iow\fR\->events ($eventmask)" 4
 .IX Item "$iow = $iow->events ($eventmask)"
 Set the event mask to watch. The only allowed values are
 \&\f(CW\*(C`urxvt::EV_READ\*(C'\fR and \f(CW\*(C`urxvt::EV_WRITE\*(C'\fR, which might be ORed
 together, or \f(CW\*(C`urxvt::EV_NONE\*(C'\fR.
-.ie n .IP "$iow = $iow\->start" 4
-.el .IP "$iow = \f(CW$iow\fR\->start" 4
+.ie n .IP "$iow\fR = \f(CW$iow\->start" 4
+.el .IP "\f(CW$iow\fR = \f(CW$iow\fR\->start" 4
 .IX Item "$iow = $iow->start"
 Start watching for requested events on the given handle.
-.ie n .IP "$iow = $iow\->stop" 4
-.el .IP "$iow = \f(CW$iow\fR\->stop" 4
+.ie n .IP "$iow\fR = \f(CW$iow\->stop" 4
+.el .IP "\f(CW$iow\fR = \f(CW$iow\fR\->stop" 4
 .IX Item "$iow = $iow->stop"
 Stop watching for events on the given file handle.
 .ie n .Sh "The ""urxvt::iw"" Class"
@@ -1635,19 +1672,20 @@ Stop watching for events on the given file handle.
 This class implements idle watchers, that get called automatically when
 the process is idle. They should return as fast as possible, after doing
 some useful work.
-.IP "$iw = new urxvt::iw" 4
+.ie n .IP "$iw = new urxvt::iw" 4
+.el .IP "\f(CW$iw\fR = new urxvt::iw" 4
 .IX Item "$iw = new urxvt::iw"
 Create a new idle watcher object in stopped state.
-.ie n .IP "$iw = $iw\fR\->cb (sub { my ($iw) = \f(CW@_; ... })" 4
-.el .IP "$iw = \f(CW$iw\fR\->cb (sub { my ($iw) = \f(CW@_\fR; ... })" 4
+.ie n .IP "$iw\fR = \f(CW$iw\fR\->cb (sub { my ($iw) = \f(CW@_; ... })" 4
+.el .IP "\f(CW$iw\fR = \f(CW$iw\fR\->cb (sub { my ($iw) = \f(CW@_\fR; ... })" 4
 .IX Item "$iw = $iw->cb (sub { my ($iw) = @_; ... })"
 Set the callback to be called when the watcher triggers.
-.ie n .IP "$timer = $timer\->start" 4
-.el .IP "$timer = \f(CW$timer\fR\->start" 4
+.ie n .IP "$timer\fR = \f(CW$timer\->start" 4
+.el .IP "\f(CW$timer\fR = \f(CW$timer\fR\->start" 4
 .IX Item "$timer = $timer->start"
 Start the watcher.
-.ie n .IP "$timer = $timer\->stop" 4
-.el .IP "$timer = \f(CW$timer\fR\->stop" 4
+.ie n .IP "$timer\fR = \f(CW$timer\->stop" 4
+.el .IP "\f(CW$timer\fR = \f(CW$timer\fR\->stop" 4
 .IX Item "$timer = $timer->stop"
 Stop the watcher.
 .ie n .Sh "The ""urxvt::pw"" Class"
@@ -1659,27 +1697,28 @@ process exits, after which they stop automatically.
 .Vb 9
 \&   my $pid = fork;
 \&   ...
-\&   $term->{pw} = urxvt::pw
-\&                    ->new
-\&                    ->start ($pid)
-\&                    ->cb (sub {
+\&   $term\->{pw} = urxvt::pw
+\&                    \->new
+\&                    \->start ($pid)
+\&                    \->cb (sub {
 \&                       my ($pw, $exit_status) = @_;
 \&                       ...
 \&                    });
 .Ve
-.IP "$pw = new urxvt::pw" 4
+.ie n .IP "$pw = new urxvt::pw" 4
+.el .IP "\f(CW$pw\fR = new urxvt::pw" 4
 .IX Item "$pw = new urxvt::pw"
 Create a new process watcher in stopped state.
-.ie n .IP "$pw = $pw\fR\->cb (sub { my ($pw, \f(CW$exit_status\fR) = \f(CW@_; ... })" 4
-.el .IP "$pw = \f(CW$pw\fR\->cb (sub { my ($pw, \f(CW$exit_status\fR) = \f(CW@_\fR; ... })" 4
+.ie n .IP "$pw\fR = \f(CW$pw\fR\->cb (sub { my ($pw, \f(CW$exit_status\fR) = \f(CW@_; ... })" 4
+.el .IP "\f(CW$pw\fR = \f(CW$pw\fR\->cb (sub { my ($pw, \f(CW$exit_status\fR) = \f(CW@_\fR; ... })" 4
 .IX Item "$pw = $pw->cb (sub { my ($pw, $exit_status) = @_; ... })"
 Set the callback to be called when the timer triggers.
-.ie n .IP "$pw = $timer\->start ($pid)" 4
-.el .IP "$pw = \f(CW$timer\fR\->start ($pid)" 4
+.ie n .IP "$pw\fR = \f(CW$timer\->start ($pid)" 4
+.el .IP "\f(CW$pw\fR = \f(CW$timer\fR\->start ($pid)" 4
 .IX Item "$pw = $timer->start ($pid)"
 Tells the watcher to start watching for process \f(CW$pid\fR.
-.ie n .IP "$pw = $pw\->stop" 4
-.el .IP "$pw = \f(CW$pw\fR\->stop" 4
+.ie n .IP "$pw\fR = \f(CW$pw\->stop" 4
+.el .IP "\f(CW$pw\fR = \f(CW$pw\fR\->stop" 4
 .IX Item "$pw = $pw->stop"
 Stop the watcher.
 .SH "ENVIRONMENT"
@@ -1702,5 +1741,5 @@ numbers indicate more verbose output.
 .IX Header "AUTHOR"
 .Vb 2
 \& Marc Lehmann <pcg@goof.com>
-\& http://software.schmorp.de/pkg/rxvt-unicode
+\& http://software.schmorp.de/pkg/rxvt\-unicode
 .Ve
diff --git a/src/Makefile.in b/src/Makefile.in

index 321614f3042b3d921573365f195823b92e14ca49..

index ..20ac6cbac3827408d2e0b4ae967cf28dc099ad48 100644

--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -125,14 +125,14 @@ depend:

 # DO NOT DELETE: nice dependency list follows

-background.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-background.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-background.o: ../libev/ev.h callback.h salloc.h libptytty.h rxvtperl.h
-background.o: hookinc.h background.h rsinc.h
-command.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-command.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-command.o: ../libev/ev.h callback.h salloc.h libptytty.h rxvtperl.h hookinc.h
-command.o: background.h rsinc.h version.h command.h keyboard.h
+background.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+background.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+background.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
+background.o: background.h rsinc.h optinc.h
+command.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+command.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+command.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
+command.o: rsinc.h optinc.h version.h command.h keyboard.h
 encoding.o: ../config.h encoding.h table/iso8859_1.h table/iso8859_15.h
 encoding.o: table/iso8859_2.h table/iso8859_3.h table/iso8859_4.h
 encoding.o: table/iso8859_5.h table/iso8859_6.h table/iso8859_7.h
@@ -151,86 +151,86 @@ encoding.o: table/compose.h table/category.h
 ev_cpp.o: ev_cpp.h ../libev/ev++.h ../libev/ev.h ../libev/ev.c ../config.h
 ev_cpp.o: ../libev/ev_vars.h ../libev/ev_epoll.c ../libev/ev_select.c
 fdpass.o: ../config.h libptytty.h
-init.o: ../config.h rxvt.h optinc.h feature.h encoding.h rxvtutil.h
-init.o: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h
-init.o: callback.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-init.o: rsinc.h init.h
-keyboard.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-keyboard.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-keyboard.o: ../libev/ev.h callback.h salloc.h libptytty.h rxvtperl.h
-keyboard.o: hookinc.h background.h rsinc.h keyboard.h command.h
-logging.o: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h
-logging.o: optinc.h feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
-logging.o: ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h salloc.h
-logging.o: rxvtperl.h hookinc.h background.h rsinc.h
-main.o: ../config.h rxvt.h optinc.h feature.h encoding.h rxvtutil.h
-main.o: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h
-main.o: callback.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-main.o: rsinc.h keyboard.h
-misc.o: ../config.h rxvt.h optinc.h feature.h encoding.h rxvtutil.h
-misc.o: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h
-misc.o: callback.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-misc.o: rsinc.h
-proxy.o: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h
-proxy.o: optinc.h feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
-proxy.o: ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h salloc.h
-proxy.o: rxvtperl.h hookinc.h background.h rsinc.h
-ptytty.o: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h
-ptytty.o: optinc.h feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
-ptytty.o: ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h salloc.h
-ptytty.o: rxvtperl.h hookinc.h background.h rsinc.h
-rxvt.o: ../config.h rxvt.h optinc.h feature.h encoding.h rxvtutil.h
-rxvt.o: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h
-rxvt.o: callback.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-rxvt.o: rsinc.h
-rxvtc.o: ../config.h rxvtdaemon.h rxvtutil.h libptytty.h rxvt.h
-rxvtc.o: optinc.h feature.h encoding.h rxvtfont.h rxvttoolkit.h ev_cpp.h
-rxvtc.o: ../libev/ev++.h ../libev/ev.h callback.h salloc.h rxvtperl.h
-rxvtc.o: hookinc.h background.h rsinc.h
-rxvtd.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-rxvtd.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-rxvtd.o: ../libev/ev.h callback.h salloc.h libptytty.h rxvtperl.h hookinc.h
-rxvtd.o: background.h rsinc.h rxvtdaemon.h
+init.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+init.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+init.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
+init.o: rsinc.h optinc.h init.h keyboard.h
+keyboard.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+keyboard.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+keyboard.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
+keyboard.o: background.h rsinc.h optinc.h keyboard.h command.h
+logging.o: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h feature.h
+logging.o: encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h
+logging.o: ../libev/ev++.h ../libev/ev.h callback.h scrollbar.h salloc.h
+logging.o: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
+main.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+main.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+main.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
+main.o: rsinc.h optinc.h keyboard.h
+misc.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+misc.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+misc.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
+misc.o: rsinc.h optinc.h
+proxy.o: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h feature.h
+proxy.o: encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h
+proxy.o: ../libev/ev++.h ../libev/ev.h callback.h scrollbar.h salloc.h
+proxy.o: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
+ptytty.o: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h feature.h
+ptytty.o: encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h
+ptytty.o: ../libev/ev++.h ../libev/ev.h callback.h scrollbar.h salloc.h
+ptytty.o: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
+rxvt.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+rxvt.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+rxvt.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
+rxvt.o: rsinc.h optinc.h
+rxvtc.o: ../config.h rxvtdaemon.h rxvtutil.h libptytty.h rxvt.h feature.h
+rxvtc.o: encoding.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
+rxvtc.o: ../libev/ev.h callback.h scrollbar.h salloc.h rxvtperl.h hookinc.h
+rxvtc.o: background.h rsinc.h optinc.h
+rxvtd.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+rxvtd.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+rxvtd.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
+rxvtd.o: rsinc.h optinc.h rxvtdaemon.h
 rxvtdaemon.o: rxvtdaemon.h rxvtutil.h
-rxvtfont.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-rxvtfont.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-rxvtfont.o: ../libev/ev.h callback.h salloc.h libptytty.h rxvtperl.h
-rxvtfont.o: hookinc.h background.h rsinc.h table/linedraw.h
+rxvtfont.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+rxvtfont.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+rxvtfont.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
+rxvtfont.o: background.h rsinc.h optinc.h table/linedraw.h
 rxvtperl.o: ../config.h ev_cpp.h ../libev/ev++.h ../libev/ev.h rxvt.h
-rxvtperl.o: optinc.h feature.h encoding.h rxvtutil.h rxvtfont.h
-rxvtperl.o: rxvttoolkit.h callback.h salloc.h libptytty.h rxvtperl.h
-rxvtperl.o: hookinc.h background.h rsinc.h keyboard.h perlxsi.c ./iom_perl.h
-rxvttoolkit.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-rxvttoolkit.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-rxvttoolkit.o: ../libev/ev.h callback.h salloc.h libptytty.h rxvtperl.h
-rxvttoolkit.o: hookinc.h background.h rsinc.h
+rxvtperl.o: feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
+rxvtperl.o: callback.h scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
+rxvtperl.o: background.h rsinc.h optinc.h keyboard.h perlxsi.c iom_perl.h
+rxvttoolkit.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+rxvttoolkit.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h
+rxvttoolkit.o: callback.h scrollbar.h salloc.h libptytty.h rxvtperl.h
+rxvttoolkit.o: hookinc.h background.h rsinc.h optinc.h
 rxvtutil.o: rxvtutil.h
 salloc.o: salloc.h
-screen.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-screen.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-screen.o: ../libev/ev.h callback.h salloc.h libptytty.h rxvtperl.h hookinc.h
-screen.o: background.h rsinc.h salloc.C
-scrollbar-next.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-scrollbar-next.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h
-scrollbar-next.o: ../libev/ev++.h ../libev/ev.h callback.h salloc.h
-scrollbar-next.o: libptytty.h rxvtperl.h hookinc.h background.h rsinc.h
-scrollbar-plain.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-scrollbar-plain.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h
-scrollbar-plain.o: ../libev/ev++.h ../libev/ev.h callback.h salloc.h
-scrollbar-plain.o: libptytty.h rxvtperl.h hookinc.h background.h rsinc.h
-scrollbar-rxvt.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-scrollbar-rxvt.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h
-scrollbar-rxvt.o: ../libev/ev++.h ../libev/ev.h callback.h salloc.h
-scrollbar-rxvt.o: libptytty.h rxvtperl.h hookinc.h background.h rsinc.h
-scrollbar-xterm.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-scrollbar-xterm.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h
-scrollbar-xterm.o: ../libev/ev++.h ../libev/ev.h callback.h salloc.h
-scrollbar-xterm.o: libptytty.h rxvtperl.h hookinc.h background.h rsinc.h
-scrollbar.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-scrollbar.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-scrollbar.o: ../libev/ev.h callback.h salloc.h libptytty.h rxvtperl.h
-scrollbar.o: hookinc.h background.h rsinc.h
-xdefaults.o: ../config.h rxvt.h optinc.h feature.h encoding.h
-xdefaults.o: rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-xdefaults.o: ../libev/ev.h callback.h salloc.h libptytty.h rxvtperl.h
-xdefaults.o: hookinc.h background.h rsinc.h version.h keyboard.h
+screen.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+screen.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+screen.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
+screen.o: rsinc.h optinc.h salloc.C
+scrollbar-next.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h
+scrollbar-next.o: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
+scrollbar-next.o: ../libev/ev.h callback.h scrollbar.h salloc.h libptytty.h
+scrollbar-next.o: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
+scrollbar-plain.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h
+scrollbar-plain.o: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
+scrollbar-plain.o: ../libev/ev.h callback.h scrollbar.h salloc.h libptytty.h
+scrollbar-plain.o: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
+scrollbar-rxvt.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h
+scrollbar-rxvt.o: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
+scrollbar-rxvt.o: ../libev/ev.h callback.h scrollbar.h salloc.h libptytty.h
+scrollbar-rxvt.o: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
+scrollbar-xterm.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h
+scrollbar-xterm.o: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
+scrollbar-xterm.o: ../libev/ev.h callback.h scrollbar.h salloc.h libptytty.h
+scrollbar-xterm.o: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
+scrollbar.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+scrollbar.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+scrollbar.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
+scrollbar.o: background.h rsinc.h optinc.h
+xdefaults.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
+xdefaults.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
+xdefaults.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
+xdefaults.o: background.h rsinc.h optinc.h version.h keyboard.h
diff --git a/src/version.h b/src/version.h

index 8fc9e5dbe45fb03380f05d58b3cd164f7d18e27c..

index ..1261e2a3b75978714ef21cb27a315f7cf95ce71e 100644

--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 // VERSION _must_ be \d.\d+
-#define VERSION "8.9"
-#define DATE	"2007-12-24"
+#define VERSION "9.0"
+#define DATE	"2008-01-25"

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

-- Response ended

-- Page fetched on Sun Jun 2 12:03:41 2024