diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-26 14:37:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-26 14:37:05 +0200 |
| commit | fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8 (patch) | |
| tree | d9b7345ddfe702b820c7020fb784f0e3dc2253bf /xorg-server | |
| parent | 76bcc36ed305418a3ddc5752d287ede894243e1b (diff) | |
| parent | 1d6d472342aee7b9c68e9f1d92762ef808d35ac2 (diff) | |
| download | vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.tar.gz vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.tar.bz2 vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.extras.xml.in | 10 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/fr | 3 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/us | 47 |
3 files changed, 59 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index 028053e6a..a2f4db040 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -244,6 +244,16 @@ <languageList><iso639Id>crd</iso639Id></languageList> </configItem> </variant> + <variant> + <configItem> + <name>cz_sk_de</name> + <description>Czech Slovak and German (US)</description> + <languageList><iso639Id>eng</iso639Id> + <iso639Id>cze</iso639Id> + <iso639Id>slo</iso639Id> + <iso639Id>ger</iso639Id> </languageList> + </configItem> + </variant> </variantList> </layout> <layout> diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr index c58eb0deb..0bf0be217 100644 --- a/xorg-server/xkeyboard-config/symbols/fr +++ b/xorg-server/xkeyboard-config/symbols/fr @@ -125,7 +125,8 @@ xkb_symbols "oss" { include "latin" include "level3(ralt_switch)" - include "nbsp(level4nl)" + include "nbsp(level4n)" + include "level5(rctrl_switch)" include "keypad(oss)" name[Group1]="French (alternative)"; diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 5cdd1e351..d3b223370 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -1191,6 +1191,53 @@ xkb_symbols "htcdream" { // EXTRAS: +// Czech, Slovak and German charecters added as third level symbols to US keyboard layout. +partial alphanumeric_keys +xkb_symbols "cz_sk_de" { + include "us" + name[Group1]="Czech Slovak and German (US)"; + + key <TLDE> { [grave, asciitilde, uring, Uring ] }; + key <AE01> { [ 1, exclam, uacute, Uacute ] }; + key <AE02> { [ 2, at, ecaron, Ecaron ] }; + key <AE03> { [ 3, numbersign, scaron, Scaron ] }; + key <AE04> { [ 4, dollar, ccaron, Ccaron ] }; + key <AE05> { [ 5, percent, rcaron, Rcaron ] }; + key <AE06> { [ 6, asciicircum, zcaron, Zcaron ] }; + key <AE07> { [ 7, ampersand, yacute, Yacute ] }; + key <AE08> { [ 8, asterisk, aacute, Aacute ] }; + key <AE09> { [ 9, parenleft, iacute, Iacute ] }; + key <AE10> { [ 0, parenright, eacute, Eacute ] }; + key <AE11> { [minus, underscore, ssharp, 0x1001E9E ] }; + key <AE12> { [equal, plus, dead_acute, dead_caron ] }; + + key <AD03> { [ e, E, EuroSign, Eacute ] }; + + key <AD11> { [bracketleft, braceleft, udiaeresis, Udiaeresis ] }; + key <AC10> { [ semicolon, colon, odiaeresis, Odiaeresis ] }; + key <AC11> { [apostrophe, quotedbl,adiaeresis, Adiaeresis ] }; + + key <AC01> { [ a, A, aacute, Aacute ] }; + key <AD08> { [ i, I, iacute, Iacute ] }; + key <AD09> { [ o, O, oacute, Oacute ] }; + key <AD06> { [ y, Y, yacute, Yacute ] }; + key <AD07> { [ u, U, uring, Uring ] }; + + key <AC02> { [ s, S, scaron, Scaron ] }; + key <AB01> { [ z, Z, zcaron, Zcaron ] }; + key <AB03> { [ c, C, ccaron, Ccaron ] }; + key <AD04> { [ r, R, rcaron, Rcaron ] }; + key <AD05> { [ t, T, tcaron, Tcaron ] }; + key <AC03> { [ d, D, dcaron, Dcaron ] }; + key <AB06> { [ n, N, ncaron, Ncaron ] }; + key <AC09> { [ l, L, lcaron, Lcaron ] }; + key <AD10> { [ p, P,ocircumflex, Ocircumflex ] }; + + key <SPCE> { [ space, space, nobreakspace, nobreakspace] }; + + include "level3(ralt_switch)" +}; + // XCompose is out! Unicode combining is in! For those of us who live // on the edge: A keymap using Unicode combining characters instead of // deadkeys. This variation does not deviate from the lame MS-style |