xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 hw/xfree86/os-support/linux/lnx_init.c |    2 +-
 xkb/xkbAccessX.c                       |   12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 4650e6ebe6e3ea48a026ace60b25daa165580467
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Sep 14 12:00:18 2009 +1000

    xkb: drop key presses for already repeating keys. (#23889)
    
    The event sequence for continuously pressed keys with the keyboard driver is
    PRESS - PRESS - PRESS - ... - RELEASE.
    The first press sets the repeatKey to the keycode and the matching timer.
    The second press (on the same keycode) can be silently dropped instead of
    overwriting the timer again.
    
    X.Org Bug 23889 <http://bugs.freedesktop.org/show_bug.cgi?id=23889>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Acked-by: Daniel Stone <daniel at fooishbar.org>

diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 47023c0..fd30a1c 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -524,10 +524,14 @@ KeySym *	sym = XkbKeySymsPtr(xkbi->desc,key);
 	    if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,key)) {
 		if (xkbDebugFlags&0x10)
 		    DebugF("Starting software autorepeat...\n");
-		xkbi->repeatKey = key;
-		xkbi->repeatKeyTimer= TimerSet(xkbi->repeatKeyTimer,
-					0, ctrls->repeat_delay,
-					AccessXRepeatKeyExpire, (pointer)keybd);
+		if (xkbi->repeatKey == key)
+		    ignoreKeyEvent = TRUE;
+		else {
+		    xkbi->repeatKey = key;
+		    xkbi->repeatKeyTimer= TimerSet(xkbi->repeatKeyTimer,
+			    0, ctrls->repeat_delay,
+			    AccessXRepeatKeyExpire, (pointer)keybd);
+		}
 	    }
 	}
     }
commit c626a5578aa16c17ef68c1b15ed53828080d9d90
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sun Sep 13 17:35:51 2009 +1000

    xfree86: fix VT_WAITACTIVE control flow (#11477)
    
    Move misplaced } to get the flow of
    
    if (!ShareVTs)  {
       VT_ACTIVATE
       VT_WAITACTIVE
    }
    
    X.Org Bug 11477 <http://bugs.freedesktop.org/show_bug.cgi?id=11477>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Acked-by: Daniel Stone <daniel at fooishbar.org>

diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index 5a6db80..f84c614 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -296,11 +296,11 @@ xf86OpenConsole(void)
 	    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0)
 	        xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed %s\n",
 		        strerror(errno));
-        }
 
 	    if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
 	        xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed %s\n",
 		        strerror(errno));
+        }
     }
     return;
 }