From 88a087588973ef6bdbf358b5e37230168d4acbcd Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Tue, 24 May 2011 16:54:28 +0200
Subject: [PATCH] Move fake key MDSW to a different keycode value in xfree86
 table.

According to symbols/inet this keycode is used by two keyboard models:
logitech_g15 and apple.
Thus it should not be used for a fake keycode that gets assigned to a
virtual modifier.

Signed-off-by: Egbert Eich <eich@freedesktop.org>
---
 keycodes/xfree86 | 5 ++++-
 symbols/inet     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/keycodes/xfree86 b/keycodes/xfree86
index 821d1d9..0c91018 100644
--- a/keycodes/xfree86
+++ b/keycodes/xfree86
@@ -294,6 +294,9 @@ xkb_keycodes "basic" {
     // MacBooks generate 0x65 for the lower brightness key
     <II65> =  101;
 
+    // Required for apple/logitech_g15 keyboard
+    <II5D> = 93;
+
     // Codes generated for scancodes 0x59-0x5f, 0x62-0x76
     <K59> =   157;		// <I1D>
     <K5A> =   170;		// <I2A>
@@ -352,7 +355,7 @@ xkb_keycodes "basic" {
     // Other codes never generated.  The XFree86 ddx never generates
     // these codes.
     // Thus we can use them as fake keys
-    <MDSW> =    93; // <U5D>
+    <MDSW> =     8;
     <LVL3> =   124; // <U7C>
     <ALT>  =   125; // <U7D>
     <META> =   156; // <I1C>
diff --git a/symbols/inet b/symbols/inet
index 7ffa886..b8f4d19 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -1217,7 +1217,7 @@ xkb_symbols "logitech_g15" {
     key  <K72> {         [     XF86LaunchC ] };
     key  <K74> {         [         XF86WWW ] };
     key  <K75> {         [     XF86LaunchE ] };
-    key <MDSW> {         [     XF86Launch1 ] };
+    key <II5D> {         [     XF86Launch1 ] };
     key <NFER> {         [     XF86Launch2 ] };
     key <XFER> {         [     XF86Launch8 ] };
 };
@@ -1728,7 +1728,7 @@ xkb_symbols "apple" {
     key <K5E>	{	[ F14 ]    };
     key <K5F>	{	[ F15 ]    };
     key <K6C>	{	[ XF86Eject ]    };
-    key <MDSW>	{	[ F16 ]    };
+    key <II5D>	{	[ F16 ]    };
     key <KPEQ>  {       [ KP_Equal ] };
 };
 
-- 
2.7.4