diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-05 16:00:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-05 16:00:23 +0200 |
| commit | 0e1ac54142d49051da9a74f37a792225a4e8d7b0 (patch) | |
| tree | 5005e9c9e268b054c8439919d1c95e572c15023e /xorg-server | |
| parent | cda19b1d226d565f1ca4327aeae827c621b3dfd6 (diff) | |
| download | vcxsrv-0e1ac54142d49051da9a74f37a792225a4e8d7b0.tar.gz vcxsrv-0e1ac54142d49051da9a74f37a792225a4e8d7b0.tar.bz2 vcxsrv-0e1ac54142d49051da9a74f37a792225a4e8d7b0.zip | |
libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 7 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/xkb.dtd | 5 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/de | 15 |
3 files changed, 5 insertions, 22 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 7d4e2b9c9..0a0ca4588 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -627,6 +627,7 @@ <name>logii350</name> <_description>Logitech Internet 350 Keyboard</_description> <vendor>Logitech</vendor> + <hwList> <hwId>046d:c313</hwId></hwList> </configItem> </model> <model> @@ -3028,12 +3029,6 @@ </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/rules/xkb.dtd b/xorg-server/xkeyboard-config/rules/xkb.dtd index 0afa0df12..0a37b1188 100644 --- a/xorg-server/xkeyboard-config/rules/xkb.dtd +++ b/xorg-server/xkeyboard-config/rules/xkb.dtd @@ -32,7 +32,7 @@ <!ELEMENT option (configItem)> -<!ELEMENT configItem (name,shortDescription*,description*,vendor?,countryList?,languageList?)> +<!ELEMENT configItem (name,shortDescription*,description*,vendor?,countryList?,languageList?,hwList?)> <!ATTLIST configItem popularity (standard|exotic) "standard"> @@ -53,3 +53,6 @@ <!ELEMENT iso639Id (#PCDATA)> +<!ELEMENT hwList (hwId+)> + +<!ELEMENT hwId (#PCDATA)> diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de index 616b91303..7e052986b 100644 --- a/xorg-server/xkeyboard-config/symbols/de +++ b/xorg-server/xkeyboard-config/symbols/de @@ -485,21 +485,6 @@ 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 |