From 8a448108ec0bc3a0a488b2234e0d12aee503c67c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 9 May 2012 15:52:33 +0200
Subject: libX11 mesa xserver xkeyboard-config

---
 xorg-server/xkeyboard-config/symbols/de | 15 +++++++++++++++
 xorg-server/xkeyboard-config/symbols/it |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'xorg-server/xkeyboard-config/symbols')

diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index 4a04cadae..5e412f6a0 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -484,6 +484,21 @@ xkb_symbols "dsb_qwertz"
 	key <AD09> { [              o,              O,         oacute,         Oacute ] };
 };
 
+partial alphanumeric_keys 
+xkb_symbols "qwerty" {
+ 
+    // This layout should work exactly as a de with the exception 
+    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
+    // 2008 by Matej Košík <kosik@fiit.stuba.sk>
+    
+    include "de(basic)"
+
+    name[Group1] = "German (qwerty)";
+
+    key <AB01>	{ [         z,          Z,     leftarrow,         yen ]	};
+    key <AD06>	{ [         y,          Y, guillemotleft,        less ]	};
+};
+
 // layout for Russian letters on an german keyboard
 // based on US-RU layout by Ivan Popov <pin@konvalo.org> 2005-07-17
 // adopted for german layout by Alexey Fisher <bug-track@fisher-privat.net> 2010-08-19
diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it
index 90fb7f5c9..1d26a044b 100644
--- a/xorg-server/xkeyboard-config/symbols/it
+++ b/xorg-server/xkeyboard-config/symbols/it
@@ -175,9 +175,9 @@ xkb_symbols "olpc" {
 partial alphanumeric_keys modifier_keys
 xkb_symbols "us" {
 
-    name[Group1]= "Italian (US keyboard with Italian letters)";
-    
     include "us(euro)"
+
+    name[Group1]= "Italian (US keyboard with Italian letters)";
     
     // Alphanumeric section
 
-- 
cgit v1.2.3