From bdcafdf8911769d4046d7037709b3d045095c1e6 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 14 Feb 2005 18:47:54 +0000 Subject: [PATCH] *** empty log message *** --- Changes | 1 + README.FAQ | 22 +++++++++++----------- doc/rxvt.1.html | 22 +++++++++++++++++----- doc/rxvt.1.man.in | 22 ++++++++++++++++------ doc/rxvt.1.pod | 18 ++++++++++++++---- doc/rxvt.1.txt | 28 +++++++++++++++++++--------- 6 files changed, 78 insertions(+), 35 deletions(-) diff --git a/Changes b/Changes index e7f74ea8..55dc7477 100644 --- a/Changes +++ b/Changes @@ -15,6 +15,7 @@ WISH: just for fun, do shade and tint with XRender. - fix a bug when parsing fontnames and another one for empty keymaps which could result in crashes (Kuang-che Wu). + - new option: -embed. - only warn on X errors, *try* to continue (frills). - add COPYING back, which got lost somehow. - after deciding that LSM is dead, remove all traces of it, diff --git a/README.FAQ b/README.FAQ index 51966a82..cc34df43 100644 --- a/README.FAQ +++ b/README.FAQ @@ -51,8 +51,8 @@ FREQUENTLY ASKED QUESTIONS I need a termcap file entry. One reason you might want this is that some distributions or operating systems still compile some programs using the - long-obsoleted termcap (Fedora Core's bash is one example) and rely - on a termcap entry for "rxvt-unicode". + long-obsoleted termcap library (Fedora Core's bash is one example) + and rely on a termcap entry for "rxvt-unicode". You could use rxvt's termcap entry with resonable results in many cases. You can also create a termcap entry by using terminfo's @@ -64,7 +64,7 @@ FREQUENTLY ASKED QUESTIONS rxvt-unicode|rxvt-unicode terminal (X Window System):\ :am:bw:eo:km:mi:ms:xn:xo:\ - :co#80:it#8:li#24:\ + :co#80:it#8:li#24:lm#0:\ :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\ :K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\ :RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:ae=^O:al=\E[L:\ @@ -72,14 +72,14 @@ FREQUENTLY ASKED QUESTIONS :cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\ :ec=\E[%dX:ei=\E[4l:ho=\E[H:i1=\E[?47l\E=\E[?1l:ic=\E[@:\ :im=\E[4h:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\ - :k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\ - :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\ - :kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\EOB:\ - :ke=\E[?1l\E>:kh=\E[7~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\ - :ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:\ - :nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:\ - :st=\EH:ta=^I:te=\E[r\E[?1049l:ti=\E[?1049h:ue=\E[24m:\ - :up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\ + :k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\ + :k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:\ + :kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\EOB:ke=\E[?1l\E>:\ + :kh=\E[7~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\ + :mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:\ + :sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ + :te=\E[r\E[?1049l:ti=\E[?1049h:ue=\E[24m:up=\E[A:\ + :us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\ :vs=\E[?25h: Why does "ls" no longer have coloured output? diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html index 298c6ccf..cdbc009f 100644 --- a/doc/rxvt.1.html +++ b/doc/rxvt.1.html @@ -49,7 +49,7 @@

DESCRIPTION

-

rxvt-unicode, version , is a colour vt102 terminal +

rxvt-unicode, version 5.1, is a colour vt102 terminal emulator intended as an xterm(1) replacement for users who do not require features such as Tektronix 4014 emulation and toolkit-style configurability. As a result, rxvt-unicode uses much less swap space -- @@ -519,12 +519,24 @@ Turn on/off secondary screen scroll (default enabled); resource Remap a key symbol. See resource keysym.

-
-xrm resourcestring
+
-embed: windowid
-No effect on rxvt-unicode. Simply passes through an argument to be made -available in the instance's argument list. Appears in WM_COMMAND in -some window managers. +Tells rxvt to embed it's windows into an already-existing window, +which enables applications to easily embed a terminal. +
+
+

Right now, rxvt will first unmap/map the specified window, so it +shouldn't be a top-level window. rxvt will also reconfigure it +quite a bit, so don't expect it to keep some specific state. It's best to +create an extra subwindow for rxvt and leave it alone.

+
+
+

It might be useful to know that rxvt will not close file +descriptors passed to it (except for stdin/out/err, of course), so you +can use file descriptors to communicate with the programs within the +terminal. This works regardless of wether the -embed option was used or +not.

diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in index 1bd4ca05..e4b085b4 100644 --- a/doc/rxvt.1.man.in +++ b/doc/rxvt.1.man.in @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "rxvt 1" -.TH rxvt 1 "2005-02-14" "" "RXVT-UNICODE" +.TH rxvt 1 "2005-02-14" "5.1" "RXVT-UNICODE" .SH "NAME" rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system) .SH "SYNOPSIS" @@ -446,11 +446,21 @@ Turn on/off secondary screen scroll (default enabled); resource .IP "\fB\-keysym.\fR\fIsym\fR: \fIstring\fR" 4 .IX Item "-keysym.sym: string" Remap a key symbol. See resource \fBkeysym\fR. -.IP "\fB\-xrm\fR \fIresourcestring\fR" 4 -.IX Item "-xrm resourcestring" -No effect on rxvt\-unicode. Simply passes through an argument to be made -available in the instance's argument list. Appears in \fI\s-1WM_COMMAND\s0\fR in -some window managers. +.IP "\fB\-embed\fR: \fIwindowid\fR" 4 +.IX Item "-embed: windowid" +Tells @@RXVT_NAME@@ to embed it's windows into an already-existing window, +which enables applications to easily embed a terminal. +.Sp +Right now, @@RXVT_NAME@@ will first unmap/map the specified window, so it +shouldn't be a top-level window. @@RXVT_NAME@@ will also reconfigure it +quite a bit, so don't expect it to keep some specific state. It's best to +create an extra subwindow for @@RXVT_NAME@@ and leave it alone. +.Sp +It might be useful to know that @@RXVT_NAME@@ will not close file +descriptors passed to it (except for stdin/out/err, of course), so you +can use file descriptors to communicate with the programs within the +terminal. This works regardless of wether the \f(CW\*(C`\-embed\*(C'\fR option was used or +not. .SH "RESOURCES (available also as long\-options)" .IX Header "RESOURCES (available also as long-options)" Note: `@@RXVT_NAME@@ \-\-help' gives a list of all resources (long diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod index de767444..8208d71c 100644 --- a/doc/rxvt.1.pod +++ b/doc/rxvt.1.pod @@ -374,11 +374,21 @@ B. Remap a key symbol. See resource B. -=item B<-xrm> I +=item B<-embed>: I -No effect on rxvt-unicode. Simply passes through an argument to be made -available in the instance's argument list. Appears in I in -some window managers. +Tells @@RXVT_NAME@@ to embed it's windows into an already-existing window, +which enables applications to easily embed a terminal. + +Right now, @@RXVT_NAME@@ will first unmap/map the specified window, so it +shouldn't be a top-level window. @@RXVT_NAME@@ will also reconfigure it +quite a bit, so don't expect it to keep some specific state. It's best to +create an extra subwindow for @@RXVT_NAME@@ and leave it alone. + +It might be useful to know that @@RXVT_NAME@@ will not close file +descriptors passed to it (except for stdin/out/err, of course), so you +can use file descriptors to communicate with the programs within the +terminal. This works regardless of wether the C<-embed> option was used or +not. =back diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt index 3a0c9cf3..1783e122 100644 --- a/doc/rxvt.1.txt +++ b/doc/rxvt.1.txt @@ -6,11 +6,11 @@ SYNOPSIS rxvt [options] [-e command [ args ]] DESCRIPTION - rxvt-unicode, version , is a colour vt102 terminal emulator intended as - an *xterm*(1) replacement for users who do not require features such as - Tektronix 4014 emulation and toolkit-style configurability. As a result, - rxvt-unicode uses much less swap space -- a significant advantage on a - machine serving many X sessions. + rxvt-unicode, version 5.1, is a colour vt102 terminal emulator intended + as an *xterm*(1) replacement for users who do not require features such + as Tektronix 4014 emulation and toolkit-style configurability. As a + result, rxvt-unicode uses much less swap space -- a significant + advantage on a machine serving many X sessions. FREQUENTLY ASKED QUESTIONS See rxvt(7) (try "man 7 rxvt") for a list of frequently asked questions @@ -316,10 +316,20 @@ OPTIONS -keysym.*sym*: *string* Remap a key symbol. See resource keysym. - -xrm *resourcestring* - No effect on rxvt-unicode. Simply passes through an argument to be - made available in the instance's argument list. Appears in - *WM_COMMAND* in some window managers. + -embed: *windowid* + Tells rxvt to embed it's windows into an already-existing window, + which enables applications to easily embed a terminal. + + Right now, rxvt will first unmap/map the specified window, so it + shouldn't be a top-level window. rxvt will also reconfigure it quite + a bit, so don't expect it to keep some specific state. It's best to + create an extra subwindow for rxvt and leave it alone. + + It might be useful to know that rxvt will not close file descriptors + passed to it (except for stdin/out/err, of course), so you can use + file descriptors to communicate with the programs within the + terminal. This works regardless of wether the "-embed" option was + used or not. RESOURCES (available also as long-options) Note: `rxvt --help' gives a list of all resources (long options) -- 2.34.1