aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-08 09:06:44 +0200
committermarha <marha@users.sourceforge.net>2012-10-08 09:06:44 +0200
commit9b15e1cfe4c6ca9862c2865c4adbc21a758e9734 (patch)
tree13452621f70604f08fd91b1bd46ed6341dbc2ea7 /xorg-server/xkeyboard-config
parentbd13c464f728719fceb8a4918b52727ec125ea6e (diff)
parentde8397bc3d010bba24ec0c4d2e6249a769a86fc7 (diff)
downloadvcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.gz
vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.bz2
vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.zip
Merge remote-tracking branch 'origin/released'
* origin/released: pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012 Conflicts: xorg-server/Xext/xf86bigfont.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in6
-rw-r--r--xorg-server/xkeyboard-config/symbols/it43
2 files changed, 49 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 87943048e..712ddabf6 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3433,6 +3433,12 @@
</languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>ibm</name>
+ <_description>Italian (IBM 142)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it
index 1d26a044b..d70e49755 100644
--- a/xorg-server/xkeyboard-config/symbols/it
+++ b/xorg-server/xkeyboard-config/symbols/it
@@ -255,3 +255,46 @@ xkb_symbols "htcdream" {
include "level3(alt_switch)"
};
+
+partial alphanumeric_keys
+xkb_symbols "ibm" {
+
+ // Modifies the basic italian layout to match IBM 142 variant
+
+ include "us"
+
+ name[Group1]="Italian (IBM 142)";
+
+ key <TLDE> { [ backslash, bar ] };
+
+ key <AE02> { [ 2, quotedbl ] };
+ key <AE03> { [ 3, sterling, numbersign ] };
+ key <AE06> { [ 6, ampersand ] };
+ key <AE07> { [ 7, slash, braceleft ] };
+ key <AE08> { [ 8, parenleft, bracketleft ] };
+ key <AE09> { [ 9, parenright, bracketright ] };
+ key <AE10> { [ 0, equal, braceright ] };
+ key <AE11> { [apostrophe, question ] };
+ key <AE12> { [ igrave, asciicircum ] };
+
+ key <AD01> { [ q, Q, at ] };
+ key <AD03> { [ e, E, EuroSign ] };
+ key <AD11> { [ egrave, eacute ] };
+ key <AD12> { [ plus, asterisk, asciitilde ] };
+
+ key <AC10> { [ ograve, ccedilla ] };
+ key <AC11> { [ agrave, degree ] };
+
+ key <AB08> { [ comma, semicolon ] };
+ key <AB09> { [ period, colon ] };
+ key <AB10> { [ minus, underscore ] };
+
+ key <BKSL> { [ ugrave, section, grave ] };
+
+ key <LSGT> { [ less, greater ] };
+
+ include "level3(ralt_switch)"
+ include "kpdl(comma)"
+
+};
+