xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 configure.ac       |    6 +++++-
 dix/eventconvert.c |   12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 3b5bbb149d4c932d9624336f5cbe9fe71c87bea3
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Sep 23 12:32:44 2009 +1000

    configure: fix up tslib check once again.
    
    This patch addresses two issues:
    The check for HAVE_TSLIB = xauto can never be true, the check has been
    corrected to TSLIB = xauto.
    
    Pre-pkgconfig versions of tslib fail to be found, this patch restores the
    additional AC_CHECK_LIB. However, the pgk-config check must happen before
    AC_CHECK_LIB, as AC_CHECK_LIB does not seem to honour the LD_LIBRARY_PATH.
    Thus, if tslib is installed outside of the default paths, AC_CHECK_LIB
    fails.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Acked--by: Daniel Stone <daniel at fooishbar.org>

diff --git a/configure.ac b/configure.ac
index 4e38fc0..b3acbdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1861,7 +1861,11 @@ if test "$KDRIVE" = yes; then
 
 
     PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
-    if test "x$HAVE_TSLIB" = xauto; then
+    if test "x$HAVE_TSLIB" = xno; then
+        AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
+    fi
+
+    if test "xTSLIB" = xauto; then
         TSLIB="$HAVE_TSLIB"
     fi
 
commit 5402f18d9c3f7ba19cc05b3a814e3a9e94c8d551
Author: Thomas Jaeger <thjaeger at gmail.com>
Date:   Tue Sep 22 20:16:21 2009 -0400

    dix: report XI1 axis values correctly if first_valuator != 0
    
    Signed-off-by: Thomas Jaeger <ThJaeger at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index d91ba67..e25f3ee 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -352,17 +352,17 @@ getValuatorEvents(DeviceEvent *ev, deviceValuator *xv)
         xv->device_state = state;
         switch (xv->num_valuators) {
         case 6:
-            xv->valuator5 = ev->valuators.data[i + 5];
+            xv->valuator5 = ev->valuators.data[xv->first_valuator + 5];
         case 5:
-            xv->valuator4 = ev->valuators.data[i + 4];
+            xv->valuator4 = ev->valuators.data[xv->first_valuator + 4];
         case 4:
-            xv->valuator3 = ev->valuators.data[i + 3];
+            xv->valuator3 = ev->valuators.data[xv->first_valuator + 3];
         case 3:
-            xv->valuator2 = ev->valuators.data[i + 2];
+            xv->valuator2 = ev->valuators.data[xv->first_valuator + 2];
         case 2:
-            xv->valuator1 = ev->valuators.data[i + 1];
+            xv->valuator1 = ev->valuators.data[xv->first_valuator + 1];
         case 1:
-            xv->valuator0 = ev->valuators.data[i + 0];
+            xv->valuator0 = ev->valuators.data[xv->first_valuator + 0];
         }
 
         if (i + 6 < num_valuators)