diff options
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 6 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/de | 15 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/it | 4 |
3 files changed, 23 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index d9883f1ae..e0c1b4e58 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -3148,6 +3148,12 @@ </variant> <variant> <configItem> + <name>qwerty</name> + <_description>German (qwerty)</_description> + </configItem> + </variant> + <variant> + <configItem> <name>ru</name> <_description>Russian (Germany, phonetic)</_description> <languageList> diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de index 4a04cadae..5e412f6a0 100644 --- a/xorg-server/xkeyboard-config/symbols/de +++ b/xorg-server/xkeyboard-config/symbols/de @@ -484,6 +484,21 @@ xkb_symbols "dsb_qwertz" key <AD09> { [ o, O, oacute, Oacute ] }; }; +partial alphanumeric_keys +xkb_symbols "qwerty" { + + // This layout should work exactly as a de with the exception + // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped). + // 2008 by Matej Košík <kosik@fiit.stuba.sk> + + include "de(basic)" + + name[Group1] = "German (qwerty)"; + + key <AB01> { [ z, Z, leftarrow, yen ] }; + key <AD06> { [ y, Y, guillemotleft, less ] }; +}; + // layout for Russian letters on an german keyboard // based on US-RU layout by Ivan Popov <pin@konvalo.org> 2005-07-17 // adopted for german layout by Alexey Fisher <bug-track@fisher-privat.net> 2010-08-19 diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it index 90fb7f5c9..1d26a044b 100644 --- a/xorg-server/xkeyboard-config/symbols/it +++ b/xorg-server/xkeyboard-config/symbols/it @@ -175,9 +175,9 @@ xkb_symbols "olpc" { partial alphanumeric_keys modifier_keys xkb_symbols "us" { - name[Group1]= "Italian (US keyboard with Italian letters)"; - include "us(euro)" + + name[Group1]= "Italian (US keyboard with Italian letters)"; // Alphanumeric section |