[Xquartz-changes] xserver: Branch 'master' - 3 commits

[Jeremy Huddleston]

Rebased ref, commits from common ancestor:
commit a34812b09000db2ff2a1dc6182602839123edd4e
Author: Benjamin Tissoires <tissoire at cena.fr>
Date:   Mon Feb 8 13:50:43 2010 +0100

    Add labels for multitouch valuators
    
    Thoses definitions have been included in the kernel but the X server is not updated accordingly.
    Without these definitions, the multitouch axes are not correctly labelled.
    
    Signed-off-by: Benjamin Tissoires <tissoire at cena.fr>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index ea66c54..be07831 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -93,6 +93,17 @@ static struct dev_properties
     {0, AXIS_LABEL_PROP_ABS_TILT_Y},
     {0, AXIS_LABEL_PROP_ABS_TOOL_WIDTH},
     {0, AXIS_LABEL_PROP_ABS_VOLUME},
+    {0, AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR},
+    {0, AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR},
+    {0, AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR},
+    {0, AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR},
+    {0, AXIS_LABEL_PROP_ABS_MT_ORIENTATION},
+    {0, AXIS_LABEL_PROP_ABS_MT_POSITION_X},
+    {0, AXIS_LABEL_PROP_ABS_MT_POSITION_Y},
+    {0, AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE},
+    {0, AXIS_LABEL_PROP_ABS_MT_BLOB_ID},
+    {0, AXIS_LABEL_PROP_ABS_MT_TRACKING_ID},
+    {0, AXIS_LABEL_PROP_ABS_MT_PRESSURE},
     {0, AXIS_LABEL_PROP_ABS_MISC},
 
     {0, BTN_LABEL_PROP},
diff --git a/include/xserver-properties.h b/include/xserver-properties.h
index 626d0ad..30e8efb 100644
--- a/include/xserver-properties.h
+++ b/include/xserver-properties.h
@@ -89,6 +89,17 @@
 #define AXIS_LABEL_PROP_ABS_TILT_Y      "Abs Tilt Y"
 #define AXIS_LABEL_PROP_ABS_TOOL_WIDTH  "Abs Tool Width"
 #define AXIS_LABEL_PROP_ABS_VOLUME      "Abs Volume"
+#define AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR "Abs MT Touch Major"
+#define AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR "Abs MT Touch Minor"
+#define AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR "Abs MT Width Major"
+#define AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR "Abs MT Width Minor"
+#define AXIS_LABEL_PROP_ABS_MT_ORIENTATION "Abs MT Orientation"
+#define AXIS_LABEL_PROP_ABS_MT_POSITION_X  "Abs MT Position X"
+#define AXIS_LABEL_PROP_ABS_MT_POSITION_Y  "Abs MT Position Y"
+#define AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE   "Abs MT Tool Type"
+#define AXIS_LABEL_PROP_ABS_MT_BLOB_ID     "Abs MT Blob ID"
+#define AXIS_LABEL_PROP_ABS_MT_TRACKING_ID "Abs MT Tracking ID"
+#define AXIS_LABEL_PROP_ABS_MT_PRESSURE    "Abs MT Pressure"
 #define AXIS_LABEL_PROP_ABS_MISC        "Abs Misc"
 
 /* Button names */
commit 901c4ebf620579c5bb951a8c003430d967ecf2ff
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon Jan 11 00:31:27 2010 +0000

    main: move config_init() after InitInput()
    
    With the udev backend, config_init() calls NewInputDeviceRequest(),
    which enables devices.  They can then start sending events, even though
    the event queue is only initialized later in InitInput().  Oops.
    
    Debian bug#564256 <http://bugs.debian.org/564256>
    
    Reported-by: Sedat Dilek <sedat.dilek at googlemail.com>
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Tested-by: Sedat Dilek <sedat.dilek at googlemail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/main.c b/dix/main.c
index d4db90c..da910fe 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -255,9 +255,9 @@ int main(int argc, char *argv[], char *envp[])
 	    InitRootWindow(WindowTable[i]);
 
         InitCoreDevices();
-        config_init();
 	InitInput(argc, argv);
 	InitAndStartDevices();
+	config_init();
 
 	dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
commit 7f648777680b9dea31c4adb657e205fc6880d98b
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Thu Jan 14 16:42:16 2010 +1000

    Don't use AC_CHECK_FILE for fontpath checks when cross compiling
    
    AC_CHECK_FILE chokes when cross compiling, so instead we set the default
    to the standard FONTROOTDIR directories in that case.
    
    Signed-off-by: Dan Nicholson<dbn.lists at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index ec9442b..a1e8a1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -504,19 +504,23 @@ XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi)
 XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)
 
 dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
-dnl otherwise uses standard subdirectories of FONTROOTDIR
-AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
-	[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
-	[
-		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
-		case $host_os in
-			darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
-		esac
-	])
+dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
+dnl compiling, assume default font path uses standard FONTROOTDIR directories.
+DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
+if test "$cross_compiling" != yes; then
+	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
+		[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
+		[case $host_os in
+			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+		esac])
+fi
 AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
 				[ FONTPATH="$withval" ],
 				[ FONTPATH="${DEFAULT_FONT_PATH}" ])
 
+AC_MSG_CHECKING([for default font path])
+AC_MSG_RESULT([$FONTPATH])
+
 AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
 				[ XKBPATH="$withval" ],
 				[ XKBPATH="${datadir}/X11/xkb" ])