From: root Date: Mon, 14 Feb 2005 10:44:50 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=7d58b29a76f35fef3260038c567afcd0c7134f32;p=dana%2Furxvt.git *** empty log message *** --- diff --git a/Changes b/Changes index 5524b321..e7f74ea8 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,6 @@ TODO: manpage 900mb update TODO: safer command: keymap processing. +TODO: "slow" rendering mode for bidi and scripts TODO: read property sequence is broken with respect to utf-8 etc. WISH: keyboard modification via esc-sequences. WISH: line-rewrapping on resize @@ -16,6 +17,8 @@ WISH: just for fun, do shade and tint with XRender. (Kuang-che Wu). - 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, + along with other, similar, cleanups. 5.0 Fri Feb 11 18:31:48 CET 2005 - document a race-free hack to start urxvtd. diff --git a/MANIFEST b/MANIFEST index e93022a0..1c19e23e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -10,18 +10,16 @@ configure reconf genac -doc/etc/XTerm.ad -doc/etc/rclock -doc/etc/rxvt.termcap doc/etc/rxvt-unicode.terminfo +doc/etc/rxvt-unicode.termcap doc/menu/example.menu doc/menu/jedmenu.sl doc/menu/menu doc/menu/rxvt.menu doc/menu/rxvt.zh-menu doc/menu/terminal.menu + doc/.cvsignore -doc/LSM.in doc/Makefile.in doc/README.menu doc/README.xvt diff --git a/Makefile.in b/Makefile.in index 1dd51d9a..4a739093 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,8 @@ # ./Makefile.in -*- Makefile -*- -# $Id: Makefile.in,v 1.10 2005-02-02 08:09:23 root Exp $ @MCOMMON@ +VERNAME = rxvt-unicode-$(VERSION) + srcdir = @srcdir@ VPATH = @srcdir@ .PATH: @srcdir@ diff --git a/README.configure b/README.configure index 7511d33f..64ece8b8 100644 --- a/README.configure +++ b/README.configure @@ -62,14 +62,16 @@ CONFIGURE OPTIONS pseudo-characters when no precomposed form exists. Without --enable-unicode3, the number of additional precomposed - characters is rather limited (2048, if this is full, rxvt will use - the private use area, extending the number of combinations to 8448). - With --enable-unicode3, no practical limit exists. This will also - enable storage of characters >65535. + characters is rather limited (2048, if this is full, rxvt-unicode + will use the private use area, extending the number of combinations + to 8448). With --enable-unicode3, no practical limit exists. + + This option will also enable storage (but not display) of characters + beyond plane 0 (>65535) when --enable-unicode3 was not specified. The combining table also contains entries for arabic presentation forms, but these are not currently used. Bug me if you want these to - be used. + be used (and tell me how these are to be used...). --enable-fallback(=CLASS) When reading resource settings, also read settings for class CLASS diff --git a/autoconf/Make.common.in b/autoconf/Make.common.in index 524b2ea0..5b772121 100644 --- a/autoconf/Make.common.in +++ b/autoconf/Make.common.in @@ -1,27 +1,13 @@ # autoconf/Make.common.in -*- Makefile -*- -# release date (man), LSM date, version number/name, current maintainer +# release date (man), version number/name DATE=@DATE@ -LSMDATE=@LSMDATE@ VERSION=@VERSION@ -VERNAME=rxvt-unicode-$(VERSION) -MAINT=Marc A. Lehmann -MAINTEMAIL=rxvt@schmorp.de -WEBMAINT=Marc A. Lehmann -WEBMAINTEMAIL=rxvt@schmorp.de -WEBPAGE=http://software.schmorp.de/#rxvt-unicode #------------------------------------------------------------------------- RXVTNAME=@RXVTNAME@ SHELL = /bin/sh -# This variable makes it possible to move the installation root to another -# directory. This is useful when you're creating a binary distribution -# If empty, normal root will be used. -# You can run eg. 'make install DESTDIR=/packages/rxvt-xx' to accomplish -# that. -# DESTDIR = /usr/local/X11/$(VERNAME) - # Installation target directories & other installation stuff prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4 index 8c34e17b..75143c29 100644 --- a/autoconf/aclocal.m4 +++ b/autoconf/aclocal.m4 @@ -1,4 +1,2 @@ -dnl> $Id: aclocal.m4,v 1.2 2003-11-24 17:31:26 pcg Exp $ - builtin(include, xpm.m4) builtin(include, libtool.m4) diff --git a/autoconf/xpm.m4 b/autoconf/xpm.m4 index e431e69c..1ff7bd7e 100644 --- a/autoconf/xpm.m4 +++ b/autoconf/xpm.m4 @@ -1,4 +1,3 @@ -dnl> $Id: xpm.m4,v 1.2 2003-11-24 17:31:27 pcg Exp $ dnl> test to find the hard-to-find libXpm dnl> mostly copied from AC_PATH_X & AC_PATH_DIRECT, but explictly set diff --git a/doc/LSM.in b/doc/LSM.in deleted file mode 100644 index b339b057..00000000 --- a/doc/LSM.in +++ /dev/null @@ -1,50 +0,0 @@ -Begin3 -Title: rxvt -Version: @@RXVT_VERSION@@ -Entered-date: @@RXVT_LSMDATE@@ - -Description: @@RXVT_WEBPAGE@@ - Rxvt is an 8-bit clean, colour xterm replacement that uses - significantly less memory than a conventional xterm, mostly - since it doesn't support toolkit configurability or Tek - graphics, but also since features can be removed at - compile-time to reflect your needs. Some rxvt features - (compilation dependent): ANSI-color, bold/blink attributes - modify foreground/background colours, scrollbars with arrow - buttons, kanji and greek support, printer-pipe, XPM - backgrounds with on-the-fly scaling, user-definable menus. - - The distribution also includes rclock, the smaller/better - xclock replacement with appointment scheduling and xbiff - functionality. - -Keywords: rxvt colour color kanji xterm X11 vt100 terminal-emulator - rclock xbiff xpm menu - -Author: * John Bovey [Univ. Kent at Canterbury] was the creator of - the original xvt. - - * Rob Nation [Lockheed] re-wrote most of xvt to make a - substantiallly enhanced version called rxvt (Rob's xvt) - and also wrote rclock (Rob's clock). - - * Mark Olesen [Queen's Univ. at Kingston] made various - improvements and cleanups. - Coordinated development, versions 2.11 - 2.21 - - * Oezguer Kesim [FU Berlin] - Coordinated development, versions 2.21a - 2.4.5 - - * Geoff Wing rewrote much of the screen refreshing routines - and mouse selection. - Coordinated development, versions 2.4.6 - - -Maintained-by: @@RXVT_MAINT@@ @@RXVT_MAINTEMAIL@@ Project Coordinator - -Original-site: http://software.schmorp.de/#rxvt-unicode - -Platforms: requires X11 installed - -Copying-policy: GPL - -End diff --git a/doc/Makefile.in b/doc/Makefile.in index e4ade721..175c586c 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,5 +1,4 @@ # doc/Makefile.in -*- Makefile -*- -# $Id: Makefile.in,v 1.20 2005-02-11 18:06:44 root Exp $ @MCOMMON@ srcdir = @srcdir@ @@ -12,27 +11,13 @@ thisdir = doc first_rule: all dummy: -DIST_ETC = etc/rxvt.termcap etc/rxvt.terminfo etc/XTerm.ad -DIST_POD = rxvt.1.pod rxvt.7.pod -DIST_MENU = menu/menu menu/example.menu menu/rxvt.menu menu/rxvt.zh-menu\ - menu/terminal.menu menu/jedmenu.sl -DIST = Makefile.in README.menu README.xvt BUGS FAQ TODO\ - changes.txt xterm.seq LSM.in \ - rxvt.1.man rxvt.7.man rxvt.1.html rxvt.7.html rxvt.1.txt rxvt.7.txt - #------------------------------------------------------------------------- all: SEDREPLACE = -e 's%@@RXVT_VERSION@@%$(VERSION)%g;'\ - -e 's%@@RXVT_LSMDATE@@%$(LSMDATE)%g;'\ -e 's%@@RXVT_NAME@@%$(RXVTNAME)%g;'\ - -e 's%@@RXVT_DATE@@%$(DATE)%g;'\ - -e 's%@@RXVT_MAINTEMAIL@@%$(MAINTEMAIL)%g;'\ - -e 's%@@RXVT_MAINT@@%$(MAINT)%g;'\ - -e 's%@@RXVT_WEBPAGE@@%$(WEBPAGE)%g;'\ - -e 's%@@RXVT_WEBMAINTEMAIL@@%$(WEBMAINTEMAIL)%g;'\ - -e 's%@@RXVT_WEBMAINT@@%$(WEBMAINT)%g;' + -e 's%@@RXVT_DATE@@%$(DATE)%g;' %.tbl: %.pod ./podtbl <$< >$@ @@ -57,10 +42,7 @@ SEDREPLACE = -e 's%@@RXVT_VERSION@@%$(VERSION)%g;'\ tags allbin: -alldoc: $(basedir)/$(VERNAME).lsm rxvt.1.man.in rxvt.7.man.in rxvt.1.html rxvt.7.html rxvt.1.txt rxvt.7.txt ../README.configure ../README.FAQ - -$(basedir)/$(VERNAME).lsm: LSM.in $(srcdir)/../autoconf/Make.common.in - $(SED) $(SEDREPLACE) < $(srcdir)/LSM.in > $@ +alldoc: rxvt.1.man.in rxvt.7.man.in rxvt.1.html rxvt.7.html rxvt.1.txt rxvt.7.txt ../README.configure ../README.FAQ clean: $(RMF) *~ diff --git a/doc/etc/XTerm.ad b/doc/etc/XTerm.ad deleted file mode 100644 index 2f81b799..00000000 --- a/doc/etc/XTerm.ad +++ /dev/null @@ -1,56 +0,0 @@ -! Put this into ~/.Xdefaults, or to app-defaults/XTerm or wherever -! xrm will loaded it. -! -! This will match the key sequences for a regular xterm to those used -! by rxvt and the enclosed termcap and terminfo files. -! -! As usual, the most annoying xterm keys are Home/End and the ubiquitous -! BackSpace/Delete confusion. - -XTerm*vt100.translations: #override \ - BackSpace: string("\010") \n\ - ShiftTab: string("\033[Z") \n\ - Ctrlminus: string("\037") \n\ - Home: string("\033[1~") \n\ - End: string("\033[4~") \n\ - Delete: string("\033[3~") \n\ - ShiftDelete: string("\177") \n\ - CtrlDelete: string("\010") \n\ - AltReturn: string("\033\015") \n\ - Altspace: string("\033\040") \n\ - Alta: string("\033a") \n\ - Altb: string("\033b") \n\ - Altc: string("\033c") \n\ - Altd: string("\033d") \n\ - Alte: string("\033e") \n\ - Altf: string("\033f") \n\ - Altg: string("\033g") \n\ - Alth: string("\033h") \n\ - Alti: string("\033i") \n\ - Altj: string("\033j") \n\ - Altk: string("\033k") \n\ - Altl: string("\033l") \n\ - Altm: string("\033m") \n\ - Altn: string("\033n") \n\ - Alto: string("\033o") \n\ - Altp: string("\033p") \n\ - Altq: string("\033q") \n\ - Altr: string("\033r") \n\ - Alts: string("\033s") \n\ - Altt: string("\033t") \n\ - Altu: string("\033u") \n\ - Altv: string("\033v") \n\ - Altw: string("\033w") \n\ - Altx: string("\033x") \n\ - Alty: string("\033y") \n\ - Altz: string("\033z") \n\ - CtrlUp: string("\033Oa") \n\ - CtrlDown: string("\033Ob") \n\ - CtrlRight: string("\033Oc") \n\ - CtrlLeft: string("\033Od") \n\ - ShiftUp: string("\033[a") \n\ - ShiftDown: string("\033[b") \n\ - ShiftRight: string("\033[c") \n\ - ShiftLeft: string("\033[d") \n - -!EOF diff --git a/doc/etc/rclock b/doc/etc/rclock deleted file mode 100644 index 69a39fcc..00000000 --- a/doc/etc/rclock +++ /dev/null @@ -1,28 +0,0 @@ -# ~/.rclock - My appointment file - -# startup functions - -; xsetroot -solid Black & - -# daily functions - -9:00; xsetroot -solid Black & -17:30; xsetroot -solid Red & - -# daily/weekly reminders - -09:30 mtwrf * Good Morning!\nRead News?; rxvt -e News -13:30 mtwrf * Lunch Time -17:30 mtwrf * Home Time -15:00 f * Do timesheet -*:00 us * It's the weekend, why are you here? -9:30 f */13/* Friday the 13th, be careful! - -# annual reminders - -16:00 12/24/* Vale's Birthday (next week) -16:00 12/27/* Vale's Birthday (in four days) - -# one-off reminders - -08:30 03/15/2004 Dentist appointment diff --git a/doc/etc/rxvt-unicode.termcap b/doc/etc/rxvt-unicode.termcap new file mode 100644 index 00000000..22215970 --- /dev/null +++ b/doc/etc/rxvt-unicode.termcap @@ -0,0 +1,21 @@ +# Reconstructed via infocmp from file: /etc/terminfo/r/rxvt-unicode +# (untranslatable capabilities removed to fit entry within 1023 bytes) +rxvt-unicode|rxvt-unicode terminal (X Window System):\ + :am:bw:eo:km:mi:ms:xn:xo:\ + :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:\ + :as=^N:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\ + :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:\ + :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: diff --git a/doc/etc/rxvt.termcap b/doc/etc/rxvt.termcap deleted file mode 100644 index 8a8280f4..00000000 --- a/doc/etc/rxvt.termcap +++ /dev/null @@ -1,23 +0,0 @@ -rxvt|rxvt terminal emulator (X Window System):\ - :am:eo:km:ms:ut:xn:xo:\ - :co#80:it#8:li#24:Co#8:pa#64:\ - :AB=\E[4%dm:AF=\E[3%dm: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:UP=\E[%dA:\ - :ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\ - :ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\ - :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\ - :ho=\E[H:i1=\E[?47l\E=\E[?1l:ic=\E[@:\ - :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=\E[B:ke=\E>:\ - :kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:\ - :md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:op=\E[m:rc=\E8:sc=\E7:\ - :se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ - :te=\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:us=\E[4m:\ - :vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:\ - :@7=\E[8~:kh=\E[7~: -# When compiled with LINUX_KEYS the last line becomes -# :@7=\E[4~:kh=\E[1~: diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html index 7b1e68ce..298c6ccf 100644 --- a/doc/rxvt.1.html +++ b/doc/rxvt.1.html @@ -49,7 +49,7 @@

DESCRIPTION

-

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

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 -- @@ -1550,10 +1550,10 @@ Color names.

Project Coordinator
-Marc A. Lehmann rxvt@schmorp.de +Marc A. Lehmann >
-

http://software.schmorp.de/

+

http://software.schmorp.de/#rxvt-unicode

@@ -1601,7 +1601,7 @@ Rewrote screen display and text selection routines. Project Coordinator (changes.txt 2.4.6 - rxvt-unicode)

-
Marc Alexander Lehmann >
+
Marc Alexander Lehmann >
Forked rxvt-unicode, rewrote most of the display code and internal diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in index 238bbe0b..1bd4ca05 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-12" "5.0" "RXVT-UNICODE" +.TH rxvt 1 "2005-02-14" "" "RXVT-UNICODE" .SH "NAME" rxvt\-unicode (ouR XVT, unicode) \- (a VT102 emulator for the X window system) .SH "SYNOPSIS" @@ -1182,9 +1182,9 @@ Click-and-drag doesn't work with X11 mouse report overriding. .IX Header "CURRENT PROJECT COORDINATOR" .IP "Project Coordinator" 4 .IX Item "Project Coordinator" -@@RXVT_MAINT@@ @@RXVT_MAINTEMAIL@@ +Marc A. Lehmann .Sp -@@RXVT_WEBPAGE@@ + .SH "AUTHORS" .IX Header "AUTHORS" .IP "John Bovey" 4 @@ -1208,8 +1208,8 @@ Project Coordinator (changes.txt 2.21a to 2.4.5) .IX Item "Geoff Wing " Rewrote screen display and text selection routines. Project Coordinator (changes.txt 2.4.6 \- rxvt\-unicode) -.IP "Marc Alexander Lehmann " 4 -.IX Item "Marc Alexander Lehmann " +.IP "Marc Alexander Lehmann " 4 +.IX Item "Marc Alexander Lehmann " Forked rxvt\-unicode, rewrote most of the display code and internal character handling to store text in unicode, improve xterm compatibility and apply numerous other bugfixes and extensions. diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod index 362b38eb..de767444 100644 --- a/doc/rxvt.1.pod +++ b/doc/rxvt.1.pod @@ -1220,9 +1220,9 @@ Click-and-drag doesn't work with X11 mouse report overriding. =item Project Coordinator -@@RXVT_MAINT@@ L<@@RXVT_MAINTEMAIL@@> +Marc A. Lehmann L<< >> -L<@@RXVT_WEBPAGE@@> +L =back @@ -1257,7 +1257,7 @@ Project Coordinator (changes.txt 2.21a to 2.4.5) Rewrote screen display and text selection routines. Project Coordinator (changes.txt 2.4.6 - rxvt-unicode) -=item Marc Alexander Lehmann L<< >> +=item Marc Alexander Lehmann L<< >> Forked rxvt-unicode, rewrote most of the display code and internal character handling to store text in unicode, improve xterm diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt index f2bcbc9c..3a0c9cf3 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 5.0, is a colour vt102 terminal emulator intended - as an *xterm*(1) replacement for users who do not require features such - as Tektronix 4014 emulation and toolkit-style configurability. As a - result, rxvt-unicode uses much less swap space -- a significant - advantage on a machine serving many X sessions. + 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. FREQUENTLY ASKED QUESTIONS See rxvt(7) (try "man 7 rxvt") for a list of frequently asked questions @@ -1027,9 +1027,9 @@ BUGS CURRENT PROJECT COORDINATOR Project Coordinator - Marc A. Lehmann rxvt@schmorp.de + Marc A. Lehmann - + AUTHORS John Bovey @@ -1053,7 +1053,7 @@ AUTHORS Rewrote screen display and text selection routines. Project Coordinator (changes.txt 2.4.6 - rxvt-unicode) - Marc Alexander Lehmann + Marc Alexander Lehmann Forked rxvt-unicode, rewrote most of the display code and internal character handling to store text in unicode, improve xterm compatibility and apply numerous other bugfixes and extensions. diff --git a/doc/rxvt.7.html b/doc/rxvt.7.html index a4725aa3..92aeb3ea 100644 --- a/doc/rxvt.7.html +++ b/doc/rxvt.7.html @@ -1779,9 +1779,12 @@ access the current menuBar for alteration
set the current menuBar's title to string, which may contain the following format specifiers: -%% : literal % character -%n : rxvt name (as per the -name command-line option) -%v : rxvt version +
+
+
+   B<%n>  rxvt name (as per the B<-name> command-line option)
+   B<%v>  rxvt version
+   B<%%>  literal B<%> character

[done]
@@ -2574,15 +2577,19 @@ done by using precomposited characters when available or creating new pseudo-characters when no precomposed form exists.
-

Without --enable-unicode3, the number of additional precomposed -characters is rather limited (2048, if this is full, rxvt will use the +

Without --enable-unicode3, the number of additional precomposed characters +is rather limited (2048, if this is full, rxvt-unicode will use the private use area, extending the number of combinations to 8448). With ---enable-unicode3, no practical limit exists. This will also enable -storage of characters >65535.

+--enable-unicode3, no practical limit exists.

+
+
+

This option will also enable storage (but not display) of characters +beyond plane 0 (>65535) when --enable-unicode3 was not specified.

The combining table also contains entries for arabic presentation forms, -but these are not currently used. Bug me if you want these to be used.

+but these are not currently used. Bug me if you want these to be used (and +tell me how these are to be used...).

--enable-fallback(=CLASS)
diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in index 1d9963f5..5d2c7523 100644 --- a/doc/rxvt.7.man.in +++ b/doc/rxvt.7.man.in @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "rxvt 7" -.TH rxvt 7 "2005-02-13" "5.1" "RXVT-UNICODE" +.TH rxvt 7 "2005-02-14" "" "RXVT-UNICODE" .SH "NAME" RXVT REFERENCE \- FAQ, command sequences and other background information .SH "SYNOPSIS" @@ -1681,9 +1681,12 @@ access the current menuBar for alteration .IX Item "[title:+string]" set the current menuBar's title to \fIstring\fR, which may contain the following format specifiers: -\&\fB%%\fR : literal \fB%\fR character -\&\fB%n\fR : rxvt name (as per the \fB\-name\fR command-line option) -\&\fB%v\fR : rxvt version +.Sp +.Vb 3 +\& B<%n> rxvt name (as per the B<-name> command-line option) +\& B<%v> rxvt version +\& B<%%> literal B<%> character +.Ve .IP "\fB[done]\fR" 4 .IX Item "[done]" set menuBar access as \fBreadonly\fR. @@ -2224,14 +2227,17 @@ where accents are encoded as seperate unicode characters. This is done by using precomposited characters when available or creating new pseudo-characters when no precomposed form exists. .Sp -Without \-\-enable\-unicode3, the number of additional precomposed -characters is rather limited (2048, if this is full, rxvt will use the +Without \-\-enable\-unicode3, the number of additional precomposed characters +is rather limited (2048, if this is full, rxvt-unicode will use the private use area, extending the number of combinations to 8448). With -\&\-\-enable\-unicode3, no practical limit exists. This will also enable -storage of characters >65535. +\&\-\-enable\-unicode3, no practical limit exists. +.Sp +This option will also enable storage (but not display) of characters +beyond plane 0 (>65535) when \-\-enable\-unicode3 was not specified. .Sp The combining table also contains entries for arabic presentation forms, -but these are not currently used. Bug me if you want these to be used. +but these are not currently used. Bug me if you want these to be used (and +tell me how these are to be used...). .IP "\-\-enable\-fallback(=CLASS)" 4 .IX Item "--enable-fallback(=CLASS)" When reading resource settings, also read settings for class \s-1CLASS\s0 diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod index debba569..26d358c0 100644 --- a/doc/rxvt.7.pod +++ b/doc/rxvt.7.pod @@ -80,8 +80,8 @@ the rxvt terminfo file with the rxvt-unicode one. 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 -C. +library (Fedora Core's bash is one example) and rely on a termcap entry +for C. You could use rxvt's termcap entry with resonable results in many cases. You can also create a termcap entry by using terminfo's infocmp program @@ -93,7 +93,7 @@ Or you could use this termcap entry, generated by the command above: 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:\ @@ -101,14 +101,14 @@ Or you could use this termcap entry, generated by the command above: :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: =item Why does C no longer have coloured output? diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt index 68adb586..30f3088d 100644 --- a/doc/rxvt.7.txt +++ b/doc/rxvt.7.txt @@ -1216,8 +1216,11 @@ menuBar [title:+*string*] set the current menuBar's title to *string*, which may contain the - following format specifiers: %% : literal % character %n : rxvt name - (as per the -name command-line option) %v : rxvt version + following format specifiers: + + B<%n> rxvt name (as per the B<-name> command-line option) + B<%v> rxvt version + B<%%> literal B<%> character [done] set menuBar access as readonly. End-of-file tag for [read:+*file*] @@ -1703,14 +1706,16 @@ CONFIGURE OPTIONS pseudo-characters when no precomposed form exists. Without --enable-unicode3, the number of additional precomposed - characters is rather limited (2048, if this is full, rxvt will use - the private use area, extending the number of combinations to 8448). - With --enable-unicode3, no practical limit exists. This will also - enable storage of characters >65535. + characters is rather limited (2048, if this is full, rxvt-unicode + will use the private use area, extending the number of combinations + to 8448). With --enable-unicode3, no practical limit exists. + + This option will also enable storage (but not display) of characters + beyond plane 0 (>65535) when --enable-unicode3 was not specified. The combining table also contains entries for arabic presentation forms, but these are not currently used. Bug me if you want these to - be used. + be used (and tell me how these are to be used...). --enable-fallback(=CLASS) When reading resource settings, also read settings for class CLASS diff --git a/src/Makefile.in b/src/Makefile.in index a00ef35d..50c11697 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,3 @@ -# $Id: Makefile.in,v 1.24 2005-02-02 08:09:23 root Exp $ @MCOMMON@ LINT = lint -DNARROWPROTO=1 $(XINC) -chapbxz diff --git a/src/command.C b/src/command.C index 5827e424..8929e62c 100644 --- a/src/command.C +++ b/src/command.C @@ -3178,7 +3178,7 @@ rxvt_term::process_csi_seq () { case '>': if (ch == CSI_DA) /* secondary device attributes */ - tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); + tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); break; case '?': if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') diff --git a/src/command.h b/src/command.h index 8dc64fc3..ec2cdbda 100644 --- a/src/command.h +++ b/src/command.h @@ -1,5 +1,5 @@ /* - * $Id: command.h,v 1.14 2004-08-15 00:37:04 root Exp $ + * command.h */ #ifndef COMMAND_H_ diff --git a/src/makeintprotos-sed b/src/makeintprotos-sed index 8f8b12b3..0fd5f01b 100644 --- a/src/makeintprotos-sed +++ b/src/makeintprotos-sed @@ -1,5 +1,4 @@ # Get prototypes from a .c file -# $Id: makeintprotos-sed,v 1.2 2003-11-24 17:31:27 pcg Exp $ # /* INTPROTO */ must be above return type which are above function. # Args are on one line # eg. diff --git a/src/version.h b/src/version.h index 18297939..b892749c 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,6 @@ +// VERSION _must_ be \d.\d+ + #define VERSION "5.1" -#define VSTRING "50100" #define DATE "2005-02-11" -#define LSMDATE "11FEB03" -#define LIBVERSION "5:1:0" + +#define LIBVERSION "1:0:0"