Merge lp:~oif-packaging/frame/ubuntu.v1.1.0 into lp:frame/ubuntu

[Henrik Rydberg]

This package contains upgrade to v1.1.0, containing abi-compatible api extentions needed for development during natty. All current code compiles well with this package. A built package is available in ppa:utouch-team/unstable.

[Chase Douglas (chasedouglas)]

Looks good to me.

review: Approve

[lp:~oif-packaging/frame/ubuntu.v1.1.0]

18. By Henrik Rydberg on 2011-02-23

Updating symbols file with api additions

[Henrik Rydberg (rydberg)]

The new symbols compiled fine, so merged.

=== modified file 'ChangeLog'
--- ChangeLog	2010-12-30 19:26:42 +0000
+++ ChangeLog	2011-02-23 14:02:38 +0000
@@ -1,5 +1,214 @@
 ------------------------------------------------------------
+revno: 24
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Wed 2011-02-23 12:37:53 +0100
+message:
+  Release version 1.1.0
+  
+  With this release, the (ABI-stable) API additions are official.
+------------------------------------------------------------
+revno: 23
+tags: v1.0.4
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Wed 2011-02-23 12:06:36 +0100
+message:
+  Bump to version 1.0.4
+------------------------------------------------------------
+revno: 22
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Wed 2011-02-23 12:06:09 +0100
+message:
+  Add missing manpage source to tarball
+  
+  The .txt files where missing from the tarball, such that the
+  manpage could not be regenerated.
+------------------------------------------------------------
+revno: 21
+tags: v1.0.3
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Wed 2011-02-23 11:03:51 +0100
+message:
+  Bump to version 1.0.3
+------------------------------------------------------------
+revno: 20
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Wed 2011-02-23 11:03:28 +0100
+message:
+  Ignore generated xi2 binary and manpage
+------------------------------------------------------------
+revno: 19
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Wed 2011-02-23 11:02:52 +0100
+message:
+  Generate manpage also for the optional xi2 configuration
+------------------------------------------------------------
+revno: 18
+tags: v1.0.2
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-22 16:32:16 +0100
+message:
+  Bump to version 1.0.2
+------------------------------------------------------------
+revno: 17
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-22 16:32:00 +0100
+message:
+  Disable time-dependent filtering for current XI2.1
+  
+  Velocity-adjusted positioning and Kalman filters depend on accurate
+  time stamps on events. Until we have device event times, disable this
+  functionality for XI2.1
+------------------------------------------------------------
+revno: 16
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-22 15:53:42 +0100
+message:
+  Fix ABS_MT_DISTANCE compilation conditional
+  
+  The ABS_MT_DISTANCE is new, and the corresponding entry in
+  xserver-properties.h is even newer. Make compilation conditional on
+  the existence of those two defines.
+------------------------------------------------------------
+revno: 15
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-22 15:53:21 +0100
+message:
+  Simplify XInput package test
+  
+  The XI2.1 support is present in sufficiently recent xinput packages,
+  so simplify the testing accordingly.
+------------------------------------------------------------
+revno: 14
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Mon 2011-02-21 13:16:19 +0100
+message:
+  Adjust to xi2 api changes
+  
+  The touch event types have new names since February 2011. Modify
+  accordingly.
+------------------------------------------------------------
+revno: 13
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Mon 2011-02-21 13:16:00 +0100
+message:
+  Add functions to extract number of frames and slots
+------------------------------------------------------------
+revno: 12
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Mon 2011-02-21 13:15:30 +0100
+message:
+  Add velocity estimate
+  
+  The per-touch velocity is useful in many contexts. This patch
+  adds a simple estimator of the velocity, which also smooths out
+  position jumps caused by course-grained event updates.
+------------------------------------------------------------
+revno: 11
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Mon 2011-02-21 13:15:13 +0100
+message:
+  Break out common display functions
+------------------------------------------------------------
+revno: 10
+tags: v1.0.1
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-15 15:06:12 +0100
+message:
+  Bump to v1.0.1
+------------------------------------------------------------
+revno: 9
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-15 15:01:51 +0100
+message:
+  Optional XI2.1 support
+  
+  This patchs adds optional XI2.1 support to utouch-frame. The
+  utouch/frame-xi2.h header contains helper functions equivalent
+  to utouch/frame-mtdev.h. In addition, the device-to-screen mapping
+  is handled via XEvents and optionally XIPropertyEvent. The latter
+  allows free device placement via xinput set-prop, useful in multi-
+  head setups, thanks to Chase Douglas. Touch frame events can be tested
+  using the utouch-frame-test-xi2 tool. Use --with-xi to enable.
+------------------------------------------------------------
+revno: 8
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-15 15:01:01 +0100
+message:
+  Fix makefile oops
+------------------------------------------------------------
+revno: 7
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-15 15:00:42 +0100
+message:
+  Add set slot by touch id utility
+------------------------------------------------------------
+revno: 6
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-15 15:00:12 +0100
+message:
+  Map device coordinates onto target surface
+  
+  The current implementation outputs most touch attributes in device
+  coordinates. However, the primary use case is to map the input device
+  onto an area on the screen, needed in particular for multihead setups.
+  Moreover, the XI2.1 backend works with screen coordinates, creating
+  an unnecessary discrepancy between backends. This patch adds the basic
+  transformation layer to the utouch surface, thus serving as the master
+  point of device-to-surface mapping.
+------------------------------------------------------------
+revno: 5
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-15 14:59:40 +0100
+message:
+  Add C++ header integration
+------------------------------------------------------------
+revno: 4
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-08 19:28:09 +0100
+message:
+  Display device properties based on utouch surface instead
+  
+  The current code erroneously extracts the device properties from
+  the evemu device, when there is a utouch surface structure to read
+  from. Remedied.
+------------------------------------------------------------
+revno: 3
+committer: Henrik Rydberg <[e-mail]>
+branch nick: trunk
+timestamp: Tue 2011-02-08 19:24:27 +0100
+message:
+  Setup device properties based on udev heuristic for non-property devices
+------------------------------------------------------------
+revno: 2 [merge]
+committer: Stephen M. Webb <[e-mail]>
+branch nick: utouch-frame
+timestamp: Thu 2011-02-03 13:39:08 -0500
+message:
+  Changes required for uploading into Ubuntu.
+------------------------------------------------------------
 revno: 1
+tags: v1.0.0
 committer: Henrik Rydberg <[e-mail]>
 branch nick: trunk
 timestamp: Thu 2010-12-30 20:23:24 +0100
@@ -7,3 +216,5 @@
   Initial load of utouch-frame
   
   Compiles and runs on mtdev. ABI proof.
+------------------------------------------------------------
+Use --include-merges or -n0 to see merged revisions.

=== modified file 'Makefile.in'
--- Makefile.in	2010-12-30 19:26:42 +0000
+++ Makefile.in	2011-02-23 14:02:38 +0000
@@ -130,6 +130,7 @@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+ASCIIDOC = @ASCIIDOC@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -195,6 +196,8 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+XINPUT_CFLAGS = @XINPUT_CFLAGS@
+XINPUT_LIBS = @XINPUT_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

=== modified file 'configure'
--- configure	2011-02-03 19:22:55 +0000
+++ configure	2011-02-23 14:02:38 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Touch Frame Library 1.0.0.
+# Generated by GNU Autoconf 2.67 for Touch Frame Library 1.1.0.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='Touch Frame Library'
 PACKAGE_TARNAME='utouch-frame'
-PACKAGE_VERSION='1.0.0'
-PACKAGE_STRING='Touch Frame Library 1.0.0'
+PACKAGE_VERSION='1.1.0'
+PACKAGE_STRING='Touch Frame Library 1.1.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -747,6 +747,10 @@
 HAVE_DOCTOOLS_FALSE
 HAVE_DOCTOOLS_TRUE
 ASCIIDOC
+XINPUT_LIBS
+XINPUT_CFLAGS
+HAVE_XI_FALSE
+HAVE_XI_TRUE
 EVEMU_LIBS
 EVEMU_CFLAGS
 MTDEV_LIBS
@@ -874,6 +878,7 @@
 enable_dependency_tracking
 with_gnu_ld
 enable_libtool_lock
+with_xi
 '
       ac_precious_vars='build_alias
 host_alias
@@ -890,7 +895,9 @@
 MTDEV_CFLAGS
 MTDEV_LIBS
 EVEMU_CFLAGS
-EVEMU_LIBS'
+EVEMU_LIBS
+XINPUT_CFLAGS
+XINPUT_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1433,7 +1440,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Touch Frame Library 1.0.0 to adapt to many kinds of systems.
+\`configure' configures Touch Frame Library 1.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1503,7 +1510,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Touch Frame Library 1.0.0:";;
+     short | recursive ) echo "Configuration of Touch Frame Library 1.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1527,6 +1534,7 @@
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-xi               Build with XI2.1 support
 
 Some influential environment variables:
   CC          C compiler command
@@ -1548,6 +1556,9 @@
   EVEMU_CFLAGS
               C compiler flags for EVEMU, overriding pkg-config
   EVEMU_LIBS  linker flags for EVEMU, overriding pkg-config
+  XINPUT_CFLAGS
+              C compiler flags for XINPUT, overriding pkg-config
+  XINPUT_LIBS linker flags for XINPUT, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1615,7 +1626,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Touch Frame Library configure 1.0.0
+Touch Frame Library configure 1.1.0
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1893,7 +1904,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Touch Frame Library $as_me 1.0.0, which was
+It was created by Touch Frame Library $as_me 1.1.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2713,7 +2724,7 @@
 
 # Define the identity of the package.
  PACKAGE='utouch-frame'
- VERSION='1.0.0'
+ VERSION='1.1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2777,7 +2788,7 @@
 
 
 
-LIB_VERSION=1:0:0
+LIB_VERSION=2:0:1
 
 
 # Initialize libtool
@@ -4440,13 +4451,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4443: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4454: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4446: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4457: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4449: output\"" >&5)
+  (eval echo "\"\$as_me:4460: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5652,7 +5663,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5655 "configure"' > conftest.$ac_ext
+  echo '#line 5666 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7177,11 +7188,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7180: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7191: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7184: \$? = $ac_status" >&5
+   echo "$as_me:7195: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7516,11 +7527,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7519: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7530: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7523: \$? = $ac_status" >&5
+   echo "$as_me:7534: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7621,11 +7632,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7624: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7635: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7628: \$? = $ac_status" >&5
+   echo "$as_me:7639: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7676,11 +7687,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7679: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7690: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7683: \$? = $ac_status" >&5
+   echo "$as_me:7694: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10060,7 +10071,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10063 "configure"
+#line 10074 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10156,7 +10167,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10159 "configure"
+#line 10170 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11352,6 +11363,115 @@
 
 fi
 
+
+# Check whether --with-xi was given.
+if test "${with_xi+set}" = set; then :
+  withval=$with_xi;
+fi
+
+ if test "x$with_xi" != "x"; then
+  HAVE_XI_TRUE=
+  HAVE_XI_FALSE='#'
+else
+  HAVE_XI_TRUE='#'
+  HAVE_XI_FALSE=
+fi
+
+
+if test "x$with_xi" = "xyes"; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINPUT" >&5
+$as_echo_n "checking for XINPUT... " >&6; }
+
+if test -n "$XINPUT_CFLAGS"; then
+    pkg_cv_XINPUT_CFLAGS="$XINPUT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_XINPUT_CFLAGS=`$PKG_CONFIG --cflags "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$XINPUT_LIBS"; then
+    pkg_cv_XINPUT_LIBS="$XINPUT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_XINPUT_LIBS=`$PKG_CONFIG --libs "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>&1`
+        else
+	        XINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$XINPUT_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (x11 xext xi >= 1.4.1.99.1 inputproto >= 2.0.99.1) were not met:
+
+$XINPUT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XINPUT_CFLAGS
+and XINPUT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XINPUT_CFLAGS
+and XINPUT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+	XINPUT_CFLAGS=$pkg_cv_XINPUT_CFLAGS
+	XINPUT_LIBS=$pkg_cv_XINPUT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+fi
+
 # Extract the first word of "a2x", so it can be a program name with args.
 set dummy a2x; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -11526,6 +11646,10 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_XI_TRUE}" && test -z "${HAVE_XI_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_XI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_DOCTOOLS_TRUE}" && test -z "${HAVE_DOCTOOLS_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_DOCTOOLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -11938,7 +12062,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Touch Frame Library $as_me 1.0.0, which was
+This file was extended by Touch Frame Library $as_me 1.1.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12004,7 +12128,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Touch Frame Library config.status 1.0.0
+Touch Frame Library config.status 1.1.0
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-02-03 19:22:55 +0000
+++ configure.ac	2011-02-23 14:02:38 +0000
@@ -1,7 +1,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([Touch Frame Library],
-        [1.0.0],
+        [1.1.0],
         [],
         [utouch-frame])
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -12,7 +12,7 @@
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-LIB_VERSION=1:0:0
+LIB_VERSION=2:0:1
 AC_SUBST([LIB_VERSION])
 
 # Initialize libtool
@@ -25,6 +25,13 @@
 PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
 PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0])
 
+AC_ARG_WITH([xi], AS_HELP_STRING([--with-xi], [Build with XI2.1 support]))
+AM_CONDITIONAL([HAVE_XI], [test "x$with_xi" != "x"])
+
+AS_IF([test "x$with_xi" = "xyes"], [
+   PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.4.1.99.1] [inputproto >= 2.0.99.1])
+])
+ 
 AC_CHECK_PROG([ASCIIDOC], [a2x], [a2x])
 AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$ASCIIDOC" != "x"])
 AS_IF([test "x$ASCIIDOC" = "x"],

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-22 13:45:55 +0000
+++ debian/changelog	2011-02-23 14:02:38 +0000
@@ -1,3 +1,10 @@
+utouch-frame (1.1.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Updating symbols file with api additions
+
+ -- Henrik Rydberg <[e-mail]>  Wed, 23 Feb 2011 14:58:31 +0100
+
 utouch-frame (1.0.0-0ubuntu3) natty; urgency=low
 
   * Restore udeb support.  utouch-grail is in some d-i initrds, depends on

=== modified file 'debian/libutouch-frame1.symbols'
--- debian/libutouch-frame1.symbols	2010-12-30 19:27:04 +0000
+++ debian/libutouch-frame1.symbols	2011-02-23 14:02:38 +0000
@@ -1,11 +1,14 @@
 libutouch-frame.so.1 libutouch-frame1 #MINVER#
  utouch_frame_delete_engine@Base 1.0.0
  utouch_frame_get_current_slot@Base 1.0.0
+ utouch_frame_get_num_frames@Base 1.1.0
+ utouch_frame_get_num_slots@Base 1.1.0
  utouch_frame_get_surface@Base 1.0.0
  utouch_frame_get_version@Base 1.0.0
  utouch_frame_init_mtdev@Base 1.0.0
  utouch_frame_is_supported_mtdev@Base 1.0.0
  utouch_frame_new_engine_raw@Base 1.0.0
  utouch_frame_pump_mtdev@Base 1.0.0
+ utouch_frame_set_current_id@Base 1.1.0
  utouch_frame_set_current_slot@Base 1.0.0
  utouch_frame_sync@Base 1.0.0

=== modified file 'include/utouch/frame-mtdev.h'
--- include/utouch/frame-mtdev.h	2010-12-30 19:26:42 +0000
+++ include/utouch/frame-mtdev.h	2011-02-23 14:02:38 +0000
@@ -22,6 +22,10 @@
 #ifndef _UTOUCH_FRAME_MTDEV_H
 #define _UTOUCH_FRAME_MTDEV_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MTDEV_NO_LEGACY_API
 
 #include <utouch/frame.h>
@@ -36,4 +40,8 @@
 const struct utouch_frame *
 utouch_frame_pump_mtdev(utouch_frame_handle fh, const struct input_event *ev);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

=== added file 'include/utouch/frame-xi2.h'
--- include/utouch/frame-xi2.h	1970-01-01 00:00:00 +0000
+++ include/utouch/frame-xi2.h	2011-02-23 14:02:38 +0000
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ *
+ * utouch-frame - Touch Frame Library
+ *
+ * Copyright (C) 2010-2011 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ ****************************************************************************/
+
+#ifndef _UTOUCH_FRAME_XI2_H
+#define _UTOUCH_FRAME_XI2_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MTDEV_NO_LEGACY_API
+
+#include <utouch/frame.h>
+#include <X11/extensions/XInput2.h>
+
+int utouch_frame_is_supported_xi2(Display *dpy, const XIDeviceInfo *dev);
+
+int utouch_frame_init_xi2(utouch_frame_handle fh,
+			  Display *dpy, const XIDeviceInfo *dev);
+
+int utouch_frame_configure_xi2(utouch_frame_handle fh,
+			       const XConfigureEvent *ev);
+
+const struct utouch_frame *
+utouch_frame_pump_xi2(utouch_frame_handle fh, const XIDeviceEvent *ev);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

=== modified file 'include/utouch/frame.h'
--- include/utouch/frame.h	2010-12-30 19:26:42 +0000
+++ include/utouch/frame.h	2011-02-23 14:02:38 +0000
@@ -22,9 +22,13 @@
 #ifndef _UTOUCH_FRAME_H
 #define _UTOUCH_FRAME_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 
-#define UTOUCH_FRAME_VERSION	0x00001000
+#define UTOUCH_FRAME_VERSION	0x00001010
 
 /**
  * struct utouch_surface - device surface details
@@ -42,11 +46,23 @@
  * @phys_width: physical width in millimeters (mm)
  * @phys_height: physical height in millimeters (mm)
  * @phys_pressure: maximal physical pressure (N/cm^2)
- * @min_x: minimum horizontal coordinate value
- * @min_y: minimum vertical coordinate value
- * @max_x: maximum horizontal coordinate value
- * @max_y: maximum vertical coordinate value
- * @max_pressure: maximum pressure coordinate value
+ * @min_x: minimum horizontal device coordinate
+ * @min_y: minimum vertical device coordinate
+ * @max_x: maximum horizontal device coordinate
+ * @max_y: maximum vertical device coordinate
+ * @max_pressure: maximum pressure device coordinate
+ * @max_orient: maximum orientation device coordinate
+ * @mapped_min_x: minimum horizontal mapped coordinate
+ * @mapped_min_y: minimum vertical mapped coordinate
+ * @mapped_max_x: maximum horizontal mapped coordinate
+ * @mapped_max_y: maximum vertical mapped coordinate
+ * @mapped_max_pressure: maximum pressure mapped coordinate
+ *
+ * The mutable contact given by utouch_frame_get_current_slot() should
+ * be set in device coordinates. The contact data is subsequently
+ * transformed to mapped (e.g., screen) coordinates in
+ * utouch_frame_sync(). To a frame user, all data will appear in
+ * mapped coordinates.
  *
  * Device properties and touch surface details. Later versions of this
  * struct may grow in size, but will remain binary compatible with
@@ -72,6 +88,12 @@
 	float max_x;
 	float max_y;
 	float max_pressure;
+	float max_orient;
+	float mapped_min_x;
+	float mapped_min_y;
+	float mapped_max_x;
+	float mapped_max_y;
+	float mapped_max_pressure;
 };
 
 #define UTOUCH_TOOL_FINGER	0
@@ -93,6 +115,8 @@
  * @orientation: direction of ellipse (left: -Pi/2, up: 0, right: Pi/2)
  * @pressure: pressure of contact (pressure units)
  * @distance: distance of contact (surface units)
+ * @vx: horizontal velocity coordinate (units / millisecond)
+ * @vy: vertical velocity coordinate (units / millisecond)
  *
  * Surface contact details. Later versions of this struct may grow in
  * size, but will remain binary compatible with older versions.
@@ -116,6 +140,8 @@
 	float orientation;
 	float pressure;
 	float distance;
+	float vx;
+	float vy;
 };
 
 /* time in milliseconds */
@@ -163,6 +189,20 @@
  */
 unsigned int utouch_frame_get_version(void);
 
+/**
+ * utouch_frame_get_num_frames - get number of supported frames
+ *
+ * Returns the number of frames supported by this engine.
+ */
+unsigned int utouch_frame_get_num_frames(utouch_frame_handle fh);
+
+/**
+ * utouch_frame_get_num_slots - get number of supported slots
+ *
+ * Returns the number of simultaneous contacts supported by this engine.
+ */
+unsigned int utouch_frame_get_num_slots(utouch_frame_handle fh);
+
 utouch_frame_handle utouch_frame_new_engine_raw(unsigned int num_frames,
 						unsigned int num_slots,
 						unsigned int frame_rate,
@@ -228,6 +268,17 @@
 int utouch_frame_set_current_slot(utouch_frame_handle fh, int slot);
 
 /**
+ * utouch_frame_set_current_id - set the current slot by touch id
+ * @fh: the frame engine in use
+ * @id: the touch id
+ *
+ * Sets the slot currently being modified, by touch id. If the id is
+ * not currently in use (does not have an active slot), a new slot is
+ * assigned. Returns zero if successful, negative error otherwise.
+ */
+int utouch_frame_set_current_id(utouch_frame_handle fh, int id);
+
+/**
  * utouch_frame_sync - synchronize and return new frame
  * @fh: the frame engine in use
  * @time: the frame synchronization time (ms)
@@ -247,4 +298,8 @@
 const struct utouch_frame *utouch_frame_sync(utouch_frame_handle fh,
 					     utouch_frame_time_t time);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-12-30 19:26:42 +0000
+++ src/Makefile.am	2011-02-23 14:02:38 +0000
@@ -3,7 +3,7 @@
 libutouch_frame_la_LDFLAGS = \
 	-version-info @LIB_VERSION@ \
 	-lm \
-	$(EVEMU_LIBS)
+	$(EVEMU_LIBS) \
 	$(MTDEV_LIBS)
 
 libutouch_frame_la_SOURCES = \
@@ -19,3 +19,11 @@
 libutouch_frameinclude_HEADERS = \
 	$(top_srcdir)/include/utouch/frame.h \
 	$(top_srcdir)/include/utouch/frame-mtdev.h
+
+if HAVE_XI
+
+libutouch_frame_la_LDFLAGS += $(XINPUT_LIBS) $(X11_LIBS)
+libutouch_frame_la_SOURCES += frame-xi2.c
+libutouch_frameinclude_HEADERS += $(top_srcdir)/include/utouch/frame-xi2.h
+
+endif

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-12-30 19:26:42 +0000
+++ src/Makefile.in	2011-02-23 14:02:38 +0000
@@ -35,9 +35,12 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@HAVE_XI_TRUE@am__append_1 = $(XINPUT_LIBS) $(X11_LIBS)
+@HAVE_XI_TRUE@am__append_2 = frame-xi2.c
+@HAVE_XI_TRUE@am__append_3 = $(top_srcdir)/include/utouch/frame-xi2.h
 subdir = src
-DIST_COMMON = $(libutouch_frameinclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(am__libutouch_frameinclude_HEADERS_DIST) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -71,7 +74,11 @@
 	"$(DESTDIR)$(libutouch_frameincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libutouch_frame_la_LIBADD =
-am_libutouch_frame_la_OBJECTS = frame.lo frame-mtdev.lo
+am__libutouch_frame_la_SOURCES_DIST = frame-impl.h frame.c \
+	frame-mtdev.c frame-xi2.c
+@HAVE_XI_TRUE@am__objects_1 = frame-xi2.lo
+am_libutouch_frame_la_OBJECTS = frame.lo frame-mtdev.lo \
+	$(am__objects_1)
 libutouch_frame_la_OBJECTS = $(am_libutouch_frame_la_OBJECTS)
 libutouch_frame_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -90,7 +97,11 @@
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libutouch_frame_la_SOURCES)
-DIST_SOURCES = $(libutouch_frame_la_SOURCES)
+DIST_SOURCES = $(am__libutouch_frame_la_SOURCES_DIST)
+am__libutouch_frameinclude_HEADERS_DIST =  \
+	$(top_srcdir)/include/utouch/frame.h \
+	$(top_srcdir)/include/utouch/frame-mtdev.h \
+	$(top_srcdir)/include/utouch/frame-xi2.h
 HEADERS = $(libutouch_frameinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -98,6 +109,7 @@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+ASCIIDOC = @ASCIIDOC@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -163,6 +175,8 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+XINPUT_CFLAGS = @XINPUT_CFLAGS@
+XINPUT_LIBS = @XINPUT_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -216,23 +230,15 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 lib_LTLIBRARIES = libutouch-frame.la
-libutouch_frame_la_LDFLAGS = \
-	-version-info @LIB_VERSION@ \
-	-lm \
-	$(EVEMU_LIBS)
-
-libutouch_frame_la_SOURCES = \
-	frame-impl.h \
-	frame.c \
-	frame-mtdev.c
-
+libutouch_frame_la_LDFLAGS = -version-info @LIB_VERSION@ -lm \
+	$(EVEMU_LIBS) $(MTDEV_LIBS) $(am__append_1)
+libutouch_frame_la_SOURCES = frame-impl.h frame.c frame-mtdev.c \
+	$(am__append_2)
 AM_CFLAGS = $(CWARNFLAGS)
 INCLUDES = -I$(top_srcdir)/include/
 libutouch_frameincludedir = $(includedir)/utouch
-libutouch_frameinclude_HEADERS = \
-	$(top_srcdir)/include/utouch/frame.h \
-	$(top_srcdir)/include/utouch/frame-mtdev.h
-
+libutouch_frameinclude_HEADERS = $(top_srcdir)/include/utouch/frame.h \
+	$(top_srcdir)/include/utouch/frame-mtdev.h $(am__append_3)
 all: all-am
 
 .SUFFIXES:
@@ -308,6 +314,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame-mtdev.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame-xi2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame.Plo@am__quote@
 
 .c.o:
@@ -561,7 +568,6 @@
 	uninstall-am uninstall-libLTLIBRARIES \
 	uninstall-libutouch_frameincludeHEADERS
 
-	$(MTDEV_LIBS)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

=== modified file 'src/frame-impl.h'
--- src/frame-impl.h	2011-02-03 19:22:55 +0000
+++ src/frame-impl.h	2011-02-23 14:02:38 +0000
@@ -30,10 +30,11 @@
 	int hold_ms;
 	int frame;
 	int slot;
-	float max_orient;
 	struct utouch_surface *surface;
 	struct utouch_frame **frames;
 	struct utouch_frame *next;
+	int *evmap;
+	float map[9];
 };
 
 #endif

=== modified file 'src/frame-mtdev.c'
--- src/frame-mtdev.c	2010-12-30 19:26:42 +0000
+++ src/frame-mtdev.c	2011-02-23 14:02:38 +0000
@@ -25,6 +25,16 @@
 #include <errno.h>
 #include <math.h>
 
+static int is_pointer(const struct evemu_device *dev)
+{
+	return evemu_has_event(dev, EV_REL, REL_X) ||
+		evemu_has_event(dev, EV_KEY, BTN_TOOL_FINGER) ||
+		evemu_has_event(dev, EV_KEY, BTN_TOOL_PEN) ||
+		evemu_has_event(dev, EV_KEY, BTN_STYLUS) ||
+		evemu_has_event(dev, EV_KEY, BTN_MOUSE) ||
+		evemu_has_event(dev, EV_KEY, BTN_LEFT);
+}
+
 int utouch_frame_is_supported_mtdev(const struct evemu_device *dev)
 {
 
@@ -52,11 +62,22 @@
 	if (!utouch_frame_is_supported_mtdev(dev))
 		return -ENODEV;
 
+	if (is_pointer(dev)) {
+		s->needs_pointer = 1;
+		s->is_direct = 0;
+	} else {
+		s->needs_pointer = 0;
+		s->is_direct = 1;
+	}
+
+	s->is_buttonpad = 0;
+	s->is_semi_mt = 0;
+
 #ifdef INPUT_PROP_POINTER
-	s->needs_pointer = evemu_has_prop(dev, INPUT_PROP_POINTER);
-	s->is_direct = evemu_has_prop(dev, INPUT_PROP_DIRECT);
-	s->is_buttonpad = evemu_has_prop(dev, INPUT_PROP_BUTTONPAD);
-	s->is_semi_mt = evemu_has_prop(dev, INPUT_PROP_SEMI_MT);
+	s->needs_pointer |= evemu_has_prop(dev, INPUT_PROP_POINTER);
+	s->is_direct |= evemu_has_prop(dev, INPUT_PROP_DIRECT);
+	s->is_buttonpad |= evemu_has_prop(dev, INPUT_PROP_BUTTONPAD);
+	s->is_semi_mt |= evemu_has_prop(dev, INPUT_PROP_SEMI_MT);
 #endif
 	s->use_touch_major = evemu_has_event(dev, EV_ABS, ABS_MT_TOUCH_MAJOR);
 	s->use_touch_minor = evemu_has_event(dev, EV_ABS, ABS_MT_TOUCH_MINOR);
@@ -83,12 +104,12 @@
 	}
 
 	s->max_pressure = evemu_get_abs_maximum(dev, ABS_MT_PRESSURE);
-	if (s->use_pressure && s->max_pressure == 0)
+	if (s->max_pressure == 0)
 		s->max_pressure = 256;
 
-	fh->max_orient = evemu_get_abs_maximum(dev, ABS_MT_ORIENTATION);
-	if (s->use_orientation && fh->max_orient == 0)
-		fh->max_orient = 1;
+	s->max_orient = evemu_get_abs_maximum(dev, ABS_MT_ORIENTATION);
+	if (s->max_orient == 0)
+		s->max_orient = 1;
 
 	tmp = evemu_get_abs_resolution(dev, ABS_MT_POSITION_X);
 	if (tmp > 0)
@@ -112,14 +133,16 @@
 	else
 		s->phys_pressure = 10;
 
+	/* defaults expected by initial frame version */
+	s->mapped_min_x = s->min_x;
+	s->mapped_min_y = s->min_y;
+	s->mapped_max_x = s->max_x;
+	s->mapped_max_y = s->max_y;
+	s->mapped_max_pressure = s->max_pressure;
+
 	return 0;
 }
 
-static float touch_angle(utouch_frame_handle fh, int orient)
-{
-	return orient / fh->max_orient * M_PI_2;
-}
-
 static int handle_abs_event(utouch_frame_handle fh,
 			    const struct input_event *ev)
 {
@@ -131,9 +154,11 @@
 		return 1;
 	case ABS_MT_POSITION_X:
 		t->x = ev->value;
+		t->vx = 0;
 		return 1;
 	case ABS_MT_POSITION_Y:
 		t->y = ev->value;
+		t->vy = 0;
 		return 1;
 	case ABS_MT_TOUCH_MAJOR:
 		t->touch_major = ev->value;
@@ -148,7 +173,7 @@
 		t->width_minor = ev->value;
 		return 1;
 	case ABS_MT_ORIENTATION:
-		t->orientation = touch_angle(fh, ev->value);
+		t->orientation = ev->value;
 		return 1;
 	case ABS_MT_PRESSURE:
 		t->pressure = ev->value;

=== added file 'src/frame-xi2.c'
--- src/frame-xi2.c	1970-01-01 00:00:00 +0000
+++ src/frame-xi2.c	2011-02-23 14:02:38 +0000
@@ -0,0 +1,322 @@
+/*****************************************************************************
+ *
+ * utouch-frame - Touch Frame Library
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ ****************************************************************************/
+#include <utouch/frame-xi2.h>
+#include <xorg/xserver-properties.h>
+#include <linux/input.h>
+#include "frame-impl.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <math.h>
+#include <string.h>
+#include <X11/Xlib.h>
+
+static Atom transform_atom;
+
+#define set_field(fh, name, number, field)			\
+	if (!strcmp(name, AXIS_LABEL_PROP_##field) &&		\
+	    (fh->evmap[number] = field))
+
+int utouch_frame_is_supported_xi2(Display *dpy, const XIDeviceInfo *dev)
+{
+
+    int i;
+
+    for (i = 0; i < dev->num_classes; i++)
+	    if (dev->classes[i]->type == XITouchClass)
+		    return 1;
+
+    return 0;
+}
+
+static void init_properties(utouch_frame_handle fh,
+			    Display *dpy, const XIDeviceInfo *dev)
+{
+	struct utouch_surface *s = fh->surface;
+	XITouchClassInfo *v;
+	int i;
+
+	for (i = 0; i < dev->num_classes; i++) {
+		v = (void *)dev->classes[i];
+		if (v->type != XITouchClass)
+			continue;
+		switch(v->mode) {
+		case XIDependentTouch:
+			s->needs_pointer = 1;
+			break;
+		case XIDirectTouch:
+			s->is_direct = 1;
+			break;
+		default:
+			fprintf(stderr, "unknown mode\n");
+			break;
+		}
+	}
+
+	if (transform_atom == None)
+		transform_atom = XInternAtom(dpy, XI_PROP_TRANSFORM, True);
+
+	fh->map[0] = fh->map[4] = fh->map[8] = 1;
+}
+
+static void update_transform(utouch_frame_handle fh, Display *dpy, int devid)
+{
+	unsigned long nitem, nbyte;
+	unsigned char *data;
+	int format;
+	Atom type;
+
+	if (transform_atom == None)
+		return;
+
+	XIGetProperty(dpy, devid, transform_atom, 0, 9, False,
+		      AnyPropertyType, &type, &format, &nitem, &nbyte, &data);
+
+	if (format == 32 && nitem == 9 && nbyte == 0)
+		memcpy(fh->map, data, sizeof(fh->map));
+	else
+		fprintf(stderr, "Invalid transform matrix\n");
+
+	XFree(data);
+}
+
+static void update_screen(utouch_frame_handle fh, Display *dpy)
+{
+	struct utouch_surface *s = fh->surface;
+	XWindowAttributes attrs;
+	float x1, y1, x2, y2;
+
+	XGetWindowAttributes(dpy, XDefaultRootWindow(dpy), &attrs);
+
+	x1 = 0;
+	y1 = 0;
+	x2 = attrs.width;
+	y2 = attrs.height;
+
+	s->mapped_min_x = fh->map[0] * x1 + fh->map[1] * y1 + fh->map[2];
+	s->mapped_min_y = fh->map[3] * x1 + fh->map[4] * y1 + fh->map[5];
+	s->mapped_max_x = fh->map[0] * x2 + fh->map[1] * y2 + fh->map[2];
+	s->mapped_max_y = fh->map[3] * x2 + fh->map[4] * y2 + fh->map[5];
+	s->mapped_max_pressure = 1;
+
+	fprintf(stderr, "frame map: %f %f %f %f %f\n",
+		s->mapped_min_x, s->mapped_min_y,
+		s->mapped_max_x, s->mapped_max_y, s->mapped_max_pressure);
+}
+
+static void init_valuators(utouch_frame_handle fh,
+			   Display *dpy, const XIDeviceInfo *dev)
+{
+	struct utouch_surface *s = fh->surface;
+	XITouchValuatorClassInfo *v;
+	char *name;
+	int i;
+
+	s->phys_width = 100;
+	s->phys_height = 65;
+	s->phys_pressure = 10;
+	s->max_x = 1024;
+	s->max_y = 768;
+	s->max_pressure = 256;
+	s->max_orient = 1;
+
+	for (i = 0; i < dev->num_classes; i++) {
+		v = (void *)dev->classes[i];
+		if (v->type != XITouchValuatorClass)
+			continue;
+		name = XGetAtomName(dpy, v->label);
+		set_field(fh, name, v->number, ABS_MT_POSITION_X) {
+			s->min_x = v->min;
+			s->max_x = v->max;
+			if (v->resolution > 0)
+				s->phys_width = (v->max - v->min) /
+					v->resolution;
+		}
+		set_field(fh, name, v->number, ABS_MT_POSITION_Y) {
+			s->min_y = v->min;
+			s->max_y = v->max;
+			if (v->resolution > 0)
+				s->phys_height = (v->max - v->min) /
+					v->resolution;
+		}
+		set_field(fh, name, v->number, ABS_MT_TOUCH_MAJOR) {
+			s->use_touch_major = 1;
+		}
+		set_field(fh, name, v->number, ABS_MT_TOUCH_MINOR) {
+			s->use_touch_minor = 1;
+		}
+		set_field(fh, name, v->number, ABS_MT_WIDTH_MAJOR) {
+			s->use_width_major = 1;
+		}
+		set_field(fh, name, v->number, ABS_MT_WIDTH_MINOR) {
+			s->use_width_minor = 1;
+		}
+		set_field(fh, name, v->number, ABS_MT_ORIENTATION) {
+			s->use_orientation = 1;
+			s->max_orient = v->max > 0 ? v->max : 1;
+		}
+		set_field(fh, name, v->number, ABS_MT_PRESSURE) {
+			s->use_pressure = 1;
+			s->max_pressure = v->max > 0 ? v->max : 256;
+			if (v->resolution > 0)
+				s->phys_pressure = v->max / v->resolution;
+		}
+#ifdef ABS_MT_DISTANCE
+#ifdef AXIS_LABEL_PROP_ABS_MT_DISTANCE
+		set_field(fh, name, v->number, ABS_MT_DISTANCE) {
+			s->use_distance = 1;
+		}
+#endif
+#endif
+		XFree(name);
+	}
+}
+
+int utouch_frame_init_xi2(utouch_frame_handle fh,
+			  Display *dpy, const XIDeviceInfo *dev)
+{
+	int event;
+	int err;
+
+	free(fh->evmap);
+	fh->evmap =calloc(dev->num_classes, sizeof(int));
+	if (!fh->evmap)
+		return -ENOMEM;
+
+	if (!utouch_frame_is_supported_xi2(dpy, dev))
+		return -ENODEV;
+
+	init_properties(fh, dpy, dev);
+	init_valuators(fh, dpy, dev);
+	update_transform(fh, dpy, dev->deviceid);
+	update_screen(fh, dpy);
+
+	return 0;
+}
+
+static int handle_event(utouch_frame_handle fh,
+			struct utouch_contact *slot,
+			int ix, float value)
+{
+	switch (fh->evmap[ix]) {
+	case ABS_MT_POSITION_X:
+		slot->x = value;
+		slot->vx = 0;
+		return 1;
+	case ABS_MT_POSITION_Y:
+		slot->y = value;
+		slot->vy = 0;
+		return 1;
+	case ABS_MT_TOUCH_MAJOR:
+		slot->touch_major = value;
+		return 1;
+	case ABS_MT_TOUCH_MINOR:
+		slot->touch_minor = value;
+		return 1;
+	case ABS_MT_WIDTH_MAJOR:
+		slot->width_major = value;
+		return 1;
+	case ABS_MT_WIDTH_MINOR:
+		slot->width_minor = value;
+		return 1;
+	case ABS_MT_ORIENTATION:
+		slot->orientation = value;
+		return 1;
+	case ABS_MT_PRESSURE:
+		slot->pressure = value;
+		return 1;
+#ifdef ABS_MT_DISTANCE
+	case ABS_MT_DISTANCE:
+		slot->distance = value;
+		return 1;
+#endif
+	case ABS_MT_TOOL_TYPE:
+		slot->tool_type = value;
+		return 1;
+	default:
+		fprintf(stderr, "did not get that one: %d\n", ix);
+		return 0;
+	}
+}
+
+int utouch_frame_configure_xi2(utouch_frame_handle fh,
+			       const XConfigureEvent *ev)
+{
+	if (ev->display)
+		update_screen(fh, ev->display);
+	return 1;
+}
+
+const struct utouch_frame *sync_xi2(utouch_frame_handle fh,
+				    utouch_frame_time_t time)
+{
+	struct utouch_frame *next = fh->next;
+	int i;
+
+	/* no velocity adjustments without device time stamps in place */
+	for (i = 0; i < fh->num_slots; i++) {
+		struct utouch_contact *q = next->slots[i];
+		q->vx = 0;
+		q->vy = 0;
+	}
+
+	return utouch_frame_sync(fh, time);
+}
+
+const struct utouch_frame *
+utouch_frame_pump_xi2(utouch_frame_handle fh, const XIDeviceEvent *ev)
+{
+	const XIPropertyEvent *prop_ev;
+	const double *value;
+	const unsigned char *mask;
+	struct utouch_contact *slot;
+	int touchid, nbyte, nbit, num, i;
+
+	switch (ev->evtype) {
+	case XI_TouchBegin:
+	case XI_TouchUpdate:
+	case XI_TouchEnd:
+		value = ev->valuators.values;
+		mask = ev->valuators.mask;
+		touchid = ev->detail;
+		nbyte = ev->valuators.mask_len;
+		nbit = nbyte << 3;
+
+		utouch_frame_set_current_id(fh, touchid);
+		slot = utouch_frame_get_current_slot(fh);
+		num = 0;
+		for (i = 0; i < nbit; i++)
+			if (XIMaskIsSet(mask, i))
+				handle_event(fh, slot, i, value[num++]);
+		if (ev->evtype == XI_TouchEnd)
+			utouch_frame_get_current_slot(fh)->id = -1;
+		return sync_xi2(fh, ev->time);
+	case XI_PropertyEvent:
+		prop_ev = (XIPropertyEvent *)ev;
+		if (prop_ev->property == transform_atom && ev->display) {
+			update_transform(fh, ev->display, ev->deviceid);
+			update_screen(fh, ev->display);
+		}
+		break;
+	}
+
+	return 0;
+}

=== modified file 'src/frame.c'
--- src/frame.c	2010-12-30 19:26:42 +0000
+++ src/frame.c	2011-02-23 14:02:38 +0000
@@ -33,6 +33,16 @@
 	return UTOUCH_FRAME_VERSION;
 }
 
+unsigned int utouch_frame_get_num_frames(utouch_frame_handle fh)
+{
+	return fh->num_frames;
+}
+
+unsigned int utouch_frame_get_num_slots(utouch_frame_handle fh)
+{
+	return fh->num_slots;
+}
+
 static void destroy_slots(struct utouch_contact **slots, int nslot)
 {
 	int i;
@@ -181,6 +191,7 @@
 
 void utouch_frame_delete_engine(utouch_frame_handle fh)
 {
+	free(fh->evmap);
 	destroy_frame(fh->next, fh->num_slots);
 	destroy_frames(fh->frames, fh->num_frames, fh->num_slots);
 	free(fh->surface);
@@ -205,11 +216,53 @@
 	return 0;
 }
 
-static void copy_contact(utouch_frame_handle fh,
-			 struct utouch_contact *a,
-			 const struct utouch_contact *b)
-{
+int utouch_frame_set_current_id(utouch_frame_handle fh, int id)
+{
+	struct utouch_contact *t;
+	int i;
+
+	for (i = 0; i < fh->num_slots; i++) {
+		t = fh->next->slots[i];
+		if (t->id == id)
+			return utouch_frame_set_current_slot(fh, i);
+	}
+	for (i = 0; i < fh->num_slots; i++) {
+		t = fh->next->slots[i];
+		if (t->id < 0) {
+			t->id = id;
+			return utouch_frame_set_current_slot(fh, i);
+		}
+	}
+	return -ENOMEM;
+}
+
+static void transform_slot(struct utouch_contact *slot,
+			   const struct utouch_surface *s)
+{
+	float fx = (s->mapped_max_x - s->mapped_min_x) / (s->max_x - s->min_x);
+	float fy = (s->mapped_max_y - s->mapped_min_y) / (s->max_y - s->min_y);
+	/* assume clipped view for asymmetrical scaling */
+	float f = MAX(fx, fy);
+
+	slot->x = fx * (slot->x - s->min_x) + s->mapped_min_x;
+	slot->y = fy * (slot->y - s->min_y) + s->mapped_min_y;
+	slot->touch_major *= f;
+	slot->touch_minor *= f;
+	slot->width_major *= f;
+	slot->width_minor *= f;
+	slot->orientation *= M_PI_2 / s->max_orient;
+	slot->pressure *= s->mapped_max_pressure / s->max_pressure;
+	slot->distance *= f;
+}
+
+static void set_contact(utouch_frame_handle fh,
+			struct utouch_contact *a,
+			struct utouch_contact *b,
+			utouch_frame_time_t dt)
+{
+	static const float D = 0.333;
 	struct utouch_surface *s = fh->surface;
+	const struct utouch_contact *ap = a->prev;
 
 	a->active = b->id != -1;
 	a->id = b->id;
@@ -225,6 +278,23 @@
 	a->orientation = b->orientation;
 	a->pressure = b->pressure;
 	a->distance = b->distance;
+
+	transform_slot(a, s);
+
+	if (a->active && ap->active && a->id == ap->id) {
+		a->x += b->vx * dt;
+		a->y += b->vy * dt;
+		if (dt > 0) {
+			a->vx = (1 - D) * ap->vx + D * (a->x - ap->x) / dt;
+			a->vy = (1 - D) * ap->vy + D * (a->y - ap->y) / dt;
+		}
+	} else {
+		a->vx = 0;
+		a->vy = 0;
+	}
+
+	b->vx = a->vx;
+	b->vy = a->vy;
 }
 
 static int detect_addrem(const struct utouch_contact *a,
@@ -261,14 +331,18 @@
 	const struct utouch_frame *prev = frame->prev;
 	struct utouch_frame *next = fh->next;
 	int naddrem = 0, nmod = 0;
+	utouch_frame_time_t dt;
 	int i;
 
+	frame->time = time ? time : get_time_ms();
 	frame->num_active = 0;
+	dt = frame->time - prev->time;
+
 	for (i = 0; i < fh->num_slots; i++) {
 		struct utouch_contact *p = frame->slots[i];
-		const struct utouch_contact *q = next->slots[i];
+		struct utouch_contact *q = next->slots[i];
 
-		copy_contact(fh, p, q);
+		set_contact(fh, p, q, dt);
 		if (p->active)
 			frame->active[frame->num_active++] = p;
 
@@ -278,7 +352,6 @@
 	if (naddrem + nmod == 0)
 		return 0;
 
-	frame->time = time ? time : get_time_ms();
 	if (naddrem == 0 && frame->time < prev->time + fh->hold_ms)
 		return 0;
 

=== modified file 'test/Makefile.in'
--- test/Makefile.in	2010-12-30 19:26:42 +0000
+++ test/Makefile.in	2011-02-23 14:02:38 +0000
@@ -49,6 +49,7 @@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+ASCIIDOC = @ASCIIDOC@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -114,6 +115,8 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+XINPUT_CFLAGS = @XINPUT_CFLAGS@
+XINPUT_LIBS = @XINPUT_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

=== modified file 'tools/Makefile.am'
--- tools/Makefile.am	2011-02-07 17:47:11 +0000
+++ tools/Makefile.am	2011-02-23 14:02:38 +0000
@@ -2,15 +2,31 @@
 
 INCLUDES=-I$(top_srcdir)/include/
 
-utouch_frame_test_mtdev_SOURCES = utouch-frame-test-mtdev.c
+utouch_frame_test_mtdev_SOURCES = common-defs.h utouch-frame-test-mtdev.c \
+	utouch-frame-test-mtdev.txt
 utouch_frame_test_mtdev_LDFLAGS = -L$(top_builddir)/src/.libs/ \
 	-lutouch-frame -lutouch-evemu -lmtdev -lm
+local_manpages = utouch-frame-test-mtdev.1
+
+if HAVE_XI
+
+AM_CFLAGS = $(XINPUT_CFLAGS)
+
+bin_PROGRAMS += utouch-frame-test-xi2
+
+utouch_frame_test_xi2_SOURCES = common-defs.h utouch-frame-test-xi2.c \
+	utouch-frame-test-xi2.txt
+utouch_frame_test_xi2_LDFLAGS = $(XINPUT_LIBS) $(X11_LIBS) \
+	-L$(top_builddir)/src/.libs/ -lutouch-frame
+local_manpages += utouch-frame-test-xi2.1
+
+endif
 
 if HAVE_DOCTOOLS
-dist_man_MANS = utouch-frame-test-mtdev.1
+dist_man_MANS = $(local_manpages)
 
 %.1: %.txt
-	$(ASCIIDOC) -f manpage --no-xmllint $<
+	$(ASCIIDOC) -f manpage $<
 
 CLEANFILES = $(dist_man_MANS)
 

=== modified file 'tools/Makefile.in'
--- tools/Makefile.in	2011-02-07 17:47:11 +0000
+++ tools/Makefile.in	2011-02-23 14:02:38 +0000
@@ -34,7 +34,9 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = utouch-frame-test-mtdev$(EXEEXT)
+bin_PROGRAMS = utouch-frame-test-mtdev$(EXEEXT) $(am__EXEEXT_1)
+@HAVE_XI_TRUE@am__append_1 = utouch-frame-test-xi2
+@HAVE_XI_TRUE@am__append_2 = utouch-frame-test-xi2.1
 subdir = tools
 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -46,6 +48,7 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+@HAVE_XI_TRUE@am__EXEEXT_1 = utouch-frame-test-xi2$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_utouch_frame_test_mtdev_OBJECTS =  \
@@ -56,6 +59,15 @@
 utouch_frame_test_mtdev_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(utouch_frame_test_mtdev_LDFLAGS) $(LDFLAGS) -o $@
+am__utouch_frame_test_xi2_SOURCES_DIST = common-defs.h \
+	utouch-frame-test-xi2.c utouch-frame-test-xi2.txt
+@HAVE_XI_TRUE@am_utouch_frame_test_xi2_OBJECTS =  \
+@HAVE_XI_TRUE@	utouch-frame-test-xi2.$(OBJEXT)
+utouch_frame_test_xi2_OBJECTS = $(am_utouch_frame_test_xi2_OBJECTS)
+utouch_frame_test_xi2_LDADD = $(LDADD)
+utouch_frame_test_xi2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(utouch_frame_test_xi2_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -69,8 +81,10 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(utouch_frame_test_mtdev_SOURCES)
-DIST_SOURCES = $(utouch_frame_test_mtdev_SOURCES)
+SOURCES = $(utouch_frame_test_mtdev_SOURCES) \
+	$(utouch_frame_test_xi2_SOURCES)
+DIST_SOURCES = $(utouch_frame_test_mtdev_SOURCES) \
+	$(am__utouch_frame_test_xi2_SOURCES_DIST)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,6 +181,8 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+XINPUT_CFLAGS = @XINPUT_CFLAGS@
+XINPUT_LIBS = @XINPUT_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -220,11 +236,21 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_srcdir)/include/
-utouch_frame_test_mtdev_SOURCES = utouch-frame-test-mtdev.c
+utouch_frame_test_mtdev_SOURCES = common-defs.h utouch-frame-test-mtdev.c \
+	utouch-frame-test-mtdev.txt
+
 utouch_frame_test_mtdev_LDFLAGS = -L$(top_builddir)/src/.libs/ \
 	-lutouch-frame -lutouch-evemu -lmtdev -lm
 
-@HAVE_DOCTOOLS_TRUE@dist_man_MANS = utouch-frame-test-mtdev.1
+local_manpages = utouch-frame-test-mtdev.1 $(am__append_2)
+@HAVE_XI_TRUE@AM_CFLAGS = $(XINPUT_CFLAGS)
+@HAVE_XI_TRUE@utouch_frame_test_xi2_SOURCES = common-defs.h utouch-frame-test-xi2.c \
+@HAVE_XI_TRUE@	utouch-frame-test-xi2.txt
+
+@HAVE_XI_TRUE@utouch_frame_test_xi2_LDFLAGS = $(XINPUT_LIBS) $(X11_LIBS) \
+@HAVE_XI_TRUE@	-L$(top_builddir)/src/.libs/ -lutouch-frame
+
+@HAVE_DOCTOOLS_TRUE@dist_man_MANS = $(local_manpages)
 @HAVE_DOCTOOLS_TRUE@CLEANFILES = $(dist_man_MANS)
 all: all-am
 
@@ -306,6 +332,9 @@
 utouch-frame-test-mtdev$(EXEEXT): $(utouch_frame_test_mtdev_OBJECTS) $(utouch_frame_test_mtdev_DEPENDENCIES) 
 	@rm -f utouch-frame-test-mtdev$(EXEEXT)
 	$(utouch_frame_test_mtdev_LINK) $(utouch_frame_test_mtdev_OBJECTS) $(utouch_frame_test_mtdev_LDADD) $(LIBS)
+utouch-frame-test-xi2$(EXEEXT): $(utouch_frame_test_xi2_OBJECTS) $(utouch_frame_test_xi2_DEPENDENCIES) 
+	@rm -f utouch-frame-test-xi2$(EXEEXT)
+	$(utouch_frame_test_xi2_LINK) $(utouch_frame_test_xi2_OBJECTS) $(utouch_frame_test_xi2_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -314,6 +343,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utouch-frame-test-mtdev.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utouch-frame-test-xi2.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -599,7 +629,7 @@
 
 
 @HAVE_DOCTOOLS_TRUE@%.1: %.txt
-@HAVE_DOCTOOLS_TRUE@	$(ASCIIDOC) -f manpage --no-xmllint $<
+@HAVE_DOCTOOLS_TRUE@	$(ASCIIDOC) -f manpage $<
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

=== added file 'tools/common-defs.h'
--- tools/common-defs.h	1970-01-01 00:00:00 +0000
+++ tools/common-defs.h	2011-02-23 14:02:38 +0000
@@ -0,0 +1,85 @@
+/*****************************************************************************
+ *
+ * utouch-frame - Touch Frame Library
+ *
+ * Copyright (C) 2010-2011 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Henrik Rydberg <[e-mail]>
+ *
+ ****************************************************************************/
+
+static void report_device_caps(utouch_frame_handle fh)
+{
+	const struct utouch_surface *s = utouch_frame_get_surface(fh);
+
+	fprintf(stderr, "device props:\n");
+	if (s->needs_pointer)
+		fprintf(stderr, "\tpointer\n");
+	if (s->is_direct)
+		fprintf(stderr, "\tdirect\n");
+	if (s->is_buttonpad)
+		fprintf(stderr, "\tbuttonpad\n");
+	if (s->is_semi_mt)
+		fprintf(stderr, "\tsemi_mt\n");
+	fprintf(stderr, "device mt events:\n");
+	if (s->use_touch_major)
+		fprintf(stderr, "\ttouch_major\n");
+	if (s->use_touch_minor)
+		fprintf(stderr, "\ttouch_minor\n");
+	if (s->use_width_major)
+		fprintf(stderr, "\twidth_major\n");
+	if (s->use_width_minor)
+		fprintf(stderr, "\twidth_minor\n");
+	if (s->use_orientation)
+		fprintf(stderr, "\torientation\n");
+	if (s->use_pressure)
+		fprintf(stderr, "\tpressure\n");
+	if (s->use_distance)
+		fprintf(stderr, "\tdistance\n");
+}
+
+static void report_frame(const struct utouch_frame *frame)
+{
+	int i;
+
+	for (i = 0; i < frame->num_active; i++) {
+		const struct utouch_contact *t = frame->active[i];
+
+		fprintf(stderr, "touch %d\n", i);
+		fprintf(stderr, "  slot:         %d\n", t->slot);
+		fprintf(stderr, "  id:           %d\n", t->id);
+		fprintf(stderr, "  tool_type:    %d\n", t->tool_type);
+		fprintf(stderr, "  x:            %f\n", t->x);
+		fprintf(stderr, "  y:            %f\n", t->y);
+		fprintf(stderr, "  touch_major:  %f\n", t->touch_major);
+		fprintf(stderr, "  touch_minor:  %f\n", t->touch_minor);
+		fprintf(stderr, "  width_major:  %f\n", t->width_major);
+		fprintf(stderr, "  width_minor:  %f\n", t->width_minor);
+		fprintf(stderr, "  angle:        %f\n", t->orientation);
+		fprintf(stderr, "  pressure:     %f\n", t->pressure);
+		fprintf(stderr, "  distance:     %f\n", t->distance);
+		fprintf(stderr, "  vx:           %f\n", t->vx);
+		fprintf(stderr, "  vy:           %f\n", t->vy);
+	}
+
+	fprintf(stderr, "sync %d %ld %d %d %d\n",
+		frame->num_active,
+		frame->time,
+		frame->sequence_id,
+		frame->revision,
+		frame->slot_revision);
+}

=== added file 'tools/utouch-frame-test-mtdev.1'
--- tools/utouch-frame-test-mtdev.1	1970-01-01 00:00:00 +0000
+++ tools/utouch-frame-test-mtdev.1	2011-02-23 14:02:38 +0000
@@ -0,0 +1,42 @@
+'\" t
+.\"     Title: utouch-frame-test-mtdev
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 02/23/2011
+.\"    Manual: \ \&
+.\"    Source: \ \&
+.\"  Language: English
+.\"
+.TH "UTOUCH\-FRAME\-TEST\" "1" "02/23/2011" "\ \&" "\ \&"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+utouch-frame-test-mtdev \- describe a device and report frame events
+.SH "SYNOPSIS"
+.sp
+.nf
+utouch\-frame\-test\-mtdev device
+.fi
+.SH "DESCRIPTION"
+.sp
+A test tool used to analyse the capabilities and act as a test driver for the uTouch touch frame library\&.
+.SH "AUTHOR"
+.sp
+utouch\-frame\-test\-mtdev was written by Henrik Rydberg <rydberg@euromail\&.se>

=== modified file 'tools/utouch-frame-test-mtdev.c'
--- tools/utouch-frame-test-mtdev.c	2010-12-30 19:26:42 +0000
+++ tools/utouch-frame-test-mtdev.c	2011-02-23 14:02:38 +0000
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include "common-defs.h"
 
 struct frame_test {
 	struct evemu_device *evemu;
@@ -69,36 +70,6 @@
 	memset(test, 0, sizeof(*test));
 }
 
-static void report_frame(const struct utouch_frame *frame)
-{
-	int i;
-
-	for (i = 0; i < frame->num_active; i++) {
-		const struct utouch_contact *t = frame->active[i];
-
-		fprintf(stderr, "touch %d\n", i);
-		fprintf(stderr, "  slot:         %d\n", t->slot);
-		fprintf(stderr, "  id:           %d\n", t->id);
-		fprintf(stderr, "  tool_type:    %d\n", t->tool_type);
-		fprintf(stderr, "  x:            %f\n", t->x);
-		fprintf(stderr, "  y:            %f\n", t->y);
-		fprintf(stderr, "  touch_major:  %f\n", t->touch_major);
-		fprintf(stderr, "  touch_minor:  %f\n", t->touch_minor);
-		fprintf(stderr, "  width_major:  %f\n", t->width_major);
-		fprintf(stderr, "  width_minor:  %f\n", t->width_minor);
-		fprintf(stderr, "  angle:        %f\n", t->orientation);
-		fprintf(stderr, "  pressure:     %f\n", t->pressure);
-		fprintf(stderr, "  distance:     %f\n", t->distance);
-	}
-
-	fprintf(stderr, "sync %d %ld %d %d %d\n",
-		frame->num_active,
-		frame->time,
-		frame->sequence_id,
-		frame->revision,
-		frame->slot_revision);
-}
-
 static void loop_device(struct frame_test *test, int fd)
 {
 	const struct utouch_frame *frame;
@@ -113,46 +84,6 @@
 	}
 }
 
-static void report_device_caps(struct frame_test *test)
-{
-#ifdef INPUT_PROP_POINTER
-	fprintf(stderr, "device props:\n");
-	if (evemu_has_prop(test->evemu, INPUT_PROP_POINTER))
-		fprintf(stderr, "\tpointer\n");
-	if (evemu_has_prop(test->evemu, INPUT_PROP_DIRECT))
-		fprintf(stderr, "\tdirect\n");
-	if (evemu_has_prop(test->evemu, INPUT_PROP_BUTTONPAD))
-		fprintf(stderr, "\tbuttonpad\n");
-	if (evemu_has_prop(test->evemu, INPUT_PROP_SEMI_MT))
-		fprintf(stderr, "\tsemi_mt\n");
-#endif
-	fprintf(stderr, "device mt events:\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_SLOT))
-		fprintf(stderr, "\tslot\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOUCH_MAJOR))
-		fprintf(stderr, "\ttouch_major\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOUCH_MINOR))
-		fprintf(stderr, "\ttouch_minor\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_WIDTH_MAJOR))
-		fprintf(stderr, "\twidth_major\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_WIDTH_MINOR))
-		fprintf(stderr, "\twidth_minor\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_ORIENTATION))
-		fprintf(stderr, "\torientation\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_POSITION_X))
-		fprintf(stderr, "\tposition_x\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_POSITION_Y))
-		fprintf(stderr, "\tposition_y\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOOL_TYPE))
-		fprintf(stderr, "\tposition_y\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TRACKING_ID))
-		fprintf(stderr, "\ttracking_id\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_PRESSURE))
-		fprintf(stderr, "\tpressure\n");
-	if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_DISTANCE))
-		fprintf(stderr, "\tdistance\n");
-}
-
 int main(int argc, char *argv[])
 {
 	struct frame_test test;
@@ -193,7 +124,7 @@
 		return -1;
 	}
 
-	report_device_caps(&test);
+	report_device_caps(test.fh);
 
 	loop_device(&test, fd);
 

=== added file 'tools/utouch-frame-test-xi2.1'
--- tools/utouch-frame-test-xi2.1	1970-01-01 00:00:00 +0000
+++ tools/utouch-frame-test-xi2.1	2011-02-23 14:02:38 +0000
@@ -0,0 +1,42 @@
+'\" t
+.\"     Title: utouch-frame-test-xi2
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 02/23/2011
+.\"    Manual: \ \&
+.\"    Source: \ \&
+.\"  Language: English
+.\"
+.TH "UTOUCH\-FRAME\-TEST\" "1" "02/23/2011" "\ \&" "\ \&"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+utouch-frame-test-xi2 \- report frame events from an xinput device
+.SH "SYNOPSIS"
+.sp
+.nf
+utouch\-frame\-test\-xi2 xinput\-device\-number
+.fi
+.SH "DESCRIPTION"
+.sp
+A test tool used to analyse the capabilities and act as a test driver for the uTouch touch frame library\&.
+.SH "AUTHOR"
+.sp
+utouch\-frame\-test\-xi2 was written by Henrik Rydberg <rydberg@euromail\&.se>

=== added file 'tools/utouch-frame-test-xi2.c'
--- tools/utouch-frame-test-xi2.c	1970-01-01 00:00:00 +0000
+++ tools/utouch-frame-test-xi2.c	2011-02-23 14:02:38 +0000
@@ -0,0 +1,177 @@
+/*****************************************************************************
+ *
+ * utouch-frame - Touch Frame Library
+ *
+ * Copyright (C) 2010-2011 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Henrik Rydberg <[e-mail]>
+ *
+ ****************************************************************************/
+
+#define MTDEV_NO_LEGACY_API
+
+#include <utouch/frame-xi2.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include "common-defs.h"
+
+static int opcode;
+
+struct frame_test {
+	Display *display;
+	Window root, win;
+	XIDeviceInfo *info, *dev;
+	utouch_frame_handle fh;
+};
+
+static int init_xi2(struct frame_test *test, int id)
+{
+	Display *dpy;
+	int ndevices, i;
+	int event, error;
+
+	dpy = XOpenDisplay(NULL);
+	if (!dpy)
+		return -1;
+
+	if (!XQueryExtension(dpy, "XInputExtension", &opcode, &event, &error))
+		return -1;
+
+	test->display = dpy;
+	test->info = XIQueryDevice(dpy, XIAllDevices, &ndevices);
+	test->dev = 0;
+	for (i = 0; i < ndevices; i++)
+		if (test->info[i].deviceid == id)
+			test->dev = &test->info[i];
+	if (!test->dev)
+		return -1;
+
+	test->root = DefaultRootWindow(dpy);
+	test->win = XCreateSimpleWindow(dpy, test->root,
+					0, 0, 400, 400, 0,
+					BlackPixel(dpy, 0),
+					WhitePixel(dpy, 0));
+
+	XMapWindow(test->display, test->win);
+	XFlush(test->display);
+
+	return 0;
+}
+
+static int init_frame(struct frame_test *test)
+{
+	test->fh = utouch_frame_new_engine(100, 32, 100);
+	if (!test->fh)
+		return -1;
+	return utouch_frame_init_xi2(test->fh, test->display, test->dev);
+}
+
+static void destroy_all(struct frame_test *test)
+{
+	utouch_frame_delete_engine(test->fh);
+	XIFreeDeviceInfo(test->info);
+	XDestroyWindow(test->display, test->win);
+	XCloseDisplay(test->display);
+	memset(test, 0, sizeof(*test));
+}
+
+static void handle_event(struct frame_test *test, XEvent *ev)
+{
+	XGenericEventCookie *gev = &ev->xcookie;
+	const struct utouch_frame *frame;
+	XConfigureEvent *cev;
+	XIDeviceEvent *dev;
+
+	switch(ev->type) {
+	case ConfigureNotify:
+		cev = (XConfigureEvent *)ev;
+		if (cev->window == XDefaultRootWindow(cev->display))
+			utouch_frame_configure_xi2(test->fh, cev);
+		break;
+	case GenericEvent:
+		if (!XGetEventData(test->display, gev))
+			break;
+		dev = gev->data;
+		/* null for some requests, quite odd */
+		dev->display = ev->xany.display;
+		if (gev->type == GenericEvent && gev->extension == opcode) {
+			frame = utouch_frame_pump_xi2(test->fh, dev);
+			if (frame)
+				report_frame(frame);
+		}
+		XFreeEventData(test->display, gev);
+		break;
+	}
+}
+
+static void loop_device(struct frame_test *test)
+{
+	XIEventMask mask;
+
+	mask.deviceid = XIAllDevices;
+	mask.mask_len = XIMaskLen(XI_LASTEVENT);
+	mask.mask = calloc(mask.mask_len, sizeof(char));
+
+	XISetMask(mask.mask, XI_TouchBegin);
+	XISetMask(mask.mask, XI_TouchUpdate);
+	XISetMask(mask.mask, XI_TouchEnd);
+	XISetMask(mask.mask, XI_PropertyEvent);
+	XISelectEvents(test->display, test->win, &mask, 1);
+
+	XSelectInput(test->display, test->root, StructureNotifyMask);
+
+	while (1) {
+		XEvent ev;
+		XNextEvent(test->display, &ev);
+		handle_event(test, &ev);
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	struct frame_test test;
+	int id;
+
+	if (argc < 2) {
+		fprintf(stderr, "Usage: %s <xinput_device_number>\n", argv[0]);
+		return -1;
+	}
+	id = atoi(argv[1]);
+
+	if (init_xi2(&test, id)) {
+		fprintf(stderr, "error: could not describe device\n");
+		return -1;
+	}
+	if (!utouch_frame_is_supported_xi2(test.display, test.dev)) {
+		fprintf(stderr, "error: unsupported device\n");
+		return -1;
+	}
+	if (init_frame(&test)) {
+		fprintf(stderr, "error: could not init frame\n");
+		return -1;
+	}
+
+	report_device_caps(test.fh);
+
+	loop_device(&test);
+
+	destroy_all(&test);
+	return 0;
+}

=== added file 'tools/utouch-frame-test-xi2.txt'
--- tools/utouch-frame-test-xi2.txt	1970-01-01 00:00:00 +0000
+++ tools/utouch-frame-test-xi2.txt	2011-02-23 14:02:38 +0000
@@ -0,0 +1,22 @@
+UTOUCH-FRAME-TEST-XI2(1)
+==========================
+
+NAME
+----
+
+  utouch-frame-test-xi2 - report frame events from an xinput device
+
+SYNOPSIS
+--------
+
+  utouch-frame-test-xi2 xinput-device-number
+
+DESCRIPTION
+-----------
+
+A test tool used to analyse the capabilities and act as a test driver for the
+uTouch touch frame library.
+
+AUTHOR
+------
+utouch-frame-test-xi2 was written by Henrik Rydberg <[e-mail]>