svn merge ^/branches/released

5 files changed, 57 insertions, 2 deletions

diff --git a/xorg-server/include/Makefile.in b/xorg-server/include/Makefile.in
index 1420c30ed..3fe3a0519 100644
--- a/xorg-server/include/Makefile.in
+++ b/xorg-server/include/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -274,8 +274,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -335,6 +338,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 0e4d89177..52736e498 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -215,6 +215,7 @@ typedef struct _InputAttributes {
     char                *product;

     char                *vendor;

     char                *device;

+    char                **tags; /* null-terminated */

     uint32_t            flags;

 } InputAttributes;

 

diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index a2109e63a..1cdb38fc4 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -210,6 +210,9 @@ pad_to_int32(const int bytes) {
     return (((bytes) + 3) & ~3);
 }
 
+extern char**
+xstrtokenize(const char *str, const char* separators);
+
 /* some macros to help swap requests, replies, and events */
 
 #define LengthRestB(stuff) \
diff --git a/xorg-server/include/xwin-config.h b/xorg-server/include/xwin-config.h
new file mode 100644
index 000000000..645a6cead
--- /dev/null
+++ b/xorg-server/include/xwin-config.h
@@ -0,0 +1,37 @@
+/*
+ * xwin-config.h.in
+ *
+ * This file has all defines used in the xwin ddx
+ *
+ */
+#include <dix-config.h>
+
+/* Winsock networking */
+#define HAS_WINSOCK
+
+/* Cygwin has /dev/windows for signaling new win32 messages */
+// let's should this for now #define HAS_DEVWINDOWS 1
+
+/* Switch on debug messages */ 
+/* #undef CYGDEBUG */
+/* #undef CYGWINDOWING_DEBUG */
+/* #undef CYGMULTIWINDOW_DEBUG */
+
+/* Define to 1 if unsigned long is 64 bits. */
+/* #undef _XSERVER64 */
+
+/* Do we require our own snprintf? */
+/* #undef NEED_SNPRINTF */
+
+/* Short vendor name */
+#define XVENDORNAMESHORT "VcXsrv"
+
+/* Vendor web address for support */
+#define __VENDORDWEBSUPPORT__ "http://www.hc-consult.be/"
+
+/* Default log location */
+#define DEFAULT_LOGDIR "."
+
+/* Location of system.XWinrc */
+#define SYSCONFDIR "."
+
diff --git a/xorg-server/include/xwin-config.h.in b/xorg-server/include/xwin-config.h.in
index c8de11073..21ceb29cf 100644
--- a/xorg-server/include/xwin-config.h.in
+++ b/xorg-server/include/xwin-config.h.in
@@ -12,7 +12,7 @@
 /* Cygwin has /dev/windows for signaling new win32 messages */
 #undef HAS_DEVWINDOWS
 
-/* Switch on debug messages */ 
+/* Switch on debug messages */
 #undef CYGDEBUG
 #undef CYGWINDOWING_DEBUG
 #undef CYGMULTIWINDOW_DEBUG
@@ -22,3 +22,13 @@
 
 /* Do we require our own snprintf? */
 #undef NEED_SNPRINTF
+
+/* Short vendor name */
+#undef XVENDORNAMESHORT
+
+/* Vendor web address for support */
+#undef __VENDORDWEBSUPPORT__
+
+/* Location of system.XWinrc */
+#undef SYSCONFDIR
+