aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-15 08:12:01 +0100
committermarha <marha@users.sourceforge.net>2013-01-15 08:12:01 +0100
commit15cdb95b194cb051a5d469cc9eb73eb0eed4db41 (patch)
treee95bdde41b08c417f162e21471def49b08fed4fd /xorg-server/xkeyboard-config
parent7fbec6dbb6e061fe5b8c592dd602cf4b4c65155a (diff)
parent2fe4d492f39a5a5b67c4444805f7b1eaa1e745a9 (diff)
downloadvcxsrv-15cdb95b194cb051a5d469cc9eb73eb0eed4db41.tar.gz
vcxsrv-15cdb95b194cb051a5d469cc9eb73eb0eed4db41.tar.bz2
vcxsrv-15cdb95b194cb051a5d469cc9eb73eb0eed4db41.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa fontconfig xkeyboard-config git update 15 jan 2013
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/configure.ac (renamed from xorg-server/xkeyboard-config/configure.in)0
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in8
-rw-r--r--xorg-server/xkeyboard-config/symbols/in18
-rw-r--r--xorg-server/xkeyboard-config/symbols/pl121
4 files changed, 88 insertions, 59 deletions
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.ac
index c92d8d557..c92d8d557 100644
--- a/xorg-server/xkeyboard-config/configure.in
+++ b/xorg-server/xkeyboard-config/configure.ac
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index fcccd1b73..05732af2a 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -263,7 +263,13 @@
<_description>Polish (international with dead keys)</_description>
</configItem>
</variant>
- </variantList>
+ <variant>
+ <configItem>
+ <name>colemak</name>
+ <_description>Polish (Colemak)</_description>
+ </configItem>
+ </variant>
+ </variantList>
</layout>
<layout>
<configItem>
diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index f98d060c3..68f1b8aba 100644
--- a/xorg-server/xkeyboard-config/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
@@ -1445,8 +1445,8 @@ xkb_symbols "jhelum" {
key <AE03> { [ 3,numbersign, U0A69, numbersign ] };
key <AE04> { [ 4,dollar, U0A6A, dollar ] };
key <AE05> { [ 5,percent,U0A6B, percent ] };
- key <AE06> { [ 6,asciicircum, U0A6C,asciicircum ] };
- key <AE07> { [ 7,ampersand,U0A6D,ampersand ] };
+ key <AE06> { [ 6,U0A73, U0A6C,asciicircum ] };
+ key <AE07> { [ 7,U0A72,U0A6D,ampersand ] };
key <AE08> { [ 8,asterisk,U0A6E, asterisk ] };
key <AE09> { [ 9,parenleft,U0A6F,parenleft ] };
key <AE10> { [ 0,parenright,U0A66,parenright ] };
@@ -1462,23 +1462,23 @@ xkb_symbols "jhelum" {
key <AD05> { [ U0A42, U0A0A ] }; // T: u, uu
key <AD06> { [ U0A30, U0A5C ] }; // Y: ra, raa
key <AD07> { [ U0A26, U0A27 ] }; // U: tha, thha
- key <AD08> { [ U0A17, U0A18 ] }; // I:ga, gha
+ key <AD08> { [ U0A17, U0A18, U0A5A ] }; // I:ga, gha
key <AD09> { [ U0A24, U0A1F ] }; // O: ta, tha
- key <AD10> { [ U0A2A, U0A5E ] }; // P: pa, pha
+ key <AD10> { [ U0A2A, U0A5E, VoidSymbol,U0A5E ] }; // P: pa, pha
key <AD11> { [ U0A21, U0A22, bracketleft, braceleft ] };
key <AD12> { [ U0A19, U0A1E, bracketright, braceright ] };
//A Row
key <AC01> { [ U0A4B, U0A13 ] }; // A: o, oo
- key <AC02> { [ U0A40, U0A0F ] }; // S: e, ee
+ key <AC02> { [ U0A47, U0A0F ] }; // S: e, ee
key <AC03> { [ U0A4D, U0A05 ] }; // D: halant, aa
key <AC04> { [ U0A3F, U0A07 ] }; // F: i, aa
key <AC05> { [ U0A41, U0A09 ] }; // G: u, uh
key <AC06> { [ U0A39, U0A20 ] }; // H: ha, thha
- key <AC07> { [ U0A1C, U0A1D ] }; // J: ja, jha
- key <AC08> { [ U0A15, U0A16 ] }; // K: ka, kha
- key <AC09> { [ U0A32, U0A25 ] }; // L: la, tha
- key <AC10> { [ U0A38, semicolon, colon ] }; //; sa
+ key <AC07> { [ U0A1C, U0A1D, U0A5B ] }; // J: ja, jha
+ key <AC08> { [ U0A15, U0A16,VoidSymbol ,U0A59 ] }; // K: ka, kha
+ key <AC09> { [ U0A32, U0A25, U0A33 ] }; // L: la, tha
+ key <AC10> { [ U0A38, colon, U0A36 ] }; //; sa
key <AC11> { [apostrophe, quotedbl ] };
//Z Row
diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl
index b769307ce..02432acca 100644
--- a/xorg-server/xkeyboard-config/symbols/pl
+++ b/xorg-server/xkeyboard-config/symbols/pl
@@ -124,55 +124,6 @@ xkb_symbols "qwertz" {
include "level3(ralt_switch)"
};
-// A Polish keymap with a comprehensive set of quotes, dashes, and dead accents
-//
-// See http://marcinwolinski.pl/keyboard/ for a description.
-//
-// ┌────┐
-// │ 2 4│ 2 = Shift, 4 = Level3 + Shift
-// │ 1 3│ 1 = Normal, 3 = Level3
-// └────┘
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ ~ ~ │ ! ' │ @ " │ # ˝ │ $ ¸ │ % ˇ │ ^ ^ │ & ˘ │ * ˙ │ ( ̣ │ ) ° │ _ ¯ │ + ˛ ┃ ⌫ Back ┃
-// │ ` ` │ 1 ¡ │ 2 © │ 3 • │ 4 § │ 5 € │ 6 ¢ │ 7 − │ 8 × │ 9 ÷ │ 0 ° │ - – │ = — ┃ space ┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃ ┃ Q │ W │ E Ę │ R │ T │ Y │ U │ I │ O Ó │ P │ { « │ } » ┃ Enter ┃
-// ┃Tab ↹ ┃ q │ w │ e ę │ r │ t │ y │ u │ i │ o ó │ p │ [ ‹ │ ] › ┃ ⏎ ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃
-// ┃ ┃ A Ą │ S Ś │ D │ F │ G │ H │ J │ K │ L Ł │ : “ │ " ” │ | ¶ ┃ ┃
-// ┃Caps ⇬ ┃ a ą │ s ś │ d │ f │ g │ h │ j │ k │ l ł │ ; ‘ │ ' ’ │ \ ┃ ┃
-// ┣━━━━━━━━┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃ │ Z Ż │ X Ź │ C Ć │ V │ B │ N Ń │ M │ < „ │ > · │ ? ¿ ┃ ┃
-// ┃Shift ⇧ │ z ż │ x ź │ c ć │ v │ b │ n ń │ m │ , ‚ │ . … │ / ⁄ ┃Shift ⇧ ┃
-// ┣━━━━━━━┳━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃ ┃ ┃ ┃ ␣ ⍽ ┃ ┃ ┃ ┃
-// ┃Ctrl ┃Meta ┃Alt ┃ ␣ Space ⍽ ┃AltGr ⇮┃Menu ┃Ctrl ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-
-partial alphanumeric_keys
-xkb_symbols "intl" {
-
- include "latin(intl)"
-
- name[Group1]="Polish (international with dead keys)";
-
- key <AD03> { [ e, E, eogonek, Eogonek ] };
- key <AD09> { [ o, O, oacute, Oacute ] };
-
- key <AC01> { [ a, A, aogonek, Aogonek ] };
- key <AC02> { [ s, S, sacute, Sacute ] };
- key <AC09> { [ l, L, lstroke, Lstroke ] };
-
- key <AB01> { [ z, Z, zabovedot, Zabovedot ] };
- key <AB02> { [ x, X, zacute, Zacute ] };
- key <AB03> { [ c, C, cacute, Cacute ] };
- key <AB06> { [ n, N, nacute, Nacute ] };
-
- include "kpdl(comma)"
-
- include "level3(ralt_switch)"
-};
-
// Polish Dvorak keymaps
// by Rafal Rzepecki <divide@users.sf.net>
@@ -479,3 +430,75 @@ xkb_symbols "ru_phonetic_dvorak" {
include "level3(ralt_switch)"
};
+// EXTRAS:
+
+// A Polish keymap with a comprehensive set of quotes, dashes, and dead accents
+//
+// See http://marcinwolinski.pl/keyboard/ for a description.
+//
+// ┌────┐
+// │ 2 4│ 2 = Shift, 4 = Level3 + Shift
+// │ 1 3│ 1 = Normal, 3 = Level3
+// └────┘
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ ~ ~ │ ! ' │ @ " │ # ˝ │ $ ¸ │ % ˇ │ ^ ^ │ & ˘ │ * ˙ │ ( ̣ │ ) ° │ _ ¯ │ + ˛ ┃ ⌫ Back ┃
+// │ ` ` │ 1 ¡ │ 2 © │ 3 • │ 4 § │ 5 € │ 6 ¢ │ 7 − │ 8 × │ 9 ÷ │ 0 ° │ - – │ = — ┃ space ┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃ ┃ Q │ W │ E Ę │ R │ T │ Y │ U │ I │ O Ó │ P │ { « │ } » ┃ Enter ┃
+// ┃Tab ↹ ┃ q │ w │ e ę │ r │ t │ y │ u │ i │ o ó │ p │ [ ‹ │ ] › ┃ ⏎ ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃
+// ┃ ┃ A Ą │ S Ś │ D │ F │ G │ H │ J │ K │ L Ł │ : “ │ " ” │ | ¶ ┃ ┃
+// ┃Caps ⇬ ┃ a ą │ s ś │ d │ f │ g │ h │ j │ k │ l ł │ ; ‘ │ ' ’ │ \ ┃ ┃
+// ┣━━━━━━━━┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
+// ┃ │ Z Ż │ X Ź │ C Ć │ V │ B │ N Ń │ M │ < „ │ > · │ ? ¿ ┃ ┃
+// ┃Shift ⇧ │ z ż │ x ź │ c ć │ v │ b │ n ń │ m │ , ‚ │ . … │ / ⁄ ┃Shift ⇧ ┃
+// ┣━━━━━━━┳━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
+// ┃ ┃ ┃ ┃ ␣ ⍽ ┃ ┃ ┃ ┃
+// ┃Ctrl ┃Meta ┃Alt ┃ ␣ Space ⍽ ┃AltGr ⇮┃Menu ┃Ctrl ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+
+partial alphanumeric_keys
+xkb_symbols "intl" {
+
+ include "latin(intl)"
+
+ name[Group1]="Polish (international with dead keys)";
+
+ key <AD03> { [ e, E, eogonek, Eogonek ] };
+ key <AD09> { [ o, O, oacute, Oacute ] };
+
+ key <AC01> { [ a, A, aogonek, Aogonek ] };
+ key <AC02> { [ s, S, sacute, Sacute ] };
+ key <AC09> { [ l, L, lstroke, Lstroke ] };
+
+ key <AB01> { [ z, Z, zabovedot, Zabovedot ] };
+ key <AB02> { [ x, X, zacute, Zacute ] };
+ key <AB03> { [ c, C, cacute, Cacute ] };
+ key <AB06> { [ n, N, nacute, Nacute ] };
+
+ include "kpdl(comma)"
+
+ include "level3(ralt_switch)"
+};
+
+// Polish Colemak
+// by Tomek Piotrowski <tomek.piotrowski@atteo.com>
+//
+partial alphanumeric_keys
+xkb_symbols "colemak" {
+ include "us(colemak)"
+ name[Group1]= "Polish (Colemak)";
+
+ key <AB01> { [ z, Z, zabovedot, Zabovedot ] };
+ key <AB02> { [ x, X, zacute, Zacute ] };
+ key <AB03> { [ c, C, cacute, Cacute ] };
+ key <AC01> { [ a, A, aogonek, Aogonek ] };
+ key <AC03> { [ s, S, sacute, Sacute ] };
+ key <AC07> { [ n, N, nacute, Nacute ] };
+ key <AC08> { [ e, E, eogonek, Eogonek ] };
+ key <AC10> { [ o, O, oacute, Oacute ] };
+ key <AD07> { [ l, L, lstroke, Lstroke ] };
+
+ include "level3(ralt_switch)"
+};
+