aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-18 08:07:22 +0100
committermarha <marha@users.sourceforge.net>2011-11-18 08:07:22 +0100
commit7a750103eafc49dd7ee461b6f5efb41a93174056 (patch)
treec1aa773b5d5deba0396e041264fe6b1a8a8c6d18 /xorg-server/xkeyboard-config
parentc39504c06831cd3f0f702b9140d64a2bff1b7a62 (diff)
parent1d325f411302fb329f0045f1288fc7cba03b17ce (diff)
downloadvcxsrv-7a750103eafc49dd7ee461b6f5efb41a93174056.tar.gz
vcxsrv-7a750103eafc49dd7ee461b6f5efb41a93174056.tar.bz2
vcxsrv-7a750103eafc49dd7ee461b6f5efb41a93174056.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.o_s.part1
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in7
-rw-r--r--xorg-server/xkeyboard-config/symbols/jp6
-rw-r--r--xorg-server/xkeyboard-config/symbols/tw1
4 files changed, 15 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 6cf9f1406..e1188ba34 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -103,6 +103,7 @@
nbsp:level4n = +nbsp(level4n)
nbsp:level4nl = +nbsp(level4nl)
japan:nicola_f_bs = +jp(nicola_f_bs)
+ japan:hztg_escape = +jp(hztg_escape)
kpdl:dot = +kpdl(dot)
kpdl:comma = +kpdl(comma)
kpdl:dotoss = +kpdl(dotoss)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 5279521a6..8816034a3 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -4779,6 +4779,7 @@
<_description>Taiwanese</_description>
<languageList>
<iso639Id>trv</iso639Id>
+ <iso639Id>pwn</iso639Id>
</languageList>
</configItem>
<variantList>
@@ -6498,6 +6499,12 @@
<_description>NICOLA-F style Backspace</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>japan:hztg_escape</name>
+ <_description>Make Zenkaku Hankaku an additional ESC</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="false">
<configItem>
diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp
index 30658834f..a80e02372 100644
--- a/xorg-server/xkeyboard-config/symbols/jp
+++ b/xorg-server/xkeyboard-config/symbols/jp
@@ -246,3 +246,9 @@ xkb_symbols "mac" {
replace key <CAPS> { [ Caps_Lock ] };
};
+
+partial alphanumeric_keys
+xkb_symbols "hztg_escape" {
+ replace key <HZTG> { [ Escape ] };
+};
+
diff --git a/xorg-server/xkeyboard-config/symbols/tw b/xorg-server/xkeyboard-config/symbols/tw
index 561cb029a..b98e21ed3 100644
--- a/xorg-server/xkeyboard-config/symbols/tw
+++ b/xorg-server/xkeyboard-config/symbols/tw
@@ -34,6 +34,7 @@ xkb_symbols "tw" {
key <AC02> { [ s, S, ssharp, NoSymbol ] };
key <AC03> { [ d, D, U1E0F, U1E0E ] };
key <AC05> { [ g, G, eng, ENG ] };
+ key <AC09> { [ l, L, U1E3B, U1E3A ] };
key <AC10> { [ semicolon, colon, U02D0, dead_diaeresis ] };
key <AC11> { [apostrophe, quotedbl, U02BC, dead_doubleacute ] };