xserver: Branch 'mpx'

[Peter Hutterer]

 xkb/xkbPrKeyEv.c |    8 ++++++++
 1 files changed, 8 insertions(+)

New commits:
diff-tree c4e850a781e3b85631cb386d24efcca2a835d4c9 (from 4d5df14f2c4a3108a8c8adfcf4766c0d1a9daad2)
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Mon Jun 25 13:38:25 2007 +0930

    Quickfix to stop core key events from doubling up.

diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 81124bc..02f3c35 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -69,6 +69,13 @@ unsigned        ndx;
     /* below XKB, such as a key that physically locks.   XKB does not   */
     /* do anything to implement the behavior, but it *does* report that */
     /* key is hardwired */
+
+    /* FIXME: this is bad. The down mask is set during ProcessOtherEvent. When
+     * we start processing the core event (and eventually arrive here), the
+     * down mask is already set and Xkb thinks it's a repeat event. We just
+     * silently ignore it for now.
+     */
+#if 0
     if ((behavior.type&XkbKB_Permanent)==0) {
 	switch (behavior.type) {
 	    case XkbKB_Default:
@@ -153,6 +160,7 @@ unsigned        ndx;
 		break;
 	}
     }
+#endif
     XkbHandleActions(keybd,keybd,xE,count);
     return;
 }