From ff82d544855abb7fb88b0367c78b7255a23206f2 Mon Sep 17 00:00:00 2001 From: pcg Date: Thu, 18 Dec 2003 00:38:07 +0000 Subject: [PATCH] *** empty log message *** --- README.configure | 8 +- autoconf/configure.in | 8 +- configure | 2 +- doc/rxvt.1 | 295 +++---------------------------------- doc/rxvt.tbl | 83 +++-------- doc/yodl/rxvt-options.yo | 35 ++--- doc/yodl/rxvt-resources.yo | 47 ++---- src/feature.h | 14 +- src/rxvt.h | 5 +- src/xdefaults.C | 11 +- 10 files changed, 77 insertions(+), 431 deletions(-) diff --git a/README.configure b/README.configure index 7387b0d7..94242ae0 100644 --- a/README.configure +++ b/README.configure @@ -53,9 +53,9 @@ make shadows on the scrollbar only half the normal width & height. only applicable to rxvt scrollbars --enable-xim - add support for XIM (X Input Method) protocol. This allows using + add support for XIM (X Input Method) protocol. This allows using alternative input methods (e.g. kinput2) and will also correctly - set up the input for people using dead keys. + set up the input for people using dead keys or compose keys. --enable-greek add support for greek keyboard --enable-ttygid @@ -89,7 +89,7 @@ the mouse button down on a scrollbar arrow --enable-mousewheel add support for scrolling via mouse wheel or buttons 4 & 5 --enable-slipwheeling +--enable-slipwheeling add support for continual scrolling (using the mouse wheel as an accelerator) while the control key is held down. This option requires --enable-mousewheel to also be specified. @@ -114,7 +114,7 @@ via from hot keys. This should keep in a fixed position the rxvt corner which is closest to a corner of the screen --enable-256-color - add support for 256 colours rather than the base 16 colours + add support for 256 colours rather than the base 16 colours --enable-cursor-blink add support for a blinking cursor --enable-pointer-blank diff --git a/autoconf/configure.in b/autoconf/configure.in index c46cbfdf..ef604a88 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -1,6 +1,6 @@ dnl# -*- sh -*- dnl# -dnl# $Id: configure.in,v 1.3 2003-12-17 23:21:56 pcg Exp $ +dnl# $Id: configure.in,v 1.4 2003-12-18 00:38:07 pcg Exp $ dnl# dnl# Process this file with autoconf to produce a configure script. dnl# @@ -332,11 +332,7 @@ AC_ARG_ENABLE(smart-resize, AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior) fi]) -AC_ARG_ENABLE(256-color, - [ --enable-256-color enable 256-color support], - [if test x$enableval = xyes; then - AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support) - fi]) +AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support) AC_ARG_ENABLE(cursor-blink, [ --enable-cursor-blink enable blinking cursor *], diff --git a/configure b/configure index ae6a6743..3c2ed7b3 100755 --- a/configure +++ b/configure @@ -191,7 +191,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-xft enable xft support on systems that have it" ac_help="$ac_help - --with-codesets=NAME,... compile in additional codesets (hp,jp_ext,kr,cn,cn_ext,vn,all)" + --with-codesets=NAME,... compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,vn,all)" ac_help="$ac_help --with-encoding=NAME set language default encoding to NAME (default: sjis) (eucj|sjis|big5|gb|kr|noenc)" diff --git a/doc/rxvt.1 b/doc/rxvt.1 index 07733ff9..e7449990 100644 --- a/doc/rxvt.1 +++ b/doc/rxvt.1 @@ -35,12 +35,6 @@ Note that \fBrxvt\fP permits the resource name to be used as a long-option those listed\&. For example: `rxvt --loginShell --color1 Orange\&'\&. .PP -Also note that if you do not explictly specify a font (\fB-fn\fP and \fB-fm\fP) -or a multichar encoding method (\fB-km\fP), rxvt will select a font for the -preferable encoding according to your locale\&. Supported encodings are: -\fBISO-8859-\fPn (n=\fB1\fP\&.\&.\&.\fB15\fP), \fBKOI8-R\fP, \fBKOI8-U\fP, \fBEUC-JP\fP, -\fBShift_JIS\fP, \fBEUC-KR\fP, \fBEUC-CN\fP (aka \fBGB\fP), and \fBBig5\fP\&. -.PP The following options are available: .PP .IP "\fB-help\fP, \fB--help\fP" @@ -84,24 +78,12 @@ resource \fBpointerColor\fP\&. The colour of the border between the xterm scrollbar and the text; resource \fBborderColor\fP\&. .IP "\fB-fn\fP \fIfontname\fP" -Main normal text font; +Select the fonts to be used used\&. This is a comma seperated +list of font names that are used in turn when trying to display +unicode characters\&. The first font defines the cell size for characters, +pther fonts might be smaller, but not larger\&. A reasonable default list +is appended\&. resource \fBfont\fP\&. -.IP "\fB-fb\fP \fIfontname\fP" -Main bold text font; -resource \fBboldFont\fP\&. -.IP "\fB-fm\fP \fIfontname\fP" -Main multicharacter font; -resource \fBmfont\fP\&. -.IP "\fB-km\fP \fImode\fP" -Compile \fImultichar_languages\fP: -Multiple-character font-set encoding mode; -\fBeucj\fP: EUC Japanese encoding\&. -\fBsjis\fP: Shift JIS encoding\&. -\fBbig5\fP: BIG5 encoding\&. -\fBgb\fP: GB encoding\&. -\fBkr\fP: EUC Korean encoding\&. -\fBnoenc\fP: no encoding; -resource \fBmultichar_encoding\fP\&. .IP "\fB-grk\fP \fImode\fP" Compile \fIGreek\fP: Greek keyboard translation; \fBiso\fP: ISO-8859 mapping\&. @@ -196,6 +178,11 @@ resource \fBpreeditType\fP\&. .IP "\fB-im\fP \fItext\fP" Compile \fIXIM\fP: input method name\&. resource \fBinputMethod\fP\&. +.IP "\fB-imlocale\fP \fIstring\fP" +The locale to use for opening the IM\&. You can use an LC_CTYPE +of e\&.g\&. de_DE\&.UTF-8 for normal text processing but ja_JP\&.EUC-JP +for the input extension to be able to input japanese characters +while staying in another locale\&. .IP "\fB-mod\fP \fImodifier\fP" Override detection of Meta modifier with specified key: \fBalt\fP, \fBmeta\fP, \fBhyper\fP, \fBsuper\fP, \fBmod1\fP, \fBmod2\fP, \fBmod3\fP, @@ -300,258 +287,12 @@ Specify the colon-delimited search path for finding files (XPM and menus), in addition to the paths specified by the \fBRXVTPATH\fP and \fBPATH\fP environment variables\&. .IP "\fBfont:\fP \fIfontname\fP" -Select the main text font used [default 7x14]; +Select the fonts to be used used\&. This is a comma seperated +list of font names that are used in turn when trying to display +unicode characters\&. The first font defines the cell size for characters, +pther fonts might be smaller, but not larger\&. A reasonable default list +is appended\&. option \fB-fn\fP\&. -.IP "\fBfont\fP\fIn\fP\fB:\fP \fIfontname\fP" -Specify the alternative font \fIn\fP\&. The default font values: -.br -.RS -.HP -.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 3w0 \n[3w0]>?\w\[tbl]\fBfont\fP: \[tbl] -.nr 3w1 \n[3w1]>?\w\[tbl]\ 7x14 \[tbl] -.nr 3w0 \n[3w0]>?\w\[tbl]\fBfont1\fP: \[tbl] -.nr 3w1 \n[3w1]>?\w\[tbl]\ 6x10 \[tbl] -.nr 3w0 \n[3w0]>?\w\[tbl]\fBfont2\fP: \[tbl] -.nr 3w1 \n[3w1]>?\w\[tbl]\ 6x13 \[tbl] -.nr 3w0 \n[3w0]>?\w\[tbl]\fBfont3\fP: \[tbl] -.nr 3w1 \n[3w1]>?\w\[tbl]\ 8x13 \[tbl] -.nr 3w0 \n[3w0]>?\w\[tbl]\fBfont4\fP: \[tbl] -.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>?-\n[.i]) -.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 -\&\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 -\&\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 -\&\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 -\&\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 -\&\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 -.TE -.RE -.IP "\fBboldFont:\fP \fIfontname\fP" -Specify the name of the bold font to use if \fBcolorBD\fP has not been -specified and it is not possible to map the default foreground colour -to colour 8-15 [default NONE]\&. This font must be the same height and -width as the normal font; -option \fB-fb\fP\&. -.IP "\fBmfont:\fP \fIfontname\fP" -Select the main multiple-character text font used [default k14]; -option \fB-fk\fP\&. -.IP "\fBmfont\fP\fIn\fP\fB:\fP \fIfontname\fP" -Specify the alternative multiple-character font \fIn\fP\&. If compiled -for multiple-character fonts, the Roman and multiple-character font -sizes should match\&. -.IP "\fBmultichar_encoding:\fP \fImode\fP" -Set the encoding mode to be used when multicharacter encoding is -received; -\fBeucj\fP: EUC Japanese encoding [default for Kanji]\&. -\fBsjis\fP: Shift JIS encoding\&. -\fBbig5\fP: BIG5 encoding\&. -\fBgb\fP: GB encoding\&. -\fBkr\fP: EUC Korean encoding\&. -\fBnoenc\fP: no encoding; -option \fB-km\fP\&. .IP "\fBgreek_keyboard:\fP \fImode\fP" Set the Greek keyboard translation mode to be used; \fBiso\fP: ISO-8859 mapping (elot-928) [default]\&. @@ -705,6 +446,12 @@ option \fB-pt\fP\&. .IP "\fBinputMethod:\fP \fIname\fP" \fIname\fP of inputMethod to use; option \fB-im\fP\&. +.IP "\fBimLocale:\fP \fIname\fP" +The locale to use for opening the IM\&. You can use an LC_CTYPE +of e\&.g\&. de_DE\&.UTF-8 for normal text processing but ja_JP\&.EUC-JP +for the input extension to be able to input japanese characters +while staying in another locale\&. +option \fB-imlocale\fP\&. .IP "\fBmodifier:\fP \fImodifier\fP" Set the key to be interpreted as the Meta key to: \fBalt\fP, \fBmeta\fP, \fBhyper\fP, \fBsuper\fP, \fBmod1\fP, \fBmod2\fP, \fBmod3\fP, diff --git a/doc/rxvt.tbl b/doc/rxvt.tbl index 5c173042..372d01e2 100644 --- a/doc/rxvt.tbl +++ b/doc/rxvt.tbl @@ -32,12 +32,6 @@ Note that \fBrxvt\fP permits the resource name to be used as a long-option those listed\&. For example: `rxvt --loginShell --color1 Orange\&'\&. .PP -Also note that if you do not explictly specify a font (\fB-fn\fP and \fB-fm\fP) -or a multichar encoding method (\fB-km\fP), rxvt will select a font for the -preferable encoding according to your locale\&. Supported encodings are: -\fBISO-8859-\fPn (n=\fB1\fP\&.\&.\&.\fB15\fP), \fBKOI8-R\fP, \fBKOI8-U\fP, \fBEUC-JP\fP, -\fBShift_JIS\fP, \fBEUC-KR\fP, \fBEUC-CN\fP (aka \fBGB\fP), and \fBBig5\fP\&. -.PP The following options are available: .PP .IP "\fB-help\fP, \fB--help\fP" @@ -81,24 +75,12 @@ resource \fBpointerColor\fP\&. The colour of the border between the xterm scrollbar and the text; resource \fBborderColor\fP\&. .IP "\fB-fn\fP \fIfontname\fP" -Main normal text font; +Select the fonts to be used used\&. This is a comma seperated +list of font names that are used in turn when trying to display +unicode characters\&. The first font defines the cell size for characters, +pther fonts might be smaller, but not larger\&. A reasonable default list +is appended\&. resource \fBfont\fP\&. -.IP "\fB-fb\fP \fIfontname\fP" -Main bold text font; -resource \fBboldFont\fP\&. -.IP "\fB-fm\fP \fIfontname\fP" -Main multicharacter font; -resource \fBmfont\fP\&. -.IP "\fB-km\fP \fImode\fP" -Compile \fImultichar_languages\fP: -Multiple-character font-set encoding mode; -\fBeucj\fP: EUC Japanese encoding\&. -\fBsjis\fP: Shift JIS encoding\&. -\fBbig5\fP: BIG5 encoding\&. -\fBgb\fP: GB encoding\&. -\fBkr\fP: EUC Korean encoding\&. -\fBnoenc\fP: no encoding; -resource \fBmultichar_encoding\fP\&. .IP "\fB-grk\fP \fImode\fP" Compile \fIGreek\fP: Greek keyboard translation; \fBiso\fP: ISO-8859 mapping\&. @@ -193,6 +175,11 @@ resource \fBpreeditType\fP\&. .IP "\fB-im\fP \fItext\fP" Compile \fIXIM\fP: input method name\&. resource \fBinputMethod\fP\&. +.IP "\fB-imlocale\fP \fIstring\fP" +The locale to use for opening the IM\&. You can use an LC_CTYPE +of e\&.g\&. de_DE\&.UTF-8 for normal text processing but ja_JP\&.EUC-JP +for the input extension to be able to input japanese characters +while staying in another locale\&. .IP "\fB-mod\fP \fImodifier\fP" Override detection of Meta modifier with specified key: \fBalt\fP, \fBmeta\fP, \fBhyper\fP, \fBsuper\fP, \fBmod1\fP, \fBmod2\fP, \fBmod3\fP, @@ -297,46 +284,12 @@ Specify the colon-delimited search path for finding files (XPM and menus), in addition to the paths specified by the \fBRXVTPATH\fP and \fBPATH\fP environment variables\&. .IP "\fBfont:\fP \fIfontname\fP" -Select the main text font used [default 7x14]; +Select the fonts to be used used\&. This is a comma seperated +list of font names that are used in turn when trying to display +unicode characters\&. The first font defines the cell size for characters, +pther fonts might be smaller, but not larger\&. A reasonable default list +is appended\&. option \fB-fn\fP\&. -.IP "\fBfont\fP\fIn\fP\fB:\fP \fIfontname\fP" -Specify the alternative font \fIn\fP\&. The default font values: -.br -.RS -.HP -.TS -tab(`); -l l . -\fBfont\fP: `\ 7x14 -\fBfont1\fP: `\ 6x10 -\fBfont2\fP: `\ 6x13 -\fBfont3\fP: `\ 8x13 -\fBfont4\fP: `\ 9x15 -.TE -.RE -.IP "\fBboldFont:\fP \fIfontname\fP" -Specify the name of the bold font to use if \fBcolorBD\fP has not been -specified and it is not possible to map the default foreground colour -to colour 8-15 [default NONE]\&. This font must be the same height and -width as the normal font; -option \fB-fb\fP\&. -.IP "\fBmfont:\fP \fIfontname\fP" -Select the main multiple-character text font used [default k14]; -option \fB-fk\fP\&. -.IP "\fBmfont\fP\fIn\fP\fB:\fP \fIfontname\fP" -Specify the alternative multiple-character font \fIn\fP\&. If compiled -for multiple-character fonts, the Roman and multiple-character font -sizes should match\&. -.IP "\fBmultichar_encoding:\fP \fImode\fP" -Set the encoding mode to be used when multicharacter encoding is -received; -\fBeucj\fP: EUC Japanese encoding [default for Kanji]\&. -\fBsjis\fP: Shift JIS encoding\&. -\fBbig5\fP: BIG5 encoding\&. -\fBgb\fP: GB encoding\&. -\fBkr\fP: EUC Korean encoding\&. -\fBnoenc\fP: no encoding; -option \fB-km\fP\&. .IP "\fBgreek_keyboard:\fP \fImode\fP" Set the Greek keyboard translation mode to be used; \fBiso\fP: ISO-8859 mapping (elot-928) [default]\&. @@ -490,6 +443,12 @@ option \fB-pt\fP\&. .IP "\fBinputMethod:\fP \fIname\fP" \fIname\fP of inputMethod to use; option \fB-im\fP\&. +.IP "\fBimLocale:\fP \fIname\fP" +The locale to use for opening the IM\&. You can use an LC_CTYPE +of e\&.g\&. de_DE\&.UTF-8 for normal text processing but ja_JP\&.EUC-JP +for the input extension to be able to input japanese characters +while staying in another locale\&. +option \fB-imlocale\fP\&. .IP "\fBmodifier:\fP \fImodifier\fP" Set the key to be interpreted as the Meta key to: \fBalt\fP, \fBmeta\fP, \fBhyper\fP, \fBsuper\fP, \fBmod1\fP, \fBmod2\fP, \fBmod3\fP, diff --git a/doc/yodl/rxvt-options.yo b/doc/yodl/rxvt-options.yo index c5b20deb..bbf472d1 100644 --- a/doc/yodl/rxvt-options.yo +++ b/doc/yodl/rxvt-options.yo @@ -1,4 +1,4 @@ -COMMENT(-- $Id: rxvt-options.yo,v 1.2 2003-11-24 17:31:27 pcg Exp $ --) +COMMENT(-- $Id: rxvt-options.yo,v 1.3 2003-12-18 00:38:07 pcg Exp $ --) COMMENT(----------------------------------------------------------------------) manpageoptions() @@ -17,12 +17,6 @@ Note that bf(rxvt) permits the resource name to be used as a long-option those listed. For example: `rxvt --loginShell --color1 Orange'. -Also note that if you do not explictly specify a font (bf(-fn) and bf(-fm)) -or a multichar encoding method (bf(-km)), rxvt will select a font for the -preferable encoding according to your locale. Supported encodings are: -bf(ISO-8859-)n (n=bf(1)...bf(15)), bf(KOI8-R), bf(KOI8-U), bf(EUC-JP), -bf(Shift_JIS), bf(EUC-KR), bf(EUC-CN) (aka bf(GB)), and bf(Big5). - The following options are available: startdit() @@ -67,24 +61,12 @@ startdit() The colour of the border between the xterm scrollbar and the text; resource bf(borderColor). dit(bf(-fn) em(fontname)) - Main normal text font; + Select the fonts to be used used. This is a comma seperated + list of font names that are used in turn when trying to display + unicode characters. The first font defines the cell size for characters, + pther fonts might be smaller, but not larger. A reasonable default list + is appended. resource bf(font). - dit(bf(-fb) em(fontname)) - Main bold text font; - resource bf(boldFont). - dit(bf(-fm) em(fontname)) - Main multicharacter font; - resource bf(mfont). - dit(bf(-km) em(mode)) - Compile em(multichar_languages): - Multiple-character font-set encoding mode; - bf(eucj): EUC Japanese encoding. - bf(sjis): Shift JIS encoding. - bf(big5): BIG5 encoding. - bf(gb): GB encoding. - bf(kr): EUC Korean encoding. - bf(noenc): no encoding; - resource bf(multichar_encoding). dit(bf(-grk) em(mode)) Compile em(Greek): Greek keyboard translation; bf(iso): ISO-8859 mapping. @@ -179,6 +161,11 @@ startdit() dit(bf(-im) em(text)) Compile em(XIM): input method name. resource bf(inputMethod). + dit(bf(-imlocale) em(string)) + The locale to use for opening the IM. You can use an LC_CTYPE + of e.g. de_DE.UTF-8 for normal text processing but ja_JP.EUC-JP + for the input extension to be able to input japanese characters + while staying in another locale. dit(bf(-mod) em(modifier)) Override detection of Meta modifier with specified key: bf(alt), bf(meta), bf(hyper), bf(super), bf(mod1), bf(mod2), bf(mod3), diff --git a/doc/yodl/rxvt-resources.yo b/doc/yodl/rxvt-resources.yo index 4843750e..1d3ca14c 100644 --- a/doc/yodl/rxvt-resources.yo +++ b/doc/yodl/rxvt-resources.yo @@ -1,4 +1,4 @@ -COMMENT(-- $Id: rxvt-resources.yo,v 1.2 2003-11-24 17:31:27 pcg Exp $ --) +COMMENT(-- $Id: rxvt-resources.yo,v 1.3 2003-12-18 00:38:07 pcg Exp $ --) COMMENT(----------------------------------------------------------------------) manpagesection(RESOURCES (available also as long-options)) @@ -96,41 +96,12 @@ startdit() menus), in addition to the paths specified by the bf(RXVTPATH) and bf(PATH) environment variables. dit(bf(font:) em(fontname)) - Select the main text font used [default 7x14]; + Select the fonts to be used used. This is a comma seperated + list of font names that are used in turn when trying to display + unicode characters. The first font defines the cell size for characters, + pther fonts might be smaller, but not larger. A reasonable default list + is appended. option bf(-fn). - dit(bf(font)em(n)bf(:) em(fontname)) - Specify the alternative font em(n). The default font values: nl()\ - indent(\ - starttable(2)(l l)(0)\ - row(cell(bf(font):)cell(7x14))\ - row(cell(bf(font1):)cell(6x10))\ - row(cell(bf(font2):)cell(6x13))\ - row(cell(bf(font3):)cell(8x13))\ - row(cell(bf(font4):)cell(9x15))\ - endtable()) - dit(bf(boldFont:) em(fontname)) - Specify the name of the bold font to use if bf(colorBD) has not been - specified and it is not possible to map the default foreground colour - to colour 8-15 [default NONE]. This font must be the same height and - width as the normal font; - option bf(-fb). - dit(bf(mfont:) em(fontname)) - Select the main multiple-character text font used [default k14]; - option bf(-fk). - dit(bf(mfont)em(n)bf(:) em(fontname)) - Specify the alternative multiple-character font em(n). If compiled - for multiple-character fonts, the Roman and multiple-character font - sizes should match. - dit(bf(multichar_encoding:) em(mode)) - Set the encoding mode to be used when multicharacter encoding is - received; - bf(eucj): EUC Japanese encoding [default for Kanji]. - bf(sjis): Shift JIS encoding. - bf(big5): BIG5 encoding. - bf(gb): GB encoding. - bf(kr): EUC Korean encoding. - bf(noenc): no encoding; - option bf(-km). dit(bf(greek_keyboard:) em(mode)) Set the Greek keyboard translation mode to be used; bf(iso): ISO-8859 mapping (elot-928) [default]. @@ -283,6 +254,12 @@ startdit() dit(bf(inputMethod:) em(name)) em(name) of inputMethod to use; option bf(-im). + dit(bf(imLocale:) em(name)) + The locale to use for opening the IM. You can use an LC_CTYPE + of e.g. de_DE.UTF-8 for normal text processing but ja_JP.EUC-JP + for the input extension to be able to input japanese characters + while staying in another locale. + option bf(-imlocale). dit(bf(modifier:) em(modifier)) Set the key to be interpreted as the Meta key to: bf(alt), bf(meta), bf(hyper), bf(super), bf(mod1), bf(mod2), bf(mod3), diff --git a/src/feature.h b/src/feature.h index bf8282f6..824b2da9 100644 --- a/src/feature.h +++ b/src/feature.h @@ -1,6 +1,6 @@ /* * File: feature.h - * $Id: feature.h,v 1.2 2003-11-24 17:31:27 pcg Exp $ + * $Id: feature.h,v 1.3 2003-12-18 00:38:07 pcg Exp $ * * Compile-time configuration. *----------------------------------------------------------------------- @@ -51,7 +51,7 @@ /* * Suppress use of BOLD and BLINK attributes for setting bright foreground - * and background, respectively. Simulate BOLD using colorBD, boldFont or + * and background, respectively. Simulate BOLD using colorBD or * overstrike characters. */ /* #define NO_BRIGHTCOLOR */ @@ -80,16 +80,6 @@ */ #define NO_PIXEL_DROPPING_AVOIDANCE -/* - * Also use bold font or overstrike even if we use colour for bold - */ -/*#define VERYBOLD*/ - -/* - * Compile without support for real bold fonts - */ -/* #define NO_BOLDFONT */ - /* * Add support for '-hc colour' for background highlight of selection */ diff --git a/src/rxvt.h b/src/rxvt.h index 9468e73c..229800f4 100644 --- a/src/rxvt.h +++ b/src/rxvt.h @@ -1,5 +1,5 @@ /* - * $Id: rxvt.h,v 1.13 2003-12-18 00:29:29 pcg Exp $ + * $Id: rxvt.h,v 1.14 2003-12-18 00:38:07 pcg Exp $ */ #ifndef _RXVT_H_ /* include once only */ @@ -483,9 +483,6 @@ enum { #if (MENUBAR_MAX) Rs_menu, #endif -#ifndef NO_BOLDFONT - Rs_boldFont, -#endif #ifdef GREEK_SUPPORT Rs_greek_keyboard, Rs_greektoggle_key, diff --git a/src/xdefaults.C b/src/xdefaults.C index 07559ede..b8db770e 100644 --- a/src/xdefaults.C +++ b/src/xdefaults.C @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------* * File: xdefaults.c *----------------------------------------------------------------------* - * $Id: xdefaults.C,v 1.5 2003-12-18 00:29:29 pcg Exp $ + * $Id: xdefaults.C,v 1.6 2003-12-18 00:38:07 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1994 Robert Nation @@ -187,15 +187,8 @@ static const struct { #if (MENUBAR_MAX) RSTRG(Rs_menu, "menu", "name[;tag]"), #endif -#ifndef NO_BOLDFONT - STRG(Rs_boldFont, "boldFont", "fb", "fontname", "bold text font"), -#endif - STRG(Rs_font + 0, "font", "fn", "fontname", "normal text font"), + STRG(Rs_font, "font", "fn", "fontname", "normal text font"), /* fonts: command-line option = resource name */ -#ifdef MULTICHAR_SET - STRG(Rs_multichar_encoding, "multichar_encoding", "km", "mode", - "multichar encoding; mode = eucj|sjis|big5|gb|kr|noenc"), -#endif /* MULTICHAR_SET */ #ifdef USE_XIM STRG(Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), STRG(Rs_preeditType, "preeditType", "pt", "style", -- 2.34.1