[thhsieh: A suggested patch for rxvt-2.6.1]
----- Forwarded message from Tung-Han Hsieh <thhsieh> -----
Date: Thu, 26 Aug 1999 10:04:13 +0800
From: Tung-Han Hsieh <thhsieh>
To: xcin@linux.org.tw
Subject: A suggested patch for rxvt-2.6.1
X-Mailer: Mutt 0.95.4us
Dear All,
Sorry that I have to type in English. Here is my suggested patch for
rxvt-2.6.1, which is available from ftp://ftp.rxvt.org/pub/rxvt.
It will also be available in ftp://xcin.linux.org.tw/pub/xcin/crxvt
after several hours.
Here we already have the valid rxvt versions: 2.6.0, 2.6.1, and 2.7.0.
I guess that the 2.7.0 is the under-development version, while the 2.6.x
should be treated as the "stable release". In theory, 2.6.1 should be
better than 2.6.0, so I firstly make this patch. The patches for other
versions will also be available after one or two days. Although this is
only for 2.6.1, but the changes and structer should also be the same
(or similar) to the other versions. So the porting should be very easy
as well.
Here is what I patched:
1. rxvt-2.6.1/doc/rxvt.tbl: This will be converted to rxvt.1, the man page.
However, in my system, this file will cause me a lot of warning messages
when viewing it with "man -l rxvt.1". I am not sure if it is also the
case for other systems. So I make the change anyway.
2. Fix the bug of in-focus rxvt window crash with exiting xcin. This should
be a better patch, since the original patch will disable some functional
of other input-style of rxvt. Although it will not affect us, since
xcin only support "Root" input-style, but in any case it should not be
a good way of fix. Hence please try this better one.
3. Add the XDestroyIC() call when rxvt is exiting. This should send
the terminated signal to XIM server and help the garbage collection for
XIM server end.
4. Fix the bug of cut/copy when the mouse buffer is empty. (The bug will
crash rxvt when now you press the 3rd buttom of mouse)
5. Fix the bug of key-reading. This bug is that when xcin is not running,
"sometimes" the up, down, right, left, .... etc keys will not functional
in rxvt.
Enjoy.
T.H.Hsieh
diff -r --unified orig/rxvt-2.6.1/doc/rxvt.1 rxvt-2.6.1/doc/rxvt.1
--- orig/rxvt-2.6.1/doc/rxvt.1 Tue Aug 17 16:17:38 1999
+++ rxvt-2.6.1/doc/rxvt.1 Tue Aug 24 17:01:22 1999
@@ -234,243 +234,15 @@
.br
.RS
.IP
-.TS
-.nr 3c \n(.C
-.cp 0
-.nr 3lps \n[.s]
-.nr 3cent \n[.ce]
-.de 3init
-.ft \n[.f]
-.ps \n[.s]
-.vs \n[.v]u
-.in \n[.i]u
-.ll \n[.l]u
-.ls \n[.L]
-.ad \n[.j]
-.ie \n[.u] .fi
-.el .nf
-.ce \n[.ce]
-..
-.nr 3ind \n[.i]
-.nr 3fnt \n[.f]
-.nr 3sz \n[.s]
-.nr 3fll \n[.u]
-.nr T. 0
-.nr 3crow 0-1
-.nr 3passed 0-1
-.nr 3sflag 0
-.ds 3trans
-.ds 3quote
-.nr 3brule 1
-.nr 3supbot 0
-.eo
-.de 3rmk
-.mk \$1
-.if !'\n(.z'' \!.3rmk "\$1"
-..
-.de 3rvpt
-.vpt \$1
-.if !'\n(.z'' \!.3rvpt "\$1"
-..
-.de 3keep
-.if '\n[.z]'' \{.ds 3quote \\
-.ds 3trans \!
-.di 3section
-.nr 3sflag 1
-.in 0
-.\}
-..
-.de 3release
-.if \n[3sflag] \{.di
-.in \n[3ind]u
-.nr 3dn \n[dn]
-.ds 3quote
-.ds 3trans
-.nr 3sflag 0
-.if \n[.t]<=\n[dn] \{.nr T. 1
-.T#
-.nr 3supbot 1
-.sp \n[.t]u
-.nr 3supbot 0
-.mk #T
-.\}
-.if \n[.t]<=\n[3dn] .tm warning: page \n%: table text block will not fit on one page
-.nf
-.ls 1
-.3section
-.ls
-.rm 3section
-.\}
-..
-.nr 3tflag 0
-.de 3tkeep
-.if '\n[.z]'' \{.di 3table
-.nr 3tflag 1
-.\}
-..
-.de 3trelease
-.if \n[3tflag] \{.br
-.di
-.nr 3dn \n[dn]
-.ne \n[dn]u+\n[.V]u
-.ie \n[.t]<=\n[3dn] .tm error: page \n%: table will not fit on one page; use .TS H/.TH with a supporting macro package
-.el \{.in 0
-.ls 1
-.nf
-.3table
-.\}
-.rm 3table
-.\}
-..
-.ec
-.ce 0
-.nf
-.nr 3sep 1n
-.nr 3w0 \n(.H
-.nr 3aw0 0
-.nr 3lnw0 0
-.nr 3rnw0 0
-.nr 3w1 \n(.H
-.nr 3aw1 0
-.nr 3lnw1 0
-.nr 3rnw1 0
-.lf 236 ./rxvt.tbl
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBfont\fP: \[tbl]
-.lf 236
-.nr 3w1 \n[3w1]>?\w\[tbl]\ 7x14 \[tbl]
-.lf 237
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBfont1\fP: \[tbl]
-.lf 237
-.nr 3w1 \n[3w1]>?\w\[tbl]\ 6x10 \[tbl]
-.lf 238
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBfont2\fP: \[tbl]
-.lf 238
-.nr 3w1 \n[3w1]>?\w\[tbl]\ 6x13 \[tbl]
-.lf 239
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBfont3\fP: \[tbl]
-.lf 239
-.nr 3w1 \n[3w1]>?\w\[tbl]\ 8x13 \[tbl]
-.lf 240
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBfont4\fP: \[tbl]
-.lf 240
-.nr 3w1 \n[3w1]>?\w\[tbl]\ 9x15 \[tbl]
-.nr 3w0 \n[3w0]>?(\n[3lnw0]+\n[3rnw0])
-.if \n[3aw0] .nr 3w0 \n[3w0]>?(\n[3aw0]+2n)
-.nr 3w1 \n[3w1]>?(\n[3lnw1]+\n[3rnw1])
-.if \n[3aw1] .nr 3w1 \n[3w1]>?(\n[3aw1]+2n)
-.nr 3cd0 0
-.nr 3cl0 0*\n[3sep]
-.nr 3ce0 \n[3cl0]+\n[3w0]
-.nr 3cl1 \n[3ce0]+(3*\n[3sep])
-.nr 3cd1 \n[3ce0]+\n[3cl1]/2
-.nr 3ce1 \n[3cl1]+\n[3w1]
-.nr 3cd2 \n[3ce1]+(0*\n[3sep])
-.nr TW \n[3cd2]
-.if \n[3cent] \{.in +(u;\n[.l]-\n[.i]-\n[TW]/2)
-.nr 3ind \n[.i]
-.\}
-.eo
-.de T#
-.if !\n[3supbot] \{.3rvpt 0
-.mk 3vert
-.ls 1
-.ls
-.nr 3passed \n[3crow]
-.sp |\n[3vert]u
-.3rvpt 1
-.\}
-..
-.ec
-.fc
-.3keep
-.3rmk 3rt0
-\*[3trans].nr 3crow 0
-.3keep
-.mk 3rs0
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u
-.lf 236
-\&\h'|\n[3cl0]u'\fBfont\fP: \h'|\n[3cl1]u'\ 7x14
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs0]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt1
-\*[3trans].nr 3crow 1
-.3keep
-.mk 3rs1
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u
-.lf 237
-\&\h'|\n[3cl0]u'\fBfont1\fP: \h'|\n[3cl1]u'\ 6x10
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs1]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt2
-\*[3trans].nr 3crow 2
-.3keep
-.mk 3rs2
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u
-.lf 238
-\&\h'|\n[3cl0]u'\fBfont2\fP: \h'|\n[3cl1]u'\ 6x13
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs2]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt3
-\*[3trans].nr 3crow 3
-.3keep
-.mk 3rs3
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u
-.lf 239
-\&\h'|\n[3cl0]u'\fBfont3\fP: \h'|\n[3cl1]u'\ 8x13
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs3]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt4
-\*[3trans].nr 3crow 4
-.3keep
-.mk 3rs4
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u
-.lf 240
-\&\h'|\n[3cl0]u'\fBfont4\fP: \h'|\n[3cl1]u'\ 9x15
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs4]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.mk 3rt5
-.nr 3brule 1
-.nr T. 1
-.T#
-.3init
-.fc
-.cp \n(3c
-.lf 241
-.TE
+\fBfont\fP: 7x14
+.br
+\fBfont1\fP: 6x10
+.br
+\fBfont2\fP: 6x13
+.br
+\fBfont3\fP: 8x13
+.br
+\fBfont4\fP: 9x15
.RE
.IP
.IP "\fBboldFont:\fP \fIfontname\fP"
@@ -645,548 +417,41 @@
versions of the same)\&.
Here is a list of the colours with their \fBrgb\&.txt\fP names\&.
.PP
-.TS
-.nr 3c \n(.C
-.cp 0
-.nr 3lps \n[.s]
-.nr 3cent \n[.ce]
-.de 3init
-.ft \n[.f]
-.ps \n[.s]
-.vs \n[.v]u
-.in \n[.i]u
-.ll \n[.l]u
-.ls \n[.L]
-.ad \n[.j]
-.ie \n[.u] .fi
-.el .nf
-.ce \n[.ce]
-..
-.nr 3ind \n[.i]
-.nr 3fnt \n[.f]
-.nr 3sz \n[.s]
-.nr 3fll \n[.u]
-.nr T. 0
-.nr 3crow 0-1
-.nr 3passed 0-1
-.nr 3sflag 0
-.ds 3trans
-.ds 3quote
-.nr 3brule 1
-.nr 3supbot 0
-.eo
-.de 3rmk
-.mk \$1
-.if !'\n(.z'' \!.3rmk "\$1"
-..
-.de 3rvpt
-.vpt \$1
-.if !'\n(.z'' \!.3rvpt "\$1"
-..
-.de 3keep
-.if '\n[.z]'' \{.ds 3quote \\
-.ds 3trans \!
-.di 3section
-.nr 3sflag 1
-.in 0
-.\}
-..
-.de 3release
-.if \n[3sflag] \{.di
-.in \n[3ind]u
-.nr 3dn \n[dn]
-.ds 3quote
-.ds 3trans
-.nr 3sflag 0
-.if \n[.t]<=\n[dn] \{.nr T. 1
-.T#
-.nr 3supbot 1
-.sp \n[.t]u
-.nr 3supbot 0
-.mk #T
-.\}
-.if \n[.t]<=\n[3dn] .tm warning: page \n%: table text block will not fit on one page
-.nf
-.ls 1
-.3section
-.ls
-.rm 3section
-.\}
-..
-.nr 3tflag 0
-.de 3tkeep
-.if '\n[.z]'' \{.di 3table
-.nr 3tflag 1
-.\}
-..
-.de 3trelease
-.if \n[3tflag] \{.br
-.di
-.nr 3dn \n[dn]
-.ne \n[dn]u+\n[.V]u
-.ie \n[.t]<=\n[3dn] .tm error: page \n%: table will not fit on one page; use .TS H/.TH with a supporting macro package
-.el \{.in 0
-.ls 1
-.nf
-.3table
-.\}
-.rm 3table
-.\}
-..
-.ec
-.ce 0
-.nf
-.nr 3sep 1n
-.nr 3w0 \n(.H
-.nr 3aw0 0
-.nr 3lnw0 0
-.nr 3rnw0 0
-.nr 3w1 \n(.H
-.nr 3aw1 0
-.nr 3lnw1 0
-.nr 3rnw1 0
-.nr 3w2 \n(.H
-.nr 3aw2 0
-.nr 3lnw2 0
-.nr 3rnw2 0
-.lf 419 ./rxvt.tbl
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor0\fP \[tbl]
-.lf 419
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (black) \[tbl]
-.lf 419
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Black \[tbl]
-.lf 420
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor1\fP \[tbl]
-.lf 420
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (red) \[tbl]
-.lf 420
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Red3 \[tbl]
-.lf 421
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor2\fP \[tbl]
-.lf 421
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (green) \[tbl]
-.lf 421
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Green3 \[tbl]
-.lf 422
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor3\fP \[tbl]
-.lf 422
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (yellow) \[tbl]
-.lf 422
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Yellow3 \[tbl]
-.lf 423
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor4\fP \[tbl]
-.lf 423
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (blue) \[tbl]
-.lf 423
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Blue3 \[tbl]
-.lf 424
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor5\fP \[tbl]
-.lf 424
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (magenta) \[tbl]
-.lf 424
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Magenta3 \[tbl]
-.lf 425
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor6\fP \[tbl]
-.lf 425
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (cyan) \[tbl]
-.lf 425
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Cyan3 \[tbl]
-.lf 426
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor7\fP \[tbl]
-.lf 426
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (white) \[tbl]
-.lf 426
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = AntiqueWhite \[tbl]
-.lf 427
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor8\fP \[tbl]
-.lf 427
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (bright black) \[tbl]
-.lf 427
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Grey25 \[tbl]
-.lf 428
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor9\fP \[tbl]
-.lf 428
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (bright red) \[tbl]
-.lf 428
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Red \[tbl]
-.lf 429
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor10\fP \[tbl]
-.lf 429
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (bright green) \[tbl]
-.lf 429
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Green \[tbl]
-.lf 430
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor11\fP \[tbl]
-.lf 430
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (bright yellow) \[tbl]
-.lf 430
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Yellow \[tbl]
-.lf 431
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor12\fP \[tbl]
-.lf 431
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (bright blue) \[tbl]
-.lf 431
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Blue \[tbl]
-.lf 432
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor13\fP \[tbl]
-.lf 432
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (bright magenta) \[tbl]
-.lf 432
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Magenta \[tbl]
-.lf 433
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor14\fP \[tbl]
-.lf 433
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (bright cyan) \[tbl]
-.lf 433
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Cyan \[tbl]
-.lf 434
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBcolor15\fP \[tbl]
-.lf 434
-.nr 3w1 \n[3w1]>?\w\[tbl]\ (bright white) \[tbl]
-.lf 434
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = White \[tbl]
-.lf 435
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBforeground\fP \[tbl]
-.lf 435
-.nr 3w1 \n[3w1]>?\w\[tbl]\ \[tbl]
-.lf 435
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = Black \[tbl]
-.lf 436
-.nr 3w0 \n[3w0]>?\w\[tbl]\fBbackground\fP \[tbl]
-.lf 436
-.nr 3w1 \n[3w1]>?\w\[tbl]\ \[tbl]
-.lf 436
-.nr 3w2 \n[3w2]>?\w\[tbl]\ = White \[tbl]
-.nr 3w0 \n[3w0]>?(\n[3lnw0]+\n[3rnw0])
-.if \n[3aw0] .nr 3w0 \n[3w0]>?(\n[3aw0]+2n)
-.nr 3w1 \n[3w1]>?(\n[3lnw1]+\n[3rnw1])
-.if \n[3aw1] .nr 3w1 \n[3w1]>?(\n[3aw1]+2n)
-.nr 3w2 \n[3w2]>?(\n[3lnw2]+\n[3rnw2])
-.if \n[3aw2] .nr 3w2 \n[3w2]>?(\n[3aw2]+2n)
-.nr 3cd0 0
-.nr 3cl0 0*\n[3sep]
-.nr 3ce0 \n[3cl0]+\n[3w0]
-.nr 3cl1 \n[3ce0]+(3*\n[3sep])
-.nr 3cd1 \n[3ce0]+\n[3cl1]/2
-.nr 3ce1 \n[3cl1]+\n[3w1]
-.nr 3cl2 \n[3ce1]+(3*\n[3sep])
-.nr 3cd2 \n[3ce1]+\n[3cl2]/2
-.nr 3ce2 \n[3cl2]+\n[3w2]
-.nr 3cd3 \n[3ce2]+(0*\n[3sep])
-.nr TW \n[3cd3]
-.if \n[3cent] \{.in +(u;\n[.l]-\n[.i]-\n[TW]/2)
-.nr 3ind \n[.i]
-.\}
-.eo
-.de T#
-.if !\n[3supbot] \{.3rvpt 0
-.mk 3vert
-.ls 1
-.ls
-.nr 3passed \n[3crow]
-.sp |\n[3vert]u
-.3rvpt 1
-.\}
-..
-.ec
-.fc
-.3keep
-.3rmk 3rt0
-\*[3trans].nr 3crow 0
-.3keep
-.mk 3rs0
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 419
-\&\h'|\n[3cl0]u'\fBcolor0\fP \h'|\n[3cl1]u'\ (black) \h'|\n[3cl2]u'\ = Black
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs0]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt1
-\*[3trans].nr 3crow 1
-.3keep
-.mk 3rs1
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 420
-\&\h'|\n[3cl0]u'\fBcolor1\fP \h'|\n[3cl1]u'\ (red) \h'|\n[3cl2]u'\ = Red3
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs1]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt2
-\*[3trans].nr 3crow 2
-.3keep
-.mk 3rs2
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 421
-\&\h'|\n[3cl0]u'\fBcolor2\fP \h'|\n[3cl1]u'\ (green) \h'|\n[3cl2]u'\ = Green3
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs2]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt3
-\*[3trans].nr 3crow 3
-.3keep
-.mk 3rs3
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 422
-\&\h'|\n[3cl0]u'\fBcolor3\fP \h'|\n[3cl1]u'\ (yellow) \h'|\n[3cl2]u'\ = Yellow3
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs3]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt4
-\*[3trans].nr 3crow 4
-.3keep
-.mk 3rs4
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 423
-\&\h'|\n[3cl0]u'\fBcolor4\fP \h'|\n[3cl1]u'\ (blue) \h'|\n[3cl2]u'\ = Blue3
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs4]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt5
-\*[3trans].nr 3crow 5
-.3keep
-.mk 3rs5
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 424
-\&\h'|\n[3cl0]u'\fBcolor5\fP \h'|\n[3cl1]u'\ (magenta) \h'|\n[3cl2]u'\ = Magenta3
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs5]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt6
-\*[3trans].nr 3crow 6
-.3keep
-.mk 3rs6
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 425
-\&\h'|\n[3cl0]u'\fBcolor6\fP \h'|\n[3cl1]u'\ (cyan) \h'|\n[3cl2]u'\ = Cyan3
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs6]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt7
-\*[3trans].nr 3crow 7
-.3keep
-.mk 3rs7
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 426
-\&\h'|\n[3cl0]u'\fBcolor7\fP \h'|\n[3cl1]u'\ (white) \h'|\n[3cl2]u'\ = AntiqueWhite
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs7]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt8
-\*[3trans].nr 3crow 8
-.3keep
-.mk 3rs8
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 427
-\&\h'|\n[3cl0]u'\fBcolor8\fP \h'|\n[3cl1]u'\ (bright black) \h'|\n[3cl2]u'\ = Grey25
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs8]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt9
-\*[3trans].nr 3crow 9
-.3keep
-.mk 3rs9
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 428
-\&\h'|\n[3cl0]u'\fBcolor9\fP \h'|\n[3cl1]u'\ (bright red) \h'|\n[3cl2]u'\ = Red
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs9]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt10
-\*[3trans].nr 3crow 10
-.3keep
-.mk 3rs10
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 429
-\&\h'|\n[3cl0]u'\fBcolor10\fP \h'|\n[3cl1]u'\ (bright green) \h'|\n[3cl2]u'\ = Green
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs10]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt11
-\*[3trans].nr 3crow 11
-.3keep
-.mk 3rs11
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 430
-\&\h'|\n[3cl0]u'\fBcolor11\fP \h'|\n[3cl1]u'\ (bright yellow) \h'|\n[3cl2]u'\ = Yellow
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs11]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt12
-\*[3trans].nr 3crow 12
-.3keep
-.mk 3rs12
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 431
-\&\h'|\n[3cl0]u'\fBcolor12\fP \h'|\n[3cl1]u'\ (bright blue) \h'|\n[3cl2]u'\ = Blue
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs12]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt13
-\*[3trans].nr 3crow 13
-.3keep
-.mk 3rs13
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 432
-\&\h'|\n[3cl0]u'\fBcolor13\fP \h'|\n[3cl1]u'\ (bright magenta) \h'|\n[3cl2]u'\ = Magenta
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs13]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt14
-\*[3trans].nr 3crow 14
-.3keep
-.mk 3rs14
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 433
-\&\h'|\n[3cl0]u'\fBcolor14\fP \h'|\n[3cl1]u'\ (bright cyan) \h'|\n[3cl2]u'\ = Cyan
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs14]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt15
-\*[3trans].nr 3crow 15
-.3keep
-.mk 3rs15
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 434
-\&\h'|\n[3cl0]u'\fBcolor15\fP \h'|\n[3cl1]u'\ (bright white) \h'|\n[3cl2]u'\ = White
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs15]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt16
-\*[3trans].nr 3crow 16
-.3keep
-.mk 3rs16
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 435
-\&\h'|\n[3cl0]u'\fBforeground\fP \h'|\n[3cl1]u'\ \h'|\n[3cl2]u'\ = Black
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs16]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.3keep
-.3rmk 3rt17
-\*[3trans].nr 3crow 17
-.3keep
-.mk 3rs17
-.mk 3bot
-.3rvpt 0
-.ta \n[3ce0]u \n[3ce1]u \n[3ce2]u
-.lf 436
-\&\h'|\n[3cl0]u'\fBbackground\fP \h'|\n[3cl1]u'\ \h'|\n[3cl2]u'\ = White
-.nr 3bot \n[3bot]>?\n[.d]
-.sp |\n[3rs17]u
-.3rvpt 1
-.sp |\n[3bot]u
-\*[3trans].nr 3brule 1
-.3release
-.mk 3rt18
-.nr 3brule 1
-.nr T. 1
-.T#
-.3init
-.fc
-.cp \n(3c
-.lf 437
-.TE
+\fBcolor0\fP (black) = Black
+.br
+\fBcolor1\fP (red) = Red3
+.br
+\fBcolor2\fP (green) = Green3
+.br
+\fBcolor3\fP (yellow) = Yellow3
+.br
+\fBcolor4\fP (blue) = Blue3
+.br
+\fBcolor5\fP (magenta) = Magenta3
+.br
+\fBcolor6\fP (cyan) = Cyan3
+.br
+\fBcolor7\fP (white) = AntiqueWhite
+.br
+\fBcolor8\fP (bright black) = Grey25
+.br
+\fBcolor9\fP (bright red) = Red
+.br
+\fBcolor10\fP (bright green) = Green
+.br
+\fBcolor11\fP (bright yellow) = Yellow
+.br
+\fBcolor12\fP (bright blue) = Blue
+.br
+\fBcolor13\fP (bright magenta) = Magenta
+.br
+\fBcolor14\fP (bright cyan) = Cyan
+.br
+\fBcolor15\fP (bright white) = White
+.br
+\fBforeground\fP = Black
+.br
+\fBbackground\fP = White
.PP
It is also possible to specify the colour values of \fBforeground\fP,
\fBbackground\fP, \fBcursorColor\fP, \fBcursorColor2\fP, \fBcolorBD\fP, \fBcolorUL\fP
diff -r --unified orig/rxvt-2.6.1/doc/rxvt.tbl rxvt-2.6.1/doc/rxvt.tbl
--- orig/rxvt-2.6.1/doc/rxvt.tbl Tue Aug 17 16:17:37 1999
+++ rxvt-2.6.1/doc/rxvt.tbl Mon Aug 23 20:24:47 1999
@@ -230,15 +230,15 @@
.br
.RS
.IP
-.TS
-tab(`);
-l l .
-\fBfont\fP: `\ 7x14
-\fBfont1\fP: `\ 6x10
-\fBfont2\fP: `\ 6x13
-\fBfont3\fP: `\ 8x13
-\fBfont4\fP: `\ 9x15
-.TE
+\fBfont\fP: 7x14
+.br
+\fBfont1\fP: 6x10
+.br
+\fBfont2\fP: 6x13
+.br
+\fBfont3\fP: 8x13
+.br
+\fBfont4\fP: 9x15
.RE
.IP
.IP "\fBboldFont:\fP \fIfontname\fP"
@@ -413,28 +413,41 @@
versions of the same)\&.
Here is a list of the colours with their \fBrgb\&.txt\fP names\&.
.PP
-.TS
-tab(`);
-l l l .
-\fBcolor0\fP `\ (black) `\ = Black
-\fBcolor1\fP `\ (red) `\ = Red3
-\fBcolor2\fP `\ (green) `\ = Green3
-\fBcolor3\fP `\ (yellow) `\ = Yellow3
-\fBcolor4\fP `\ (blue) `\ = Blue3
-\fBcolor5\fP `\ (magenta) `\ = Magenta3
-\fBcolor6\fP `\ (cyan) `\ = Cyan3
-\fBcolor7\fP `\ (white) `\ = AntiqueWhite
-\fBcolor8\fP `\ (bright black) `\ = Grey25
-\fBcolor9\fP `\ (bright red) `\ = Red
-\fBcolor10\fP `\ (bright green) `\ = Green
-\fBcolor11\fP `\ (bright yellow) `\ = Yellow
-\fBcolor12\fP `\ (bright blue) `\ = Blue
-\fBcolor13\fP `\ (bright magenta) `\ = Magenta
-\fBcolor14\fP `\ (bright cyan) `\ = Cyan
-\fBcolor15\fP `\ (bright white) `\ = White
-\fBforeground\fP `\ `\ = Black
-\fBbackground\fP `\ `\ = White
-.TE
+\fBcolor0\fP (black) = Black
+.br
+\fBcolor1\fP (red) = Red3
+.br
+\fBcolor2\fP (green) = Green3
+.br
+\fBcolor3\fP (yellow) = Yellow3
+.br
+\fBcolor4\fP (blue) = Blue3
+.br
+\fBcolor5\fP (magenta) = Magenta3
+.br
+\fBcolor6\fP (cyan) = Cyan3
+.br
+\fBcolor7\fP (white) = AntiqueWhite
+.br
+\fBcolor8\fP (bright black) = Grey25
+.br
+\fBcolor9\fP (bright red) = Red
+.br
+\fBcolor10\fP (bright green) = Green
+.br
+\fBcolor11\fP (bright yellow) = Yellow
+.br
+\fBcolor12\fP (bright blue) = Blue
+.br
+\fBcolor13\fP (bright magenta) = Magenta
+.br
+\fBcolor14\fP (bright cyan) = Cyan
+.br
+\fBcolor15\fP (bright white) = White
+.br
+\fBforeground\fP = Black
+.br
+\fBbackground\fP = White
.PP
It is also possible to specify the colour values of \fBforeground\fP,
\fBbackground\fP, \fBcursorColor\fP, \fBcursorColor2\fP, \fBcolorBD\fP, \fBcolorUL\fP
diff -r --unified orig/rxvt-2.6.1/src/command.c rxvt-2.6.1/src/command.c
--- orig/rxvt-2.6.1/src/command.c Fri Aug 13 00:32:39 1999
+++ rxvt-2.6.1/src/command.c Tue Aug 24 17:27:17 1999
@@ -85,6 +85,10 @@
static char *v_bufptr; /* end of area to write */
static char *v_bufend; /* end of physical buffer */
+#ifdef USE_XIM
+static XIMStyle input_style = 0;
+#endif
+
/*----------------------------------------------------------------------*/
/*{{{ substitute system functions */
@@ -218,6 +222,11 @@
# endif
privileges(IGNORE);
#endif /* UTMP_SUPPORT || ! __CYGWIN32__ */
+#ifdef USE_XIM
+ if (Input_Context != NULL) {
+ XDestroyIC(Input_Context);
+ }
+#endif
}
/*}}} */
@@ -1078,9 +1087,11 @@
sizeof(kbuf), &keysym, &status_return);
valid_keysym = ((status_return == XLookupKeySym)
|| (status_return == XLookupBoth));
- } else
+ } else {
len = XLookupString(&ev->xkey, (char *)kbuf, sizeof(kbuf), &keysym,
&compose);
+ valid_keysym = 1;
+ }
#else /* USE_XIM */
len = XLookupString(&ev->xkey, (char *)kbuf, sizeof(kbuf), &keysym,
&compose);
@@ -3417,15 +3428,11 @@
{
XPoint spot;
XVaNestedList preedit_attr;
- XIMStyle input_style;
if (Input_Context == NULL || !TermWin.focus)
return;
- else {
- XGetICValues(Input_Context, XNInputStyle, &input_style, NULL);
- if (!(input_style & XIMPreeditPosition))
- return;
- }
+ else if (!(input_style & XIMPreeditPosition))
+ return;
setPosition(&spot);
preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
@@ -3526,7 +3533,6 @@
char *p, *s, buf[64], tmp[1024];
char *end, *next_s;
XIM xim = NULL;
- XIMStyle input_style = 0;
XIMStyles *xim_styles = NULL;
int found;
XPoint spot;
@@ -3678,14 +3684,11 @@
void
IMSetStatusPosition(void)
{
- XIMStyle input_style;
XRectangle preedit_rect, status_rect, *needed_rect;
XVaNestedList preedit_attr, status_attr;
- if (Input_Context == NULL)
+ if (Input_Context == NULL || !TermWin.focus)
return;
-
- XGetICValues(Input_Context, XNInputStyle, &input_style, NULL);
if (input_style & XIMPreeditArea) {
/* Getting the necessary width of preedit area */
diff -r --unified orig/rxvt-2.6.1/src/screen.c rxvt-2.6.1/src/screen.c
--- orig/rxvt-2.6.1/src/screen.c Wed Jul 7 21:22:22 1999
+++ rxvt-2.6.1/src/screen.c Mon Aug 23 20:31:14 1999
@@ -2782,6 +2782,8 @@
XFree(ct.value);
return;
}
+ if (! ct.value)
+ continue;
#ifdef MULTICHAR_SET
if (XmbTextPropertyToTextList(Xdisplay, &ct, &cl,
&dummy_count) == Success)
----- End forwarded message -----
Reply to: