diff options
author | pascal <pascal> | 2003-05-29 12:41:54 +0000 |
---|---|---|
committer | pascal <pascal> | 2003-05-29 12:41:54 +0000 |
commit | 3e66cefdd8d1124373d47cf9a0e5c08c93c0bf36 (patch) | |
tree | a94ea1fa6940de18902bc1004983e3160ce107d1 | |
parent | dc32e3fb71cfdf52ce7965757e4f75a942df10b6 (diff) |
197. Fixes and updates for XKB keyboard maps:
- add asciitilde to Swedish 'nodeadkeys' map (Bugzilla #291).
- add map for true Romanian keyboard (Bugzilla #300, Manfred Pohler).
- add EuroSign to "us_intl" keyboard map (Bugzilla #309, Paul Bolle).
- fix some keys in Armenian 'phonetic' layout (Bugzilla #313, Ani).
- add some geometry files (Alexander Pohoyda).
- some cosmetic changes.
-rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 9 | ||||
-rw-r--r-- | programs/xkbcomp/geometry/Imakefile | 9 | ||||
-rw-r--r-- | programs/xkbcomp/geometry/ibm/Imakefile | 8 | ||||
-rw-r--r-- | programs/xkbcomp/geometry/ibm/thinkpad | 271 | ||||
-rw-r--r-- | programs/xkbcomp/symbols/am | 11 | ||||
-rw-r--r-- | programs/xkbcomp/symbols/pc/am | 10 | ||||
-rw-r--r-- | programs/xkbcomp/symbols/pc/ro | 68 |
7 files changed, 365 insertions, 21 deletions
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index 981dff8b1..e6209ed48 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,11 @@ XFree86 4.3.99.6 (xx May 2003) + 197. Fixes and updates for XKB keyboard maps: + - add asciitilde to Swedish 'nodeadkeys' map (Bugzilla #291). + - add map for true Romanian keyboard (Bugzilla #300, Manfred Pohler). + - add EuroSign to "us_intl" keyboard map (Bugzilla #309, Paul Bolle). + - fix some keys in Armenian 'phonetic' layout (Bugzilla #313, Ani). + - add some geometry files (Alexander Pohoyda). + - some cosmetic changes. 196. Import FreeType 2.1.4, and do initial merge for config/build (David Dawes). 195. Remove unnecessary links of libm (Marc La France). @@ -17030,7 +17037,7 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2717 2003/05/28 16:02:32 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2718 2003/05/29 03:05:09 dawes Exp $ diff --git a/programs/xkbcomp/geometry/Imakefile b/programs/xkbcomp/geometry/Imakefile index 5d494c598..22f7d72be 100644 --- a/programs/xkbcomp/geometry/Imakefile +++ b/programs/xkbcomp/geometry/Imakefile @@ -3,15 +3,16 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:35 cpqbld Exp $ -XCOMM $XFree86: xc/programs/xkbcomp/geometry/Imakefile,v 3.11 2001/01/21 21:19:40 tsi Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/geometry/Imakefile,v 3.12 2003/02/15 22:22:43 dawes Exp $ #define IHaveSubdirs TESTDATA = - DATAFILES = README amiga ataritt dell everex fujitsu hp keytronic kinesis \ - macintosh microsoft nec northgate pc sony sun winbook \ + DATAFILES = README amiga ataritt chicony dell everex fujitsu hp keytronic \ + kinesis macintosh microsoft nec northgate omnibook pc sony \ + sun winbook \ $(TESTDATA) - SUBDIRS = digital sgi + SUBDIRS = digital ibm sgi all:: diff --git a/programs/xkbcomp/geometry/ibm/Imakefile b/programs/xkbcomp/geometry/ibm/Imakefile new file mode 100644 index 000000000..9439b8190 --- /dev/null +++ b/programs/xkbcomp/geometry/ibm/Imakefile @@ -0,0 +1,8 @@ +XCOMM $XFree86$ + + DATAFILES = thinkpad + +all:: + +InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/geometry/ibm) +DependTarget() diff --git a/programs/xkbcomp/geometry/ibm/thinkpad b/programs/xkbcomp/geometry/ibm/thinkpad new file mode 100644 index 000000000..30a254415 --- /dev/null +++ b/programs/xkbcomp/geometry/ibm/thinkpad @@ -0,0 +1,271 @@ +// -*- indent-tabs-mode: nil -*- +// $XFree86$ + +// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net> +// Geometry specification for IBM ThinkPad keyboard. +// Compatible Models: THINKPAD 560Z 2640-90U, THINKPAD 560Z 2640-91U, +// THINKPAD 560Z 2640-B0U, THINKPAD 560Z 2640-B1U, THINKPAD 560Z 2640-RR3, +// THINKPAD 600 2645-31U, THINKPAD 600 2645-35U, THINKPAD 600 2645-41U, +// THINKPAD 600 2645-42U, THINKPAD 600 2645-45U, THINKPAD 600 2645-48U, +// THINKPAD 600 2645-51U, THINKPAD 600 2645-85U, THINKPAD 600 2645-A1U, +// THINKPAD 600 2645-RR1, THINKPAD 600 2645-RR2, THINKPAD 600E 2645-3AU, +// THINKPAD 600E 2645-4AU, THINKPAD 600E 2645-4BU, THINKPAD 600E 2645-55U, +// THINKPAD 600E 2645-5AU, THINKPAD 600E 2645-5BU, THINKPAD 600E 2645-5JU, +// THINKPAD 600E 2645-8AO, THINKPAD 600E 2645-8AU, THINKPAD 600E 2645-8BU, +// THINKPAD 600E 2645-AAU, THINKPAD 600E 2645-RRB, THINKPAD 600E 2645-RRD, +// THINKPAD 600E 2645-RRF, THINKPAD 600E 2645-RRS, THINKPAD A22E 2645-45U + +xkb_geometry "stick" { + shape "STIK" { cornerRadius = 4, { [7, 7] } }; + + solid "STIK" { + color = "red"; + shape = "STIK"; + top = 85; + left = 126; + }; +}; + +xkb_geometry "common" { + description = "IBM ThinkPad, Common"; + width = 290; + height = 150; + baseColor = "grey80"; + labelColor = "white"; + + shape "FN0" { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 10] } }; + shape "NORM" { cornerRadius = 1, { [18, 18] }, { [2.5, 0], [15.5, 14] } }; + shape "BKSP" { cornerRadius = 1, { [37, 18] }, { [2.5, 0], [34.5, 14] } }; + shape "TABK" { cornerRadius = 1, { [27, 18] }, { [2.5, 0], [24.5, 14] } }; + shape "CAPS" { cornerRadius = 1, { [31, 18] }, { [1, 0], [30, 16] }, + { [1, 0], [26, 16] }, + { [2.5, 0], [24.5, 14] } }; + shape "RTSH" { cornerRadius = 1, { [50, 18] }, { [2.5, 0], [46.5, 14] } }; + shape "MODK" { cornerRadius = 1, { [27.5, 18] }, { [2.5, 0], [25, 14] } }; + shape "SPCE" { cornerRadius = 1, { [100, 18] }, { [2.5, 0], [97.5, 14] } }; + shape "ARRS" { cornerRadius = 1, { [16, 13] }, { [1.5, 0], [14.5, 11] } }; + + shape "LED" { cornerRadius = 2, { [3, 3] } }; + + shape "KEYS" { cornerRadius = 2, + { [0, 0], [19, 0], [19, 13], [172, 13], + [172, 0], [286, 0], [286, 138], [216, 138], + [216, 124], [0, 124] } }; + + solid "KeyPanel" { + shape = "KEYS"; + left = 2; + top = 5; + color = "black"; + }; + + shape "NULL1" { cornerRadius = 1, + { [0, 0], [50, 0], [50, 18], [34, 18], [34, 4], + [16, 4], [16, 18], [0, 18] } }; + + solid "NullPanel1" { + shape = "NULL1"; + left = 237; + top = 110; + color = "grey80"; + }; + + shape "NULL2" { cornerRadius = 1, { [17, 13] } }; + + solid "NullPanel2" { + shape = "NULL2"; + left = 219; + top = 129; + color = "grey80"; + }; + + shape "NULL3" { cornerRadius = 1, + { [0, 26], + [72, 26], [72, 13], [76, 13], [76, 26], + [149, 26], [149, 13], [153, 13], [153, 26], + [226, 26], [226, 0], [230, 0], [230, 26], + [284, 26], [285, 27], + [0, 27] } }; + + solid "NullPanel3" { + shape = "NULL3"; + left = 3; + top = 6; + color = "grey80"; + }; + + indicator.onColor = "green"; + indicator.offColor = "grey10"; + indicator.top = 4; + indicator.shape = "LED"; + indicator "HDDActivity" { onColor = "red"; left = 100; }; + indicator "NumLock" { left = 108; }; + indicator "CapsLock" { left = 114; }; + indicator "ScrollLock" { left = 120; }; + indicator "Power" { left = 128; }; + + key.gap = 1; + key.color = "grey60"; + + section "Function" { + left = 2; + top = 5; + key.shape = "FN0"; + row { + top = 1; + keys { <ESC>, { <PRSC>, 155 }, <SCLK>, <PAUS> }; + }; + row { + top = 14; + keys { <FK01>, <FK02>, <FK03>, <FK04>, + { <FK05>, 6 }, <FK06>, <FK07>, <FK08>, + { <FK09>, 6 }, <FK10>, <FK11>, <FK12> + }; + }; + }; // End of "Function" section + + section "Control" { + left= 2; + top = 109; + key.shape = "MODK"; + row { + top = 1; + keys { { <FN>, "NORM" }, <LCTL>, <LALT>, + { <SPCE>, "SPCE" }, <RALT>, <RCTL> + }; + }; + }; // End of "Control" section + + section "Editing" { + top = 5; + left = 233; + key.shape = "FN0"; + row { + top = 1; + keys { <INS>, <HOME>, <PGUP> }; + }; + row { + top = 14; + keys { <DELE>, <END>, <PGDN> }; + }; + }; // End of "Editing" section + + section "Navigation" { + top = 114; + left = 236; + key.shape = "ARRS"; + row { + top = 1; + left = 17; + keys { <UP> }; + }; + row { + top = 15; + keys { <LEFT>, <DOWN>, <RGHT> }; + }; + }; // End of "Navigation" section +}; + +// 85 keys +// US/English (FRU 02K4785). +xkb_geometry "us" { + include "thinkpad(common)" + + shape "RTRN" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } }; + shape "LFSH" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } }; + shape "BKSL" { cornerRadius = 1, { [28, 18] }, { [2.5, 0], [25.5, 14] } }; + + section "Alpha" { + left = 2; + top = 33; + key.gap = 1; + key.color = "grey60"; + key.shape = "NORM"; + row { + top = 1; + keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>, + <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, + <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" } + }; + }; + row { + top = 20; + keys { { <TAB>, "TABK" }, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD11>, <AD12>, { <BKSL>, "BKSL" } + }; + }; + row { + top = 39; + keys { { <CAPS>, "CAPS" }, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC11>, { <RTRN>, "RTRN" } + }; + }; + row { + top = 58; + keys { { <LFSH>, "LFSH" }, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + { <RTSH>, "RTSH" } + }; + }; + }; // End of "Alpha" section + + include "thinkpad(stick)" +}; + +// 86 keys +// Tested on: DE/German, UK/English (FRU 02K4787). +xkb_geometry "intl" { + include "thinkpad(common)" + + shape "RTRN" { cornerRadius = 1, { [28, 0], [28, 37], [4, 37], [4, 18], + [0, 18], [0, 0] }, + { [25.5, 0], [25.5, 33], [6.5, 33], + [6.5, 14], [2.5, 14], [2.5, 0] } }; + shape "LFSH" { cornerRadius = 1, { [24, 18] }, { [2.5, 0], [21.5, 14] } }; + + section "Alpha" { + left = 2; + top = 33; + key.gap = 1; + key.color = "grey60"; + key.shape = "NORM"; + row { + top = 1; + keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>, + <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, + <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" } + }; + }; + row { + top = 20; + keys { { <TAB>, "TABK" }, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, + <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, + <AD11>, <AD12>, { <RTRN>, "RTRN" } + }; + }; + row { + top = 39; + keys { { <CAPS>, "CAPS" }, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, + <AC11>, <AC12> + }; + }; + row { + top = 58; + keys { { <LFSH>, "LFSH" }, <AB00>, + <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, + <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, + { <RTSH>, "RTSH" } + }; + }; + }; // End of "Alpha" section + + include "thinkpad(stick)" +}; diff --git a/programs/xkbcomp/symbols/am b/programs/xkbcomp/symbols/am index fceefcdcb..bd870a83f 100644 --- a/programs/xkbcomp/symbols/am +++ b/programs/xkbcomp/symbols/am @@ -1,6 +1,6 @@ // $XConsortium: am /main/3 1997/12/18 12:40:12 rch $ // -// $XFree86: xc/programs/xkbcomp/symbols/am,v 1.3 2001/11/21 22:28:52 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/am,v 1.4 2002/06/04 22:50:58 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { @@ -29,7 +29,6 @@ xkb_symbols "basic" { key <AE11> { [ ], [ 0x1000567, 0x1000537 ] }; key <AE12> { [ ], [ 0x1000572, 0x1000542 ] }; - key <AD01> { [ ], [ 0x1000573, 0x1000543 ] }; key <AD02> { [ ], [ 0x1000583, 0x1000553 ] }; key <AD03> { [ ], [ 0x1000562, 0x1000532 ] }; @@ -124,16 +123,16 @@ xkb_symbols "old" { key <AB05> { [ ], [ 0x1000584, 0x1000554 ] }; key <AB06> { [ ], [ 0x100056d, 0x100053d ] }; key <AB07> { [ ], [ 0x1000577, 0x1000547 ] }; - key <AB08> { [ ], [ comma, guillemotleft ] }; + key <AB08> { [ ], [ comma, guillemotleft ] }; key <AB09> { [ ], [ period, guillemotright ] }; - key <AB10> { [ ], [ 0x100055e, 0x1000530 ] }; + key <AB10> { [ ], [ 0x100055e, 0x100055e ] }; }; xkb_symbols "phonetic" { include "am(old)" - key <BKSL> { [ ], [ 0x1000530, backslash ] }; + key <BKSL> { [ ], [ 0x1000577, 0x1000547 ] }; key <AE01> { [ ], [ 0x1000567, 0x1000537 ] }; key <AE02> { [ ], [ 0x1000569, 0x1000539 ] }; @@ -177,7 +176,7 @@ xkb_symbols "phonetic" { key <AB05> { [ ], [ 0x1000562, 0x1000532 ] }; key <AB06> { [ ], [ 0x1000576, 0x1000546 ] }; key <AB07> { [ ], [ 0x1000574, 0x1000544 ] }; - key <AB10> { [ ], [ 0x1000577, 0x1000547 ] }; + key <AB10> { [ ], [ slash , 0x100055e ] }; }; diff --git a/programs/xkbcomp/symbols/pc/am b/programs/xkbcomp/symbols/pc/am index b3ac9a184..c7c05845b 100644 --- a/programs/xkbcomp/symbols/pc/am +++ b/programs/xkbcomp/symbols/pc/am @@ -1,7 +1,7 @@ // based on a keyboard map from an 'xkb/symbols/am' file // -// $XFree86: xc/programs/xkbcomp/symbols/pc/am,v 1.2 2002/11/22 04:03:28 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/pc/am,v 1.3 2003/04/12 10:53:48 pascal Exp $ partial default alphanumeric_keys xkb_symbols "basic" { @@ -117,14 +117,14 @@ xkb_symbols "old" { key <AB07> { [ 0x1000577, 0x1000547 ] }; key <AB08> { [ comma, guillemotleft ] }; key <AB09> { [ period, guillemotright ] }; - key <AB10> { [ 0x100055e, 0x1000530 ] }; - + key <AB10> { [ 0x100055e, 0x100055e ] }; + }; xkb_symbols "phonetic" { include "pc/am(old)" - key <BKSL> { [ 0x1000530, backslash ] }; + key <BKSL> { [ 0x1000577, 0x1000547 ] }; key <AE01> { [ 0x1000567, 0x1000537 ] }; key <AE02> { [ 0x1000569, 0x1000539 ] }; @@ -168,6 +168,6 @@ xkb_symbols "phonetic" { key <LatB> { [ 0x1000562, 0x1000532 ] }; key <LatN> { [ 0x1000576, 0x1000546 ] }; key <LatM> { [ 0x1000574, 0x1000544 ] }; - key <AB10> { [ 0x1000577, 0x1000547 ] }; + key <AB10> { [ slash , 0x100055e ] }; }; diff --git a/programs/xkbcomp/symbols/pc/ro b/programs/xkbcomp/symbols/pc/ro index 6c27661cd..e6d95e0a4 100644 --- a/programs/xkbcomp/symbols/pc/ro +++ b/programs/xkbcomp/symbols/pc/ro @@ -1,17 +1,75 @@ +// $XFree86$ + +default partial alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple US/ASCII + // keyboard and a very simple Romanian keybaord + // Created by Manfred Pohler, <Manfred.Pohler@t-online.de> (C) 2003 + + include "pc/latin" + + name[Group1]="Romanian"; + + // Alphanumeric section + key <TLDE> { [ bracketright, bracketleft, notsign, notsign ] }; + + key <AE01> { [ 1, exclam, asciitilde, asciitilde ] }; + key <AE02> { [ 2, quotedbl, at, at ] }; + key <AE03> { [ 3, numbersign, asciicircum,asciicircum ] }; + key <AE04> { [ 4, currency ] }; + key <AE05> { [ 5, percent, degree, degree ] }; + key <AE06> { [ 6, ampersand ] }; + key <AE07> { [ 7, slash, grave, grave ] }; + key <AE08> { [ 8, parenleft ] }; + key <AE09> { [ 9, parenright ] }; + key <AE10> { [ 0, equal ] }; + key <AE11> { [ plus, question ] }; + key <AE12> { [ apostrophe, asterisk ] }; + + key <AD01> { [ q, Q, backslash, backslash ] }; + key <AD02> { [ w, W, bar, bar ] }; + key <AD03> { [ e, E, EuroSign, EuroSign ] }; + key <AD05> { [ t, T ] }; + key <AD06> { [ z, Z ] }; + key <AD07> { [ u, U ] }; + key <AD08> { [ i, I ] }; + key <AD11> { [ abreve, Abreve, division, division ] }; + key <AD12> { [ icircumflex, Icircumflex, multiply, multiply ] }; + + key <AC04> { [ f, F ] }; + key <AC05> { [ g, G ] }; + key <AC10> { [ scedilla, Scedilla, dollar, dollar ] }; + key <AC11> { [ tcedilla, Tcedilla, ssharp, ssharp ] }; + + key <AB01> { [ y, Y ] }; + key <AB05> { [ b, B, braceleft, braceleft ] }; + key <AB06> { [ n, N, braceright, braceright ] }; + key <AB07> { [ m, M, section, section ] }; + key <AB08> { [ comma, semicolon, less, less ] }; + key <AB09> { [ period, colon, greater, greater ] }; + key <AB10> { [ minus, underscore ] }; + + key <BKSL> { [ acircumflex, Acircumflex ] }; + + // End alphanumeric section, begin "Keypad" + key <KPDL> { [ KP_Delete, KP_Separator ] }; + // End "Keypad" section + + include "level3(ralt_switch_multikey)" +}; // based on a keyboard // Created by Cristian Gafton, <gafton@redhat.com> (C) 2000 // Modified by Mišu Moldovan, <dumol@go.ro> (C) 2001 // Modified by Marius Andreiana, <mandreiana@yahoo.com> (C) 2001 // -// $XFree86: xc/programs/xkbcomp/symbols/pc/ro,v 1.2 2002/11/22 04:03:28 dawes Exp $ - -default partial alphanumeric_keys -xkb_symbols "basic" { +partial alphanumeric_keys +xkb_symbols "ro_us" { include "pc/latin" - name[Group1]="Romanian"; + name[Group1]="Romanian for us-keyboard"; key <AD01> { [ q, Q, acircumflex, Acircumflex ] }; key <AD05> { [ t, T, tcedilla, Tcedilla ] }; |