aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-28 11:01:55 +0200
committermarha <marha@users.sourceforge.net>2012-03-28 11:01:55 +0200
commit992585b1df5c2d96a2cfac3835afbe818a13165f (patch)
tree83044e54126c98f23108738006a4d4776b70103a /xorg-server/xkeyboard-config
parentec617f09d07e32d6f57c0da133f53ad3d43a568a (diff)
downloadvcxsrv-992585b1df5c2d96a2cfac3835afbe818a13165f.tar.gz
vcxsrv-992585b1df5c2d96a2cfac3835afbe818a13165f.tar.bz2
vcxsrv-992585b1df5c2d96a2cfac3835afbe818a13165f.zip
xkeyboard-config pixman fontconfig mesa git update 28 Mar 2012
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/compat/Makefile.am2
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in6
-rw-r--r--xorg-server/xkeyboard-config/symbols/jp40
3 files changed, 47 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/compat/Makefile.am b/xorg-server/xkeyboard-config/compat/Makefile.am
index 2be8154a2..aeed93266 100644
--- a/xorg-server/xkeyboard-config/compat/Makefile.am
+++ b/xorg-server/xkeyboard-config/compat/Makefile.am
@@ -2,7 +2,7 @@ compatdir = $(xkb_base)/compat
dist_compat_DATA = \
accessx basic caps complete \
-default iso9995 \
+iso9995 \
japan ledcaps \
lednum ledscroll level5 \
misc mousekeys \
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 6c17faaf7..d9883f1ae 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3464,6 +3464,12 @@
<_description>Japanese (Macintosh)</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>dvorak</name>
+ <_description>Japanese (Dvorak)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp
index a80e02372..4ef77f817 100644
--- a/xorg-server/xkeyboard-config/symbols/jp
+++ b/xorg-server/xkeyboard-config/symbols/jp
@@ -252,3 +252,43 @@ xkb_symbols "hztg_escape" {
replace key <HZTG> { [ Escape ] };
};
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+ name[Group1] = "Japanese (Dvorak)";
+ include "jp(OADG109A)"
+
+ key <AE11> { [ at, grave ] };
+
+ key <AD01> { [ colon, asterisk ] };
+ key <AD02> { [ comma, less ] };
+ key <AD03> { [ period, greater ] };
+ key <AD04> { [ p, P ] };
+ key <AD05> { [ y, Y ] };
+ key <AD06> { [ f, F ] };
+ key <AD07> { [ g, G ] };
+ key <AD08> { [ c, C ] };
+ key <AD09> { [ r, R ] };
+ key <AD10> { [ l, L ] };
+ key <AD11> { [ slash, question ] };
+
+ key <AC02> { [ o, O ] };
+ key <AC03> { [ e, E ] };
+ key <AC04> { [ u, U ] };
+ key <AC05> { [ i, I ] };
+ key <AC06> { [ d, D ] };
+ key <AC07> { [ h, H ] };
+ key <AC08> { [ t, T ] };
+ key <AC09> { [ n, N ] };
+ key <AC10> { [ s, S ] };
+ key <AC11> { [ minus, equal ] };
+
+ key <AB01> { [ semicolon, plus ] };
+ key <AB02> { [ q, Q ] };
+ key <AB03> { [ j, J ] };
+ key <AB04> { [ k, K ] };
+ key <AB05> { [ x, X ] };
+ key <AB06> { [ b, B ] };
+ key <AB08> { [ w, W ] };
+ key <AB09> { [ v, V ] };
+ key <AB10> { [ z, Z ] };
+};