aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-12-12 08:39:09 +0100
committermarha <marha@users.sourceforge.net>2012-12-12 08:39:09 +0100
commitc648afe73ef43a15094508d2dd439e05738735bf (patch)
tree6d69f2726eb57d22395ffbe0b7733eebc16d1bb1 /xorg-server
parent853b3fc8ee9a4e7f26f87334655a3f5c772502b7 (diff)
parentb395c3c85251d4e8761704d8e3a3c9f9fa5b45cc (diff)
downloadvcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.tar.gz
vcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.tar.bz2
vcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa pixman xkeyboard-config git update 12 dev 2012
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in6
-rw-r--r--xorg-server/xkeyboard-config/symbols/de10
-rw-r--r--xorg-server/xkeyboard-config/symbols/pl2
3 files changed, 16 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 5f0618166..8d8075004 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1598,6 +1598,12 @@
<variantList>
<variant>
<configItem>
+ <name>legacy</name>
+ <_description>German (legacy)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>nodeadkeys</name>
<_description>German (Austria, eliminate dead keys)</_description>
</configItem>
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index 9793952d6..6ac1e6711 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -50,6 +50,16 @@ xkb_symbols "basic" {
};
partial alphanumeric_keys
+xkb_symbols "legacy" {
+ // previous standard German layout with tilde as dead key
+
+ include "de(basic)"
+ name[Group1]="German (legacy)";
+
+ key <AD12> { [ plus, asterisk, dead_tilde, dead_macron ] };
+};
+
+partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
// modify the basic German layout to not have any dead keys
diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl
index 1fbc6aa04..b769307ce 100644
--- a/xorg-server/xkeyboard-config/symbols/pl
+++ b/xorg-server/xkeyboard-config/symbols/pl
@@ -283,8 +283,6 @@ xkb_symbols "dvp" {
// home row, right side
key <AC09> { [ n, N, nacute, Nacute ] };
key <AC10> { [ s, S, sacute, Sacute ] };
- key <AC11> { [ minus, underscore, hyphen ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
- key <BKSL> { [ backslash, bar ] };
// lower row, left side
key <AB03> { [ j, J, doublelowquotemark, rightdoublequotemark ] };