aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-01 12:04:07 +0200
committermarha <marha@users.sourceforge.net>2012-10-01 12:04:07 +0200
commit7305d42f2ad0462ca3916a73df49cc6b70b41fe4 (patch)
tree4de7ec9601f83c61d84e9b8cda40ca0f5ca6bc91 /xorg-server/xkeyboard-config
parentc86fbbd2c3bb30e96a614456bbb7688e0387cf8c (diff)
parent7ed9dbafdbc724c1030404f29678559134de559b (diff)
downloadvcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.tar.gz
vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.tar.bz2
vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libxcb mesa pixman xkeyboard-config git update 1 oct 2012 Conflicts: libxcb/src/man/.gitignore
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in13
-rw-r--r--xorg-server/xkeyboard-config/symbols/pl89
2 files changed, 99 insertions, 3 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 60b41a5af..87943048e 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3898,6 +3898,12 @@
<variantList>
<variant>
<configItem>
+ <name>legacy</name>
+ <_description>Polish (legacy)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>qwertz</name>
<_description>Polish (qwertz)</_description>
</configItem>
@@ -3931,6 +3937,13 @@
</variant>
<variant>
<configItem>
+ <name>szl</name>
+ <description>Silesian</description>
+ <languageList><iso639Id>szl</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>ru_phonetic_dvorak</name>
<!-- Keyboard indicator for Russian layouts -->
<_shortDescription>ru</_shortDescription>
diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl
index 6d227237f..1fbc6aa04 100644
--- a/xorg-server/xkeyboard-config/symbols/pl
+++ b/xorg-server/xkeyboard-config/symbols/pl
@@ -3,18 +3,69 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
+ // Visualisation and description: http://podziemie.net/xkb/pl
+ // Contact: Michał Górny <zrchos+freedesktop@gmail.com>
+
include "latin"
name[Group1]="Polish";
- key <AD01> { [ q, Q ] };
- key <AD02> { [ w, W ] };
+ key <AE01> { [ 1, exclam, notequal, exclamdown ] };
+ key <AE02> { [ 2, at, twosuperior, questiondown ] };
+ key <AE04> { [ 4, dollar, cent, onequarter ] };
+ key <AE05> { [ 5, percent, EuroSign, U2030 ] };
+ key <AE06> { [ 6, asciicircum, onehalf, logicaland ] };
+ key <AE07> { [ 7, ampersand, section, U2248 ] };
+ key <AE08> { [ 8, asterisk, periodcentered, threequarters ] };
+ key <AE09> { [ 9, parenleft, guillemotleft, plusminus ] };
+ key <AE10> { [ 0, parenright, guillemotright, degree ] };
+ key <AE11> { [ minus, underscore, endash, emdash ] };
+
+ key <AD01> { [ q, Q, Greek_pi, Greek_OMEGA ] };
+ key <AD02> { [ w, W, oe, OE ] };
+ key <AD03> { [ e, E, eogonek, Eogonek ] };
+ key <AD04> { [ r, R, copyright, registered ] };
+ key <AD05> { [ t, T, ssharp, trademark ] };
+ key <AD08> { [ i, I, rightarrow, U2194 ] };
+ key <AD09> { [ o, O, oacute, Oacute ] };
+
+ key <AC01> { [ a, A, aogonek, Aogonek ] };
+ key <AC02> { [ s, S, sacute, Sacute ] };
+ key <AC04> { [ f, F, ae, AE ] };
+ key <AC06> { [ h, H, rightsinglequotemark, U2022 ] };
+ key <AC07> { [ j, J, schwa, SCHWA ] };
+ key <AC08> { [ k, K, ellipsis, dead_stroke ] };
+ key <TLDE> { [ grave, asciitilde, notsign, logicalor ] };
+
+ key <AB01> { [ z, Z, zabovedot, Zabovedot ] };
+ key <AB02> { [ x, X, zacute, Zacute ] };
+ key <AB03> { [ c, C, cacute, Cacute ] };
+ key <AB04> { [ v, V, doublelowquotemark, leftsinglequotemark ] };
+ key <AB05> { [ b, B, rightdoublequotemark, leftdoublequotemark ] };
+ key <AB06> { [ n, N, nacute, Nacute ] };
+ key <AB07> { [ m, M, mu, infinity ] };
+ key <AB08> { [ comma, less, lessthanequal, multiply ] };
+ key <AB09> { [ period, greater, greaterthanequal, division ] };
+
+ key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
+
+ include "kpdl(comma)"
+
+ include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "legacy" {
+
+ include "latin"
+
+ name[Group1]="Polish (legacy)";
+
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 <AC04> { [ f, F ] };
key <AB01> { [ z, Z, zabovedot, Zabovedot ] };
key <AB02> { [ x, X, zacute, Zacute ] };
@@ -254,6 +305,38 @@ xkb_symbols "dvp" {
// or layout +level3(ralt_switch_multikey) to revert standard behaviour
};
+// Silesian keyboard layout by Grzegorz Kulik <poslunsku@gmail.com>
+// and Przemysław Buczkowski <przemub@yahoo.pl>.
+// See http://poslunsku.eu/2012/07/slonsko-slabikorzowo-klawiatura-na-windows-i-ubuntu/
+// for a description.
+
+partial alphanumeric_keys
+xkb_symbols "szl" {
+
+ include "latin"
+
+ name[Group1]="Silesian";
+
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ w, W ] };
+ key <AD03> { [ e, E, atilde, Atilde ] };
+ key <AD09> { [ o, O, ocircumflex, Ocircumflex ] };
+ key <AD07> { [ u, U, omacron, Omacron ] };
+ key <AD10> { [ p, P, otilde, Otilde ] };
+
+ key <AC01> { [ a, A, U014F, U014E ] };
+ key <AC02> { [ s, S, sacute, Sacute ] };
+ key <AC04> { [ f, F ] };
+
+ 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)"
+};
partial alphanumeric_keys
xkb_symbols "csb" {