xserver-xorg-input-keyboard: Changes to 'upstream-unstable'

[Drew Parsons <dparsons@alioth.debian.org>]

 src/kbd.c |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 36cf953910002a00a3694033d49c6c38319b0283
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Jun 13 23:02:58 2007 +1000

    Keep module version up-to-date using PACKAGE_VERSION_*

diff --git a/src/kbd.c b/src/kbd.c
index 24fe6f6..c1daa4b 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -849,7 +849,7 @@ static XF86ModuleVersionInfo xf86KbdVersionRec =
     MODINFOSTRING1,
     MODINFOSTRING2,
     XORG_VERSION_CURRENT,
-    1, 1, 0,
+    PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,
     MOD_CLASS_XINPUT,

commit 05dd89ef03cee6853e7c2db518b6b22785cc3e7c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Mon Feb 5 14:29:54 2007 -0800

    Fix key led update
    
    Cf: https://bugs.freedesktop.org/show_bug.cgi?id=313
        https://bugs.freedesktop.org/attachment.cgi?id=8396&action=view
    
     ------- Comment  #8 From Samuel Thibault  2007-01-14 14:28:16  [reply] -------
    
    Created an attachment (id=8396) [details]
    fix key led update
    
    Ok, found the problem: when XKB is used (!pKbd->noXkb), pKbd->keyLeds is not
    updated, so that UpdateLeds(), even if it called at the right places, actually
    just clears all LEDs.  Here is a patch.

diff --git a/src/kbd.c b/src/kbd.c
index 7d402d5..24fe6f6 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -383,7 +383,22 @@ KbdCtrl( DeviceIntPtr device, KeybdCtrl *ctrl)
    InputInfoPtr pInfo = (InputInfoPtr) device->public.devicePrivate;
    KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
 
-   if ( ctrl->leds & XCOMP ) {
+   if ( ctrl->leds & XLED1) {
+       pKbd->keyLeds |= CAPSFLAG;
+   } else {
+       pKbd->keyLeds &= ~CAPSFLAG;
+   }
+   if ( ctrl->leds & XLED2) {
+       pKbd->keyLeds |= NUMFLAG;
+   } else {
+       pKbd->keyLeds &= ~NUMFLAG;
+   }
+   if ( ctrl->leds & XLED3) {
+       pKbd->keyLeds |= SCROLLFLAG;
+   } else {
+       pKbd->keyLeds &= ~SCROLLFLAG;
+   }
+   if ( ctrl->leds & (XCOMP|XLED4) ) {
        pKbd->keyLeds |= COMPOSEFLAG;
    } else {
        pKbd->keyLeds &= ~COMPOSEFLAG;