svn merge ^/branches/released

4 files changed, 27 insertions, 1 deletions

diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in
index 109637115..84c78db54 100644
--- a/xorg-server/include/dix-config.h.in
+++ b/xorg-server/include/dix-config.h.in
@@ -231,6 +231,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the <fnmatch.h> header file. */
+#undef HAVE_FNMATCH_H
+
 /* Have /dev/urandom */
 #undef HAVE_URANDOM
 
@@ -396,6 +399,9 @@
 /* Support D-Bus */
 #undef HAVE_DBUS
 
+/* Use libudev for input hotplug */
+#undef CONFIG_UDEV
+
 /* Use D-Bus for input hotplug */
 #undef CONFIG_NEED_DBUS
 
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index cab91c8f5..0e4d89177 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -52,6 +52,7 @@ SOFTWARE.
 #include "screenint.h"

 #include <X11/Xmd.h>

 #include <X11/Xproto.h>

+#include <stdint.h>

 #include "window.h"     /* for WindowPtr */

 #include "xkbrules.h"

 #include "events.h"

@@ -210,6 +211,20 @@ typedef struct _InputOption {
     struct _InputOption *next;

 } InputOption;

 

+typedef struct _InputAttributes {

+    char                *product;

+    char                *vendor;

+    char                *device;

+    uint32_t            flags;

+} InputAttributes;

+

+#define ATTR_KEYBOARD (1<<0)

+#define ATTR_POINTER (1<<1)

+#define ATTR_JOYSTICK (1<<2)

+#define ATTR_TABLET (1<<3)

+#define ATTR_TOUCHPAD (1<<4)

+#define ATTR_TOUCHSCREEN (1<<5)

+

 /* Key has been run through all input processing and events sent to clients. */

 #define KEY_PROCESSED 1

 /* Key has not been fully processed, no events have been sent. */

@@ -516,6 +531,7 @@ void FixUpEventFromWindow(DeviceIntPtr pDev,
 /* Implemented by the DDX. */

 extern _X_EXPORT int NewInputDeviceRequest(

     InputOption *options,

+    InputAttributes *attrs,

     DeviceIntPtr *dev);

 extern  _X_EXPORT void DeleteInputDeviceRequest(

     DeviceIntPtr dev);

diff --git a/xorg-server/include/ptrveloc.h b/xorg-server/include/ptrveloc.h
index 2a4b40b19..676c46419 100644
--- a/xorg-server/include/ptrveloc.h
+++ b/xorg-server/include/ptrveloc.h
@@ -37,7 +37,8 @@
 #define AccelProfileSimple 4
 #define AccelProfilePower 5
 #define AccelProfileLinear 6
-#define AccelProfileLAST AccelProfileLinear
+#define AccelProfileSmoothLimited 7
+#define AccelProfileLAST AccelProfileSmoothLimited
 
 /* fwd */
 struct _DeviceVelocityRec;
diff --git a/xorg-server/include/xorg-config.h.in b/xorg-server/include/xorg-config.h.in
index 9fe7cdef5..8946a6538 100644
--- a/xorg-server/include/xorg-config.h.in
+++ b/xorg-server/include/xorg-config.h.in
@@ -36,6 +36,9 @@
 /* Path to configuration file. */
 #undef __XCONFIGFILE__
 
+/* Name of configuration directory. */
+#undef __XCONFIGDIR__
+
 /* Path to loadable modules. */
 #undef DEFAULT_MODULE_PATH