xserver: Branch 'server-1.5-branch' - 4 commits

[Peter Hutterer]

 Xi/chgdctl.c                   |    2 +-
 configure.ac                   |    2 +-
 hw/xfree86/common/xf86Config.c |   17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit b6024da70404fe1879f1de079e69611fea45a40e
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Jul 29 10:00:01 2008 +0930

    Xi: ChangeDeviceControl presence events should set the appropriate devchange.
    
    Requires inputproto 1.4.4 or higher.
    (cherry picked from commit 591ef3c047ab3597fef9d687205e99c254ff2040)

diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index 89410d6..8df40fe 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -287,7 +287,7 @@ out:
     if (ret == Success) {
         dpn.type = DevicePresenceNotify;
         dpn.time = currentTime.milliseconds;
-        dpn.devchange = 1;
+        dpn.devchange = DeviceControlChanged;
         dpn.deviceid = dev->id;
         dpn.control = stuff->control;
         SendEventToAllWindows(dev, DevicePresenceNotifyMask,
commit da29a25315b5dc0df4f6e221cf81587efffce4c6
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Jul 29 10:04:24 2008 +0930

    Require inputproto 1.4.4
    
    for DeviceControlChanged define.

diff --git a/configure.ac b/configure.ac
index 2a8ef8d..4bf86b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -662,7 +662,7 @@ else
 	RENDERPROTO="renderproto"
 fi
 
-REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]"
+REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.4] [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.9.5]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
commit d199d800a41f8a6ba044c3f8a3777dec7881e89a
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jul 24 12:12:45 2008 +0930

    xfree86: warn some more about potential missing input devices.
    
    Put out a warning if xorg.conf has InputDevice sections, but these aren't
    referenced in the used ServerLayout. This is only performed if AllowEmptyInput
    is enabled.
    The reason behind this is that the server used to auto-add the first
    mouse/keyboard sections if none where referenced. Now, with HAL and AEI
    enabled by default, setups that relied on this auto-adding break and are left
    without input devices. The least we can do is warn them.
    (cherry picked from commit 47160edec7f0d9129576d83f1593a5549879a893)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 1052e21..3021cb7 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -2466,6 +2466,16 @@ checkInput(serverLayoutPtr layout) {
                 "\tThe server relies on HAL to provide the list of input "
                 "devices.\n\tIf no devices become available, reconfigure "
                 "HAL.\n");
+        if (!layout->inputs || !*layout->inputs)
+        {
+            /* No input device specified in ServerLayout. */
+            if (xf86configptr->conf_input_lst &&
+                    xf86configptr->conf_input_lst->inp_identifier)
+                xf86Msg(X_WARNING, "Input devices specified in xorg.conf, but"
+                        " not referenced in ServerLayout.\n\tThese devices"
+                        " will NOT be available.\n");
+        }
+
     }
 }
 
commit 538942cc65b5a112739fb94e57b3be963cf50873
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jul 24 09:56:00 2008 +0930

    xfree86: if AllowEmptyInput is on, warn the user that we rely on HAL now.
    (cherry picked from commit f30b0823dbfc5902e54b337b5b6b570ebf216584)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index fde3a9c..1052e21 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -2460,6 +2460,13 @@ static void
 checkInput(serverLayoutPtr layout) {
     if (!xf86Info.allowEmptyInput)
         checkCoreInputDevices(layout, FALSE);
+    else
+    {
+        xf86Msg(X_INFO, "AllowEmptyInput is on.\n"
+                "\tThe server relies on HAL to provide the list of input "
+                "devices.\n\tIf no devices become available, reconfigure "
+                "HAL.\n");
+    }
 }
 
 /*