xserver: Branch 'master' - 3 commits

[Peter Hutterer]

 configure.ac                   |    4 +++-
 dix/devices.c                  |    2 ++
 hw/xfree86/common/xf86Xinput.c |   12 ++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 13ce7b98d48261b061da5768a6405bdbe9caa1fb
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Mon Dec 22 14:31:03 2008 -0800

    dmx: Require newer libXi for XQueryInputVersion
    
    Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index bee9cff..c7ae5e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1629,7 +1629,9 @@ AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
 
 dnl DMX DDX
 
-PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES], [have_dmx=yes], [have_dmx=no])
+PKG_CHECK_MODULES([DMXMODULES],
+    [xmuu xext x11 xrender xfixes xfont xi >= 1.2.99.1 dmxproto xau $XDMCP_MODULES],
+    [have_dmx=yes], [have_dmx=no])
 AC_MSG_CHECKING([whether to build Xdmx DDX])
 if test "x$DMX" = xauto; then
 	DMX="$have_dmx"
commit 27011254c4de4e573a0851bf46892fb488db6522
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 23 09:59:28 2008 +1000

    xfree86: If an input device failed to activate, return immediately.
    
    Devices are only activated once - right after they've been added to the
    server. If a device failes activation, it's dead. There's no reason to
    continue. Return the error code from ActivateDevice() without setting up
    sprite information or even sending a event to the client.
    
    Then - in the DDX - just remove the device again.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/devices.c b/dix/devices.c
index ff6f0ec..c51d9be 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -444,6 +444,8 @@ ActivateDevice(DeviceIntPtr dev)
 
     ret = (*dev->deviceProc) (dev, DEVICE_INIT);
     dev->inited = (ret == Success);
+    if (!dev->inited)
+        return ret;
 
     /* Initialize memory for sprites. */
     if (dev->isMaster && dev->spriteInfo->spriteOwner)
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index e39c087..e8acf39 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -546,7 +546,10 @@ xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev, BOOL enable)
     }
 
     dev = pInfo->dev;
-    ActivateDevice(dev);
+    rval = ActivateDevice(dev);
+    if (rval != Success)
+        goto unwind;
+
     /* Enable it if it's properly initialised and we're currently in the VT */
     if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)
     {
commit e1a3a1a0d85c9971aea65c2228b5fd4dbf3bf57a
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 23 10:00:34 2008 +1000

    xfree86: don't call CheckMotion if a device hasn't been enabled. #19176
    
    X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=19176>

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index fe62772..e39c087 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -549,10 +549,11 @@ xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev, BOOL enable)
     ActivateDevice(dev);
     /* Enable it if it's properly initialised and we're currently in the VT */
     if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)
+    {
         EnableDevice(dev);
-
-    /* send enter/leave event, update sprite window */
-    CheckMotion(NULL, dev);
+        /* send enter/leave event, update sprite window */
+        CheckMotion(NULL, dev);
+    }
 
     *pdev = dev;
     return Success;