Source Mage code commit list

[Robin Cook <scm AT sourcemage.org>]

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

 xorg-xserver/xorg-server/HISTORY           |    4 ++
 xorg-xserver/xorg-server/PRE_BUILD         |    3 +-
 xorg-xserver/xorg-server/evdev-flush.patch |   42 
+++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit 5f355559324bcc0baf5120acfe2644fc44f700ba
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

    xorg-server: added patch to flush evdev input at start

diff --git a/xorg-xserver/xorg-server/HISTORY 
b/xorg-xserver/xorg-server/HISTORY
index fd7d84c..c777b0a 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,6 +1,10 @@
 2008-11-20 George Sherwood <gsherwood AT sourcemage.org>
        * CONFIGURE: Add option to use build builtin bitmap fonts
  
+2008-11-18 Robin Cook <rcook AT wyrms.net>
+       * PRE_BUILD: apply evdev patch to flush evdev keymap.
+         http://lists.freedesktop.org/archives/xorg/2008-November/040239.html
+
 2008-11-10 Eric Sandall <sandalle AT sourcemage.org>
        * FINAL: Add info for kbd/mouse drivers in 1.5.3
 
diff --git a/xorg-xserver/xorg-server/PRE_BUILD 
b/xorg-xserver/xorg-server/PRE_BUILD
index c45efe4..b915f04 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -1,5 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
-unpack_file 2
+unpack_file 2 &&
 
 #patch -p0 < "$SPELL_DIRECTORY/randr.patch"
+patch -p1 < "$SPELL_DIRECTORY/evdev-flush.patch"
diff --git a/xorg-xserver/xorg-server/evdev-flush.patch 
b/xorg-xserver/xorg-server/evdev-flush.patch
new file mode 100644
index 0000000..ccb526b
--- /dev/null
+++ b/xorg-xserver/xorg-server/evdev-flush.patch
@@ -0,0 +1,42 @@
+diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
+index 710e787..dacc3dc 100644
+--- a/hw/xfree86/common/xf86Xinput.c
++++ b/hw/xfree86/common/xf86Xinput.c
+@@ -423,6 +423,37 @@ NewInputDeviceRequest (InputOption *options, 
DeviceIntPtr *pdev)
+         (!is_auto || xf86Info.autoEnableDevices))
+         EnableDevice(dev);
+ 
++    /* XXX: The VCK always starts with built-in defaults for keymap. These
++     * defaults are different to the evdev ones. When the first key is hit 
on
++     * an extension device, the keymap is copied into the VCK's and any
++     * changes made at runtime to the VCK map are lost.
++     *
++     * Assumption: if we have at least one evdev keyboard device, we can
++     * ignore kbd devices. Force a SwitchCoreKeyboard so the VCK has the 
same
++     * keymap as we do.
++     *
++     * Next time we hit a key, we don't change the map over anymore (see
++     * SwitchCoreKeyboard), and live happily ever after.
++     * Until we have 2 physical keyboards. Or the first real keyboard isn't
++     * actually the one we use. Oh well.
++     *
++     */
++    if (dev->key)
++    {
++        InputInfoPtr info;
++
++        /* Search if there is one other keyboard that uses evdev. */
++        for (info = xf86InputDevs; info; info = info->next)
++        {
++            if (info != pInfo && info->dev && info->dev->key &&
++                (strcmp(info->drv->driverName, "evdev") == 0))
++                break;
++        }
++
++        if (!info)
++            SwitchCoreKeyboard(dev);
++    }
++
+     *pdev = dev;
+     return Success;
+