xserver: Branch 'master' - 2 commits

[Daniel Stone]

 hw/xfree86/common/xf86Xinput.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

New commits:
diff-tree 9a7aaeb3f6ff79af60fde91cd0575a54ba0b9587 (from 94361cbba7f866144691f6f5e9251a550e0e0cb8)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Mon May 28 13:54:16 2007 +0300

    XFree86: Input: Assume core events per default
    
    Assume that a device will be sending core events, unless explicitly
    specified otherwise.

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 5eede08..7a47276 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -119,10 +119,12 @@ _X_EXPORT void
 xf86ProcessCommonOptions(LocalDevicePtr local,
                          pointer	list)
 {
-    if (!xf86SetBoolOption(list, "AlwaysCore", 0) ||
-        xf86SetBoolOption(list, "SendCoreEvents", 0) ||
-        xf86SetBoolOption(list, "CorePointer", 0) ||
-        xf86SetBoolOption(list, "CoreKeyboard", 0)) {
+    if (xf86SetBoolOption(list, "AlwaysCore", 0) ||
+        !xf86SetBoolOption(list, "SendCoreEvents", 1) ||
+        !xf86SetBoolOption(list, "CorePointer", 1) ||
+        !xf86SetBoolOption(list, "CoreKeyboard", 1)) {
+        xf86Msg(X_CONFIG, "%s: doesn't report core events\n", local->name);
+    } else {
         local->flags |= XI86_ALWAYS_CORE;
         xf86Msg(X_CONFIG, "%s: always reports core events\n", local->name);
     }
diff-tree 94361cbba7f866144691f6f5e9251a550e0e0cb8 (from e5ce982381c4092252d6b55fcefcc9a3cd21e656)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Mon May 28 13:54:47 2007 +0300

    XFree86: Input: Perform case-insensitive comparisons on option names

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 2d0a376..5eede08 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -329,7 +329,7 @@ NewInputDeviceRequest (InputOption *opti
         return BadAlloc;
 
     for (option = options; option; option = option->next) {
-        if (strcmp(option->key, "driver") == 0) {
+        if (strcasecmp(option->key, "driver") == 0) {
             if (idev->driver) {
                 rval = BadRequest;
                 goto unwind;
@@ -352,8 +352,8 @@ NewInputDeviceRequest (InputOption *opti
                 goto unwind;
             }
         }
-        if (strcmp(option->key, "name") == 0 ||
-            strcmp(option->key, "identifier") == 0) {
+        if (strcasecmp(option->key, "name") == 0 ||
+            strcasecmp(option->key, "identifier") == 0) {
             if (idev->identifier) {
                 rval = BadRequest;
                 goto unwind;