xserver: Branch 'input-hotplug' - 3 commits

[Daniel Stone]

 GL/glx/glxext.c                |    1 +
 hw/xfree86/common/xf86Xinput.c |   32 +++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

New commits:
diff-tree ca3f4fc1b0c21a0620ab1eb35c199cd55d795095 (from e73e5e2a4d8f22889d840a7719479f9af686cb9c)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sun Jul 23 19:02:12 2006 -0400

    add fallback ChangeDeviceControl, allow XOpenDevice on closed device
    Add a fallback ChangeDeviceControl, which allows the attributes we know about
    so far.
    Allow XOpenDevice on closed devices.

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 3082e39..bcae3f0 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -288,18 +288,21 @@ OpenInputDevice(DeviceIntPtr	dev,
                 ClientPtr	client,
                 int		*status)
 {
-    if (!dev->inited) {
-        *status = BadDevice;
-    } else {
-        if (!dev->public.on) {
-            if (EnableDevice(dev)) {
-                /* to prevent ProcXOpenDevice to call EnableDevice again */
-                dev->startup = FALSE;
-            } else {
-                *status = BadDevice;
-            }
+    if (!dev->inited)
+        ActivateDevice(dev);
+
+    if (!dev->public.on) {
+        if (EnableDevice(dev)) {
+            dev->startup = FALSE;
+        }
+        else {
+            ErrorF("couldn't enable device %s\n", dev->name);
+            *status = BadDevice;
+            return;
         }
     }
+
+    *status = Success;
 }
 
 
@@ -530,7 +533,14 @@ ChangeDeviceControl (ClientPtr client, D
   LocalDevicePtr        local = (LocalDevicePtr)dev->public.devicePrivate;
 
   if (!local->control_proc) {
-      return (BadMatch);
+      switch (control->control) {
+      case DEVICE_CORE:
+      case DEVICE_RESOLUTION:
+      case DEVICE_TOUCHSCREEN:
+        return Success;
+      default:
+        return BadMatch;
+      }
   }
   else {
       return (*local->control_proc)(local, control);
diff-tree e73e5e2a4d8f22889d840a7719479f9af686cb9c (from parents)
Merge: a73cef1f005ca66db18e952e676ee5a21b829700 8977b07434d75ca396d236dc1324f0c862b633c7
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sat Jul 22 13:56:30 2006 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

diff-tree 8977b07434d75ca396d236dc1324f0c862b633c7 (from 70869fc6777f87cd05794446caa739e3d9a91ffe)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Jul 23 03:36:47 2006 +1000

    glx: fix typo from tag removal

diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 9879b34..8bbb83f 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -1,3 +1,4 @@
+/*
 ** The contents of this file are subject to the GLX Public License Version 1.0
 ** (the "License"). You may not use this file except in compliance with the
 ** License. You may obtain a copy of the License at Silicon Graphics, Inc.,