summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Dirsch <sndirsch@suse.de>2011-05-24 16:54:28 +0200
committerSergey V. Udaltsov <svu@gnome.org>2011-05-25 00:38:14 +0100
commit88a087588973ef6bdbf358b5e37230168d4acbcd (patch)
tree61a9f1721477fe15daaceaa0b6430d7a0b1415ac
parente5eb6f50085f6f7f836d65a828a7ecea715c0c7c (diff)
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>
-rw-r--r--keycodes/xfree865
-rw-r--r--symbols/inet4
2 files changed, 6 insertions, 3 deletions
diff --git a/keycodes/xfree86 b/keycodes/xfree86
index 821d1d90..0c910187 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 7ffa886e..b8f4d194 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 ] };
};