Merge lp:~bregma/geis/packaging-1.0.11 into lp:~oif-team/geis/packaging

[Stephen M. Webb]

Packging utouch-geis release 1.0.11

Packages utouch-geis 1.0.11 for Ubuntu

This merge request supersedes the previous similar merge requires because a step was missed during upstream source merging.

[Henrik Rydberg (rydberg)]

Look ok now. :-)

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2010-08-23 14:34:23 +0000
+++ ChangeLog	2010-09-16 16:28:52 +0000
@@ -1,3 +1,172 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Version bump tp 1.0.11
+
+  * configure.ac: bumped package version to 1.0.11
+  * libutouch-geis-xcb/Makefile.am: bumped shlib version to reflect changes
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Fixed typos in manpage.
+
+  * doc/geistest.1: fixed several typographical errors
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Fixed a memory leak when logging messages.
+
+  * libutouch-geis-xcb/geis_logging.c (_geis_message): fixed memory leak
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Fixed prefix string used in diagnostics.
+
+  * libutouch-geis-xcb/geis_logging.c (_geis_message): fixed which prefix string
+    gets used for which diagnostic level
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Removed input device enumeration handling until later.
+
+  * libutouch-geis-xcb/geis.c (geis_input_devices): removed #if 0 block
+  * libutouch-geis-xcb/geis_instance.h (geis_instance_input_devices): removed 
+  * libutouch-geis-xcb/geis_instance.c (geis_instance_input_devices): removed 
+  * libutouch-geis-xcb/geis_xcb.h (geis_xcb_input_devices):  added funcs and
+    cookie parameters
+  * libutouch-geis-xcb/geis_xcb.c (_GeisXcb): added input_funcs and input_cookie
+    (geis_xcb_new): removed #if 0 blocks
+    (geis_xcb_input_devices): removed XInput handling until later
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Removed some debug code and fixed pasto.
+
+  * libutouch-geis-xcb/geis_instance.c: fixed a pasto
+  * testsuite/geistest/geistest.c: removed debug code
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Fixed so multiple windows will work.
+
+  Altered geistest to work with a single window or all windows, had to fix geis
+  implementation so this was possible.
+
+  * libutouch-geis-xcb/geis_instance_table.c: new file
+  * libutouch-geis-xcb/geis_instance_table.h: new file
+  * configure.ac: added package checks for x11-xcb and xi
+  * doc/geistest.1: documented new CLI switches
+  * geis/geis.h (geis_input_devices): fixed argument type
+  * libutouch-geis-xcb/Makefile.am (libutouch_geis_la_SOURCES): added new files
+    (libutouch_geis_la_CFLAGS): aded X11XCB_CFLAGS and XI2_CFLAGS
+    (libutouch_geis_la_LIBADD): aded X11XCB_LIBS and XI2LIBS_
+  * libutouch-geis-xcb/geis.c (s_geis_xcb): new static global
+    (geis_init): used it
+  * libutouch-geis-xcb/geis_instance.h (_GeisInstance): added window_id
+    (geis_instance_new): renamed from geis_instance_get
+    (geis_instance_input_devices): new function
+    (geis_instance_subscribe): added GeisXcb parameter
+    (geis_instance_get_window_id): new function
+    (geis_instance_fd): removed function
+    (geis_instance_event_dispatch): removed function
+  * libutouch-geis-xcb/geis_instance.c: implemented new functions
+  * libutouch-geis-xcb/geis_xcb.h (geis_xcb_new): renamed from geis_xcb_get
+    (geis_xcb_create_instance): new function
+    (geis_xcb_input_devices): new function
+    (geis_xcb_subscribe): added GeisInstance parameter
+    (geis_xcb_dispatch): changed parameter type to GeisXcb
+  * libutouch-geis-xcb/geis_xcb.c: Implemeneted new functions
+  * testsuite/geistest/geistest.c (parse_opts): added -w switch
+    (subscribe_window): new function
+    (subscribe_windows_preorder): new function
+    (subscribe_all_windows): new function
+    (main): used the new functions
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added runtime diagnostic facility.
+
+  * libutouch-geis-xcb/geis_debug.h: replaced with
+  * libutouch-geis-xcb/geis_logging.h: mew file
+  * libutouch-geis-xcb/geis_logging.c: new file
+  * libutouch-geis-xcb/Makefile.am: replaced above files
+  * libutouch-geis-xcb/geis_xcb.c: replaced geis_debug calls with
+    geis_warning or geis_error as appropriate
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Fixed checking of gesture masks for multiple input devices.
+
+  * libutouch-geis-xcb/geis_instance.c (geis_instance_subscribe):
+    added missing index increment
+  * libutouch-geis-xcb/geis_xcb.c (geis_xcb_verify_event_selection):
+    added logic for iterating through multiple input devices
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Move gesture-type-added callback until later in the subscription  sequence.
+
+  * libutouch-geis-xcb/geis_xcb.c (geis_xcb_subscribe): move call to
+    geis_xcb_dispatch_gesture_type until later in sequence
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Removed "Grab" gestire entirely from the list of known gestures.
+
+  * libutouch-geis-xcb/geis_xcb.c (s_grail_type_map): removed GRAIL_TYPE_SYSFLAG1
+    (geis_xcb_dispatch_gesture_type): removed references to GRAIL_TYPE_SYSFLAG1
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Prevented "Grab" gesture from being propagated.
+
+  * libutouch-geis-xcb/geis_xcb.c (geis_xcb_dispatch_gesture_type): skipped
+    notification of the availability of the "Grab" gesture type.
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Fixed an allocation size issue.
+
+  * libutouch-geis-xcb/geis_instance.c (geis_instance_get): fixed allocation
+    size issue
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Minor style adjustments.  Adjusted whitespace for consistency.
+
+  * libutouch-geis-xcb/geis_xcb.c (geis_xcb_verify_event_selection):
+    renamed function from geis_xcb_select_events
+    (geis_xcb_determine_primitive_type): renamed from
+    geis_xcb_determine_fundamental_gesture_type
+    (geis_xcb_get_gesture_type_primitive_name): renamed form
+    geis_xcb_get_gesture_type_fundamental_name
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Reverted version bump.
+
+  * configure,.ac (AC_INIT): reverted to version 1.0.10
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Implemented gesture and input device selection.
+
+  * geis/geis.h: new gesture definitions
+  * libutouch-geis-xcb/geis_xcb.h (geis_xcb_subscribe):
+    added device_id parameter
+  * libutouch-geis-xcb/geis_xcb.c (s_grail_type_map): new gesture definitions
+    (geis_xcb_map_gestures_to_mask): new function
+    (geis_xcb_select_events): new function
+    (geis_xcb_subscribe): used them
+    added device_id parameter
+    (geis_xcb_determine_gesture_type): renamed to
+    geis_xcb_determine_fundamental_gesture_type
+    (geis_xcb_get_gesture_type_fundamental_name): new function
+    (geis_xcb_dispatch_gesture_type): mapped public gesture definitions to
+    fundamental gesture types
+  * libutouch-geis-xcb/geis_instance.c (geis_instance_subscribe):
+    handled input_list argument
+  * testsuite/geistest/geistest.c: included an example of selecting gestures
+
 2010-08-22  Chase Douglas <[e-mail]>
 
   Bumped to version 1.0.10 for various fixes

=== modified file 'Makefile.in'
--- Makefile.in	2010-08-20 22:03:52 +0000
+++ Makefile.in	2010-09-16 16:28:52 +0000
@@ -205,11 +205,15 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+X11XCB_CFLAGS = @X11XCB_CFLAGS@
+X11XCB_LIBS = @X11XCB_LIBS@
 XCBINCLUDEDIR = @XCBINCLUDEDIR@
 XCBPROTO_XCBINCLUDEDIR = @XCBPROTO_XCBINCLUDEDIR@
 XCBPROTO_XCBPYTHONDIR = @XCBPROTO_XCBPYTHONDIR@
 XCB_CFLAGS = @XCB_CFLAGS@
 XCB_LIBS = @XCB_LIBS@
+XI2_CFLAGS = @XI2_CFLAGS@
+XI2_LIBS = @XI2_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

=== modified file 'configure'
--- configure	2010-08-23 14:54:15 +0000
+++ configure	2010-09-16 16:28:52 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for utouch-geis 1.0.10.
+# Generated by GNU Autoconf 2.67 for utouch-geis 1.0.11.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='utouch-geis'
 PACKAGE_TARNAME='utouch-geis'
-PACKAGE_VERSION='1.0.10'
-PACKAGE_STRING='utouch-geis 1.0.10'
+PACKAGE_VERSION='1.0.11'
+PACKAGE_STRING='utouch-geis 1.0.11'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL='https://launchpad.net/utouch-geis'
 
@@ -749,6 +749,10 @@
 XCBINCLUDEDIR
 XCBPROTO_XCBPYTHONDIR
 XCBPROTO_XCBINCLUDEDIR
+XI2_LIBS
+XI2_CFLAGS
+X11XCB_LIBS
+X11XCB_CFLAGS
 XCB_LIBS
 XCB_CFLAGS
 GRAIL_LIBS
@@ -896,7 +900,11 @@
 GRAIL_CFLAGS
 GRAIL_LIBS
 XCB_CFLAGS
-XCB_LIBS'
+XCB_LIBS
+X11XCB_CFLAGS
+X11XCB_LIBS
+XI2_CFLAGS
+XI2_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1439,7 +1447,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 utouch-geis 1.0.10 to adapt to many kinds of systems.
+\`configure' configures utouch-geis 1.0.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1509,7 +1517,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of utouch-geis 1.0.10:";;
+     short | recursive ) echo "Configuration of utouch-geis 1.0.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1551,6 +1559,11 @@
   GRAIL_LIBS  linker flags for GRAIL, overriding pkg-config
   XCB_CFLAGS  C compiler flags for XCB, overriding pkg-config
   XCB_LIBS    linker flags for XCB, overriding pkg-config
+  X11XCB_CFLAGS
+              C compiler flags for X11XCB, overriding pkg-config
+  X11XCB_LIBS linker flags for X11XCB, overriding pkg-config
+  XI2_CFLAGS  C compiler flags for XI2, overriding pkg-config
+  XI2_LIBS    linker flags for XI2, 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.
@@ -1619,7 +1632,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-utouch-geis configure 1.0.10
+utouch-geis configure 1.0.11
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1897,7 +1910,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by utouch-geis $as_me 1.0.10, which was
+It was created by utouch-geis $as_me 1.0.11, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2715,7 +2728,7 @@
 
 # Define the identity of the package.
  PACKAGE='utouch-geis'
- VERSION='1.0.10'
+ VERSION='1.0.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4770,13 +4783,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4773: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4786: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4776: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4789: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4779: output\"" >&5)
+  (eval echo "\"\$as_me:4792: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5982,7 +5995,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5985 "configure"' > conftest.$ac_ext
+  echo '#line 5998 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7511,11 +7524,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:7514: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7527: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7518: \$? = $ac_status" >&5
+   echo "$as_me:7531: \$? = $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.
@@ -7850,11 +7863,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:7853: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7866: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7857: \$? = $ac_status" >&5
+   echo "$as_me:7870: \$? = $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.
@@ -7955,11 +7968,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:7958: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7971: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7962: \$? = $ac_status" >&5
+   echo "$as_me:7975: \$? = $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
@@ -8010,11 +8023,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:8013: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8026: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8017: \$? = $ac_status" >&5
+   echo "$as_me:8030: \$? = $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
@@ -10394,7 +10407,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10397 "configure"
+#line 10410 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10490,7 +10503,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10493 "configure"
+#line 10506 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10978,6 +10991,145 @@
 $as_echo "yes" >&6; }
 
 fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11XCB" >&5
+$as_echo_n "checking for X11XCB... " >&6; }
+
+if test -n "$X11XCB_CFLAGS"; then
+    pkg_cv_X11XCB_CFLAGS="$X11XCB_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-xcb >= 1.3.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "x11-xcb >= 1.3.3") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_X11XCB_CFLAGS=`$PKG_CONFIG --cflags "x11-xcb >= 1.3.3" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$X11XCB_LIBS"; then
+    pkg_cv_X11XCB_LIBS="$X11XCB_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-xcb >= 1.3.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "x11-xcb >= 1.3.3") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_X11XCB_LIBS=`$PKG_CONFIG --libs "x11-xcb >= 1.3.3" 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
+	        X11XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb >= 1.3.3" 2>&1`
+        else
+	        X11XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb >= 1.3.3" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$X11XCB_PKG_ERRORS" >&5
+
+	as_fn_error $? "X11-XCB development libraries not found" "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "X11-XCB development libraries not found" "$LINENO" 5
+else
+	X11XCB_CFLAGS=$pkg_cv_X11XCB_CFLAGS
+	X11XCB_LIBS=$pkg_cv_X11XCB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XI2" >&5
+$as_echo_n "checking for XI2... " >&6; }
+
+if test -n "$XI2_CFLAGS"; then
+    pkg_cv_XI2_CFLAGS="$XI2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xi >= 1.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xi >= 1.3") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_XI2_CFLAGS=`$PKG_CONFIG --cflags "xi >= 1.3" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$XI2_LIBS"; then
+    pkg_cv_XI2_LIBS="$XI2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xi >= 1.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xi >= 1.3") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_XI2_LIBS=`$PKG_CONFIG --libs "xi >= 1.3" 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
+	        XI2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xi >= 1.3" 2>&1`
+        else
+	        XI2_PKG_ERRORS=`$PKG_CONFIG --print-errors "xi >= 1.3" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$XI2_PKG_ERRORS" >&5
+
+	as_fn_error $? "XI2 development libraries not found" "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "XI2 development libraries not found" "$LINENO" 5
+else
+	XI2_CFLAGS=$pkg_cv_XI2_CFLAGS
+	XI2_LIBS=$pkg_cv_XI2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
 # XCB code generation configuration
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking XCBPROTO_XCBINCLUDEDIR" >&5
 $as_echo_n "checking XCBPROTO_XCBINCLUDEDIR... " >&6; }
@@ -11552,7 +11704,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by utouch-geis $as_me 1.0.10, which was
+This file was extended by utouch-geis $as_me 1.0.11, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11619,7 +11771,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-utouch-geis config.status 1.0.10
+utouch-geis config.status 1.0.11
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2010-08-23 14:54:15 +0000
+++ configure.ac	2010-09-16 16:28:52 +0000
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.65)
-AC_INIT([utouch-geis],[1.0.10],
+AC_INIT([utouch-geis],[1.0.11],
 	[[e-mail]],,
 	[https://launchpad.net/utouch-geis])
 AC_CONFIG_HEADERS([geis_config.h])
@@ -24,6 +24,11 @@
 		  AC_MSG_ERROR([Grail development libraries not found]))
 PKG_CHECK_MODULES([XCB], [xcb >= 1.6], ,
 		  AC_MSG_ERROR([XCB development libraries not found]))
+PKG_CHECK_MODULES([X11XCB], [x11-xcb >= 1.3.3], ,
+		  AC_MSG_ERROR([X11-XCB development libraries not found]))
+PKG_CHECK_MODULES([XI2], [xi >= 1.3], ,
+		  AC_MSG_ERROR([XI2 development libraries not found]))
+
 # XCB code generation configuration
 AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
 XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-25 15:34:20 +0000
+++ debian/changelog	2010-09-16 16:28:52 +0000
@@ -1,8 +1,12 @@
-utouch-geis (1.0.10-0ubuntu2) UNRELEASED; urgency=low
+utouch-geis (1.0.11-0ubuntu1) maverick; urgency=low
 
+  [ Ara Pulido ]
   * Added apport hook for utouch-geis (LP: #622817) 
 
- -- Ara Pulido <[e-mail]>  Wed, 25 Aug 2010 15:47:49 +0200
+  [ Stephen M. Webb ]
+  * New upstream release (LP: #640530)
+
+ -- Stephen M. Webb <[e-mail]>  Thu, 16 Sep 2010 12:10:13 -0400
 
 utouch-geis (1.0.10-0ubuntu1) maverick; urgency=low
 

=== modified file 'doc/Makefile.in'
--- doc/Makefile.in	2010-08-20 22:03:52 +0000
+++ doc/Makefile.in	2010-09-16 16:28:52 +0000
@@ -146,11 +146,15 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+X11XCB_CFLAGS = @X11XCB_CFLAGS@
+X11XCB_LIBS = @X11XCB_LIBS@
 XCBINCLUDEDIR = @XCBINCLUDEDIR@
 XCBPROTO_XCBINCLUDEDIR = @XCBPROTO_XCBINCLUDEDIR@
 XCBPROTO_XCBPYTHONDIR = @XCBPROTO_XCBPYTHONDIR@
 XCB_CFLAGS = @XCB_CFLAGS@
 XCB_LIBS = @XCB_LIBS@
+XI2_CFLAGS = @XI2_CFLAGS@
+XI2_LIBS = @XI2_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

=== modified file 'doc/geistest.1'
--- doc/geistest.1	2010-08-16 16:25:17 +0000
+++ doc/geistest.1	2010-09-16 16:28:52 +0000
@@ -1,10 +1,13 @@
 .TH geistest 1 "August 16, 2010" "" "geistest"
 
 .SH NAME
-geistest \- test operatoin of the GEIS API
+geistest \- test operation of the GEIS API
 
 .SH SYNOPSIS
-.B geistest windowid
+.B geistest [ 
+.B -w 
+.I windowid
+.B ]
 .br
 
 .SH DESCRIPTION
@@ -12,8 +15,23 @@
 .B geistest
 program. This program is a test driver for verifying the recognition and propagation of gestures through the GEIS API.
 
-
-.SH EXAMPLE
+.SH OPTIONS
+.IP -w
+Specifies the
+.I windowId
+of a specific window to associate with gestures.
+Particularly useful with touchscreens.
+
+The
+.I windowId
+can be determined using the program
+.BR xwininfo .
+
+If this argument is not set, the default action is to read gestures on all windows.
+
+.SH ENVIRONMENT
+.IP GEIS_DEBUG
+Enables GEIS library diagnostic messages on stderr.
 
 .SH "SEE ALSO"
-gesturetest(1)
\ No newline at end of file
+gesturetest(1)

=== modified file 'geis/Makefile.in'
--- geis/Makefile.in	2010-08-20 22:03:52 +0000
+++ geis/Makefile.in	2010-09-16 16:28:52 +0000
@@ -145,11 +145,15 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+X11XCB_CFLAGS = @X11XCB_CFLAGS@
+X11XCB_LIBS = @X11XCB_LIBS@
 XCBINCLUDEDIR = @XCBINCLUDEDIR@
 XCBPROTO_XCBINCLUDEDIR = @XCBPROTO_XCBINCLUDEDIR@
 XCBPROTO_XCBPYTHONDIR = @XCBPROTO_XCBPYTHONDIR@
 XCB_CFLAGS = @XCB_CFLAGS@
 XCB_LIBS = @XCB_LIBS@
+XI2_CFLAGS = @XI2_CFLAGS@
+XI2_LIBS = @XI2_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

=== modified file 'geis/geis.h'
--- geis/geis.h	2010-08-23 14:54:18 +0000
+++ geis/geis.h	2010-09-16 16:28:52 +0000
@@ -30,6 +30,28 @@
 #define GEIS_GESTURE_ROTATE  "Rotate"
 #define GEIS_GESTURE_TAP     "Tap"
 
+/* Gesture names for the Simplified Interface */
+#define GEIS_GESTURE_TYPE_DRAG1   "Drag,touch=1"
+#define GEIS_GESTURE_TYPE_DRAG2   "Drag,touch=2"
+#define GEIS_GESTURE_TYPE_DRAG3   "Drag,touch=3"
+#define GEIS_GESTURE_TYPE_DRAG4   "Drag,touch=4"
+#define GEIS_GESTURE_TYPE_DRAG5   "Drag,touch=5"
+#define GEIS_GESTURE_TYPE_PINCH1  "Pinch,touch=1"
+#define GEIS_GESTURE_TYPE_PINCH2  "Pinch,touch=2"
+#define GEIS_GESTURE_TYPE_PINCH3  "Pinch,touch=3"
+#define GEIS_GESTURE_TYPE_PINCH4  "Pinch,touch=4"
+#define GEIS_GESTURE_TYPE_PINCH5  "Pinch,touch=5"
+#define GEIS_GESTURE_TYPE_ROTATE1 "Rotate,touch=1"
+#define GEIS_GESTURE_TYPE_ROTATE2 "Rotate,touch=2"
+#define GEIS_GESTURE_TYPE_ROTATE3 "Rotate,touch=3"
+#define GEIS_GESTURE_TYPE_ROTATE4 "Rotate,touch=4"
+#define GEIS_GESTURE_TYPE_ROTATE5 "Rotate,touch=5"
+#define GEIS_GESTURE_TYPE_TAP1    "Tap,touch=1"
+#define GEIS_GESTURE_TYPE_TAP2    "Tap,touch=2"
+#define GEIS_GESTURE_TYPE_TAP3    "Tap,touch=3"
+#define GEIS_GESTURE_TYPE_TAP4    "Tap,touch=4"
+#define GEIS_GESTURE_TYPE_TAP5    "Tap,touch=5"
+
 /* Standard fundamental gesture attributes */
 #define GEIS_GESTURE_ATTRIBUTE_ANGLE            "angle"
 #define GEIS_GESTURE_ATTRIBUTE_ANGLE_DELTA      "angle delta"
@@ -43,7 +65,6 @@
 #define GEIS_GESTURE_ATTRIBUTE_DELTA_Y          "delta y"
 #define GEIS_GESTURE_ATTRIBUTE_DEVICE_ID        "device id"
 #define GEIS_GESTURE_ATTRIBUTE_EVENT_WINDOW_ID  "event window id"
-#define GEIS_GESTURE_ATTRIBUTE_FINGERS          "fingers"
 #define GEIS_GESTURE_ATTRIBUTE_FOCUS_X          "focus x"
 #define GEIS_GESTURE_ATTRIBUTE_FOCUS_Y          "focus y"
 #define GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME     "gesture name"
@@ -55,6 +76,7 @@
 #define GEIS_GESTURE_ATTRIBUTE_ROOT_WINDOW_ID   "root window id"
 #define GEIS_GESTURE_ATTRIBUTE_TAP_TIME         "tap time"
 #define GEIS_GESTURE_ATTRIBUTE_TIMESTAMP        "timestamp"
+#define GEIS_GESTURE_ATTRIBUTE_TOUCHES          "touches"
 #define GEIS_GESTURE_ATTRIBUTE_VELOCITY_X       "velocity x"
 #define GEIS_GESTURE_ATTRIBUTE_VELOCITY_Y       "velocity y"
 #define GEIS_GESTURE_ATTRIBUTE_TOUCH_0_ID       "touch 0 id"
@@ -271,7 +293,7 @@
  * @retval GEIS_STATUS_SUCCESS  normal successful completion
  */
 GEIS_API GeisStatus geis_input_devices(GeisInstance    geis_instance,
-                                       GeisInputFuncs  func,
+                                       GeisInputFuncs *func,
                                        void           *cookie);
 
 /* @} */

=== modified file 'libutouch-geis-xcb/Makefile.am'
--- libutouch-geis-xcb/Makefile.am	2010-08-23 14:54:15 +0000
+++ libutouch-geis-xcb/Makefile.am	2010-09-16 16:28:52 +0000
@@ -16,9 +16,10 @@
 
 libutouch_geis_la_SOURCES = \
 	geis.c \
-	geis_debug.h \
-	geis_xcb.h geis_xcb.c \
-	geis_instance.h geis_instance.c
+	geis_logging.h        geis_logging.c \
+	geis_instance.h       geis_instance.c \
+	geis_instance_table.h geis_instance_table.c \
+	geis_xcb.h            geis_xcb.c 
 
 dist_libutouch_geis_la_SOURCES = \
 	xcb_gesture.h xcb_gesture.c
@@ -29,15 +30,19 @@
 	-DGEIS_BUILDING_DSO=1 \
 	-I$(top_srcdir) \
 	$(GRAIL_CFLAGS) \
-	$(XCB_CFLAGS)
+	$(X11XCB_CFLAGS) \
+	$(XCB_CFLAGS) \
+	$(XI2_CFLAGS)
 
 libutouch_geis_la_LDFLAGS = \
 	-Wl,-z,defs -Wl,--as-needed \
-	-version-info 1:0:0 \
+	-version-info 1:1:0 \
 	-Wl,--version-script=$(version_script)
 
 libutouch_geis_la_LIBADD = \
-       $(XCB_LIBS)
+	$(X11XCB_LIBS) \
+	$(XCB_LIBS) \
+	$(XI2_LIBS)
 
 BUILT_SOURCES = $(dist_libutouch_geis_la_SOURCES)
 CLEANFILES = $(dist_libutouch_geis_la_SOURCES)

=== modified file 'libutouch-geis-xcb/Makefile.in'
--- libutouch-geis-xcb/Makefile.in	2010-08-20 22:03:52 +0000
+++ libutouch-geis-xcb/Makefile.in	2010-09-16 16:28:52 +0000
@@ -73,10 +73,13 @@
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(incdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libutouch_geis_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libutouch_geis_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libutouch_geis_la_OBJECTS = libutouch_geis_la-geis.lo \
-	libutouch_geis_la-geis_xcb.lo \
-	libutouch_geis_la-geis_instance.lo
+	libutouch_geis_la-geis_logging.lo \
+	libutouch_geis_la-geis_instance.lo \
+	libutouch_geis_la-geis_instance_table.lo \
+	libutouch_geis_la-geis_xcb.lo
 dist_libutouch_geis_la_OBJECTS = libutouch_geis_la-xcb_gesture.lo
 libutouch_geis_la_OBJECTS = $(am_libutouch_geis_la_OBJECTS) \
 	$(dist_libutouch_geis_la_OBJECTS)
@@ -173,6 +176,8 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+X11XCB_CFLAGS = @X11XCB_CFLAGS@
+X11XCB_LIBS = @X11XCB_LIBS@
 XCBINCLUDEDIR = @XCBINCLUDEDIR@
 XCBPROTO_XCBINCLUDEDIR = @XCBPROTO_XCBINCLUDEDIR@
 XCBPROTO_XCBPYTHONDIR = @XCBPROTO_XCBPYTHONDIR@
@@ -180,6 +185,8 @@
 # work around a problem with XCB tools
 XCB_CFLAGS = @XCB_CFLAGS@ -I$(includedir)/xcb -I$(XCBINCLUDEDIR)/xcb
 XCB_LIBS = @XCB_LIBS@
+XI2_CFLAGS = @XI2_CFLAGS@
+XI2_LIBS = @XI2_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -248,9 +255,10 @@
 lib_LTLIBRARIES = libutouch-geis.la
 libutouch_geis_la_SOURCES = \
 	geis.c \
-	geis_debug.h \
-	geis_xcb.h geis_xcb.c \
-	geis_instance.h geis_instance.c
+	geis_logging.h        geis_logging.c \
+	geis_instance.h       geis_instance.c \
+	geis_instance_table.h geis_instance_table.c \
+	geis_xcb.h            geis_xcb.c 
 
 dist_libutouch_geis_la_SOURCES = \
 	xcb_gesture.h xcb_gesture.c
@@ -261,15 +269,19 @@
 	-DGEIS_BUILDING_DSO=1 \
 	-I$(top_srcdir) \
 	$(GRAIL_CFLAGS) \
-	$(XCB_CFLAGS)
+	$(X11XCB_CFLAGS) \
+	$(XCB_CFLAGS) \
+	$(XI2_CFLAGS)
 
 libutouch_geis_la_LDFLAGS = \
 	-Wl,-z,defs -Wl,--as-needed \
-	-version-info 1:0:0 \
+	-version-info 1:1:0 \
 	-Wl,--version-script=$(version_script)
 
 libutouch_geis_la_LIBADD = \
-       $(XCB_LIBS)
+	$(X11XCB_LIBS) \
+	$(XCB_LIBS) \
+	$(XI2_LIBS)
 
 BUILT_SOURCES = $(dist_libutouch_geis_la_SOURCES)
 CLEANFILES = $(dist_libutouch_geis_la_SOURCES)
@@ -354,6 +366,8 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutouch_geis_la-geis.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutouch_geis_la-geis_instance.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutouch_geis_la-geis_instance_table.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutouch_geis_la-geis_logging.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutouch_geis_la-geis_xcb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutouch_geis_la-xcb_gesture.Plo@am__quote@
 
@@ -385,6 +399,27 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libutouch_geis_la-geis.lo `test -f 'geis.c' || echo '$(srcdir)/'`geis.c
 
+libutouch_geis_la-geis_logging.lo: geis_logging.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libutouch_geis_la-geis_logging.lo -MD -MP -MF $(DEPDIR)/libutouch_geis_la-geis_logging.Tpo -c -o libutouch_geis_la-geis_logging.lo `test -f 'geis_logging.c' || echo '$(srcdir)/'`geis_logging.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libutouch_geis_la-geis_logging.Tpo $(DEPDIR)/libutouch_geis_la-geis_logging.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='geis_logging.c' object='libutouch_geis_la-geis_logging.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libutouch_geis_la-geis_logging.lo `test -f 'geis_logging.c' || echo '$(srcdir)/'`geis_logging.c
+
+libutouch_geis_la-geis_instance.lo: geis_instance.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libutouch_geis_la-geis_instance.lo -MD -MP -MF $(DEPDIR)/libutouch_geis_la-geis_instance.Tpo -c -o libutouch_geis_la-geis_instance.lo `test -f 'geis_instance.c' || echo '$(srcdir)/'`geis_instance.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libutouch_geis_la-geis_instance.Tpo $(DEPDIR)/libutouch_geis_la-geis_instance.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='geis_instance.c' object='libutouch_geis_la-geis_instance.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libutouch_geis_la-geis_instance.lo `test -f 'geis_instance.c' || echo '$(srcdir)/'`geis_instance.c
+
+libutouch_geis_la-geis_instance_table.lo: geis_instance_table.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libutouch_geis_la-geis_instance_table.lo -MD -MP -MF $(DEPDIR)/libutouch_geis_la-geis_instance_table.Tpo -c -o libutouch_geis_la-geis_instance_table.lo `test -f 'geis_instance_table.c' || echo '$(srcdir)/'`geis_instance_table.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libutouch_geis_la-geis_instance_table.Tpo $(DEPDIR)/libutouch_geis_la-geis_instance_table.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='geis_instance_table.c' object='libutouch_geis_la-geis_instance_table.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libutouch_geis_la-geis_instance_table.lo `test -f 'geis_instance_table.c' || echo '$(srcdir)/'`geis_instance_table.c
+
 libutouch_geis_la-geis_xcb.lo: geis_xcb.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libutouch_geis_la-geis_xcb.lo -MD -MP -MF $(DEPDIR)/libutouch_geis_la-geis_xcb.Tpo -c -o libutouch_geis_la-geis_xcb.lo `test -f 'geis_xcb.c' || echo '$(srcdir)/'`geis_xcb.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libutouch_geis_la-geis_xcb.Tpo $(DEPDIR)/libutouch_geis_la-geis_xcb.Plo
@@ -392,13 +427,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libutouch_geis_la-geis_xcb.lo `test -f 'geis_xcb.c' || echo '$(srcdir)/'`geis_xcb.c
 
-libutouch_geis_la-geis_instance.lo: geis_instance.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libutouch_geis_la-geis_instance.lo -MD -MP -MF $(DEPDIR)/libutouch_geis_la-geis_instance.Tpo -c -o libutouch_geis_la-geis_instance.lo `test -f 'geis_instance.c' || echo '$(srcdir)/'`geis_instance.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libutouch_geis_la-geis_instance.Tpo $(DEPDIR)/libutouch_geis_la-geis_instance.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='geis_instance.c' object='libutouch_geis_la-geis_instance.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libutouch_geis_la-geis_instance.lo `test -f 'geis_instance.c' || echo '$(srcdir)/'`geis_instance.c
-
 libutouch_geis_la-xcb_gesture.lo: xcb_gesture.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutouch_geis_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libutouch_geis_la-xcb_gesture.lo -MD -MP -MF $(DEPDIR)/libutouch_geis_la-xcb_gesture.Tpo -c -o libutouch_geis_la-xcb_gesture.lo `test -f 'xcb_gesture.c' || echo '$(srcdir)/'`xcb_gesture.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libutouch_geis_la-xcb_gesture.Tpo $(DEPDIR)/libutouch_geis_la-xcb_gesture.Plo

=== modified file 'libutouch-geis-xcb/geis.c'
--- libutouch-geis-xcb/geis.c	2010-08-11 13:54:54 +0000
+++ libutouch-geis-xcb/geis.c	2010-09-16 16:28:52 +0000
@@ -20,9 +20,13 @@
 #include <geis/geis.h>
 
 #include "geis_instance.h"
+#include "geis_xcb.h"
 #include <stdlib.h>
 
 
+static GeisXcb s_geis_xcb = NULL;
+
+
 /**
  * @param[in]  win_info
  * @param[out] geis_instance
@@ -34,13 +38,19 @@
 geis_init(GeisWinInfo *win_info, GeisInstance *geis_instance)
 {
   *geis_instance = NULL;
+  GeisXcbWinInfo *xcb_win_info = (GeisXcbWinInfo*)win_info->win_info;
 
   if (win_info->win_type != GEIS_XCB_FULL_WINDOW)
   {
     return GEIS_BAD_ARGUMENT;
   }
 
-  *geis_instance = geis_instance_get((GeisXcbWinInfo*)win_info->win_info);
+  if (!s_geis_xcb)
+  {
+    s_geis_xcb = geis_xcb_new(xcb_win_info);
+  }
+
+  *geis_instance = geis_xcb_create_instance(s_geis_xcb, xcb_win_info->window_id);
   return GEIS_STATUS_SUCCESS;
 }
 
@@ -109,7 +119,7 @@
   switch (configuration_item)
   {
     case GEIS_CONFIG_UNIX_FD:
-      *(int *)value = geis_instance_fd(geis_instance);
+      *(int *)value = geis_xcb_fd(s_geis_xcb);
       status = GEIS_STATUS_SUCCESS;
       break;
   }
@@ -147,7 +157,7 @@
     return GEIS_BAD_ARGUMENT;
   }
 
-  geis_instance_event_dispatch(geis_instance);
+  geis_xcb_dispatch(s_geis_xcb);
   return GEIS_STATUS_SUCCESS;
 }
 
@@ -159,7 +169,7 @@
  */
 GeisStatus
 geis_input_devices(GeisInstance    geis_instance,
-                   GeisInputFuncs  funcs,
+                   GeisInputFuncs *funcs,
                    void           *cookie)
 {
   if (!geis_instance_is_valid(geis_instance))
@@ -167,7 +177,7 @@
     return GEIS_BAD_ARGUMENT;
   }
 
-  return GEIS_UNKNOWN_ERROR;
+  return geis_xcb_input_devices(s_geis_xcb, funcs, cookie);
 }
 
 
@@ -191,6 +201,7 @@
   }
 
   return geis_instance_subscribe(geis_instance,
+  				 s_geis_xcb,
                                  input_list,
                                  gesture_list,
                                  funcs,

=== removed file 'libutouch-geis-xcb/geis_debug.h'
--- libutouch-geis-xcb/geis_debug.h	2010-08-11 13:54:54 +0000
+++ libutouch-geis-xcb/geis_debug.h	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/**
- * @file geis_debug,h
- *
- * Copyright 2010 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option) any
- * later version.
- *
- * This library 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 Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-#ifndef GEIS_DEBUG_H_
-#define GEIS_DEBUG_H_
-
-#include <stdio.h>
-
-#define geis_debug printf
-
-#endif /* GEIS_DEBUG_H_ */

=== modified file 'libutouch-geis-xcb/geis_instance.c'
--- libutouch-geis-xcb/geis_instance.c	2010-08-11 13:54:54 +0000
+++ libutouch-geis-xcb/geis_instance.c	2010-09-16 16:28:52 +0000
@@ -19,17 +19,27 @@
  */
 #include "geis_instance.h"
 
+#include "geis_logging.h"
 #include <stdlib.h>
 
 
+/**
+ * Creates a new GeisInstance for an X11 windowId.
+ *
+ * @param[in] An X11 windowId.
+ *
+ * @returns a new GeisInstance or NULL on failure.
+ */
 GeisInstance
-geis_instance_get(GeisXcbWinInfo* win_info)
+geis_instance_new(uint32_t window_id)
 {
-  GeisInstance instance = calloc(1, sizeof(GeisInstance));
-  if (instance)
+  GeisInstance instance = calloc(1, sizeof(struct _GeisInstance));
+  if (!instance)
   {
-    instance->xcb = geis_xcb_get(win_info);
+    geis_error("allocating GeisInstance");
+    return NULL;
   }
+  instance->window_id = window_id;
   return instance;
 }
 
@@ -44,42 +54,52 @@
 int
 geis_instance_is_valid(GeisInstance instance)
 {
-  return (instance != 0 && instance->xcb != 0);
+  return (instance != 0 && instance->window_id != 0);
 }
 
 
 GeisStatus
 geis_instance_subscribe(GeisInstance         instance,
+                        GeisXcb              xcb,
                         GeisInputDeviceId   *input_list,
                         const char*         *gesture_list,
                         GeisGestureFuncs    *funcs,
                         void                *cookie)
 {
+  GeisStatus result = GEIS_UNKNOWN_ERROR;
   instance->gesture_funcs    = funcs;
   instance->gesture_cookie   = cookie;
-  return geis_xcb_subscribe(instance, gesture_list);
-}
-
-
-int
-geis_instance_fd(GeisInstance instance)
-{
-  if (instance == NULL)
-    return -1;
-    
-  return geis_xcb_fd(instance->xcb);
-}
-
-
-void
-geis_instance_event_dispatch(GeisInstance instance)
-{
-  geis_xcb_dispatch(instance);
+  if (input_list == GEIS_ALL_INPUT_DEVICES)
+  {
+    result = geis_xcb_subscribe(xcb, instance, 0, gesture_list);
+  }
+  else
+  {
+    GeisInputDeviceId *device_id = input_list;
+    for (; *device_id; ++device_id)
+    {
+      GeisStatus a_result = geis_xcb_subscribe(xcb, instance,
+                                               (uint16_t)*device_id,
+                                               gesture_list);
+      if (a_result == GEIS_STATUS_SUCCESS)
+      {
+	result = a_result;
+      }
+    }
+  }
+  return result;
+}
+
+
+uint32_t
+geis_instance_get_window_id(GeisInstance instance)
+{
+  return instance->window_id;
 }
 
 
 void
 geis_instance_free(GeisInstance instance)
 {
-  geis_xcb_free(instance->xcb);
+  free(instance);
 }

=== modified file 'libutouch-geis-xcb/geis_instance.h'
--- libutouch-geis-xcb/geis_instance.h	2010-08-23 14:54:18 +0000
+++ libutouch-geis-xcb/geis_instance.h	2010-09-16 16:28:52 +0000
@@ -26,31 +26,27 @@
 
 struct _GeisInstance
 {
-	GeisXcb             *xcb;
-	GeisInputCallback    input_callback;
-	void                *input_cookie;
-	GeisGestureFuncs    *gesture_funcs;
-	void                *gesture_cookie;
+  uint32_t          window_id;
+  GeisGestureFuncs *gesture_funcs;
+  void             *gesture_cookie;
 };
 
 /** @brief Constructs a GeisInstance. */
-GeisInstance geis_instance_get(GeisXcbWinInfo* win_info);
+GeisInstance geis_instance_new(uint32_t win_info);
+
 
 /** @brief Indicates if the GeisInstance is valid. */
 int geis_instance_is_valid(GeisInstance instance);
 
 /** @brief Subscribe to gestures. */
 GeisStatus geis_instance_subscribe(GeisInstance         instance,
+                                   GeisXcb              xcb,
                                    GeisInputDeviceId   *input_list,
                                    const char*         *gesture_list,
                                    GeisGestureFuncs    *funcs,
                                    void                *cookie);
 
-/** @brief Gets the event file descriptor. */
-int geis_instance_fd(GeisInstance instance);
-
-/** @brief Dispatches events. */
-void geis_instance_event_dispatch(GeisInstance instance);
+uint32_t geis_instance_get_window_id(GeisInstance instance);
 
 /** @brief Tears down the GeisInstance. */
 void geis_instance_free(GeisInstance instance);

=== added file 'libutouch-geis-xcb/geis_instance_table.c'
--- libutouch-geis-xcb/geis_instance_table.c	1970-01-01 00:00:00 +0000
+++ libutouch-geis-xcb/geis_instance_table.c	2010-09-16 16:28:52 +0000
@@ -0,0 +1,127 @@
+/**
+ * geis_instance_table.h
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library 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 Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA  02110-1301 US
+ */
+#include "geis_instance_table.h"
+
+#include "geis_instance.h"
+#include <stdlib.h>
+
+#define GROWTH_FACTOR 2
+
+
+typedef struct _GeisInstanceTableEntry
+{
+  uint32_t      id;
+  GeisInstance  type;
+} *GeisInstanceTableEntry;
+
+struct _GeisInstanceTable
+{
+  size_t                 capacity;
+  size_t                 size;
+  GeisInstanceTableEntry data;
+};
+
+
+GeisInstanceTable
+geis_instance_table_new(int size_hint)
+{
+  GeisInstanceTable table = malloc(sizeof(struct _GeisInstanceTable));
+  if (!table)
+  {
+    /* TODO: report error */
+  }
+
+  table->capacity = size_hint;
+  table->size = 0;
+  table->data = calloc(table->capacity,
+                       size_hint * sizeof(struct _GeisInstanceTableEntry));
+  if (!table->data)
+  {
+    /* TODO: report error */
+  }
+
+  return table;
+}
+
+
+/**
+ * Adds (or replaces) a gesture type in the table.
+ */
+void
+geis_instance_table_add(GeisInstanceTable table,
+                        GeisInstance      instance)
+{
+  size_t i;
+  uint32_t window_id = geis_instance_get_window_id(instance);
+
+  /* If the ID is already present, just replace the gesture type */
+  for (i = 0; i < table->size; ++i)
+  {
+    if (table->data[i].id == window_id)
+    {
+      table->data[i].type = instance;
+      return;
+    }
+  }
+
+  /* If there is no space to insert, grow the table. */
+  if (table->size >= table->capacity)
+  {
+    size_t new_capacity = table->capacity * GROWTH_FACTOR;
+    GeisInstanceTableEntry new_data = realloc(table->data,
+                               new_capacity * sizeof(struct _GeisInstanceTableEntry));
+    if (!new_data)
+    {
+      /* TODO: report error */
+    }
+
+    table->capacity = new_capacity;
+    table->data     = new_data;
+  }
+
+  table->data[table->size].id   = window_id;
+  table->data[table->size].type = instance;
+  ++table->size;
+}
+
+
+GeisInstance
+geis_instance_table_get(GeisInstanceTable table,
+                        uint32_t          window_id)
+{
+  size_t i;
+  for (i = 0; i < table->size; ++i)
+  {
+    if (table->data[i].id == window_id)
+    {
+      return table->data[i].type;
+    }
+  }
+  return NULL;
+}
+
+
+void
+geis_instance_table_free(GeisInstanceTable table)
+{
+  free(table->data);
+  free(table);
+}
+

=== added file 'libutouch-geis-xcb/geis_instance_table.h'
--- libutouch-geis-xcb/geis_instance_table.h	1970-01-01 00:00:00 +0000
+++ libutouch-geis-xcb/geis_instance_table.h	2010-09-16 16:28:52 +0000
@@ -0,0 +1,41 @@
+/**
+ * geis_instance_table.h
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library 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 Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA  02110-1301 US
+ */
+#ifndef GEIS_INSTANCE_TABLE_H_
+#define GEIS_INSTANCE_TABLE_H_
+
+#include "geis_config.h"
+#include <geis/geis.h>
+
+/**
+ * A map from XCB window IDs to geisInstances.
+ */
+typedef struct _GeisInstanceTable *GeisInstanceTable;
+
+GeisInstanceTable geis_instance_table_new(int size_hint);
+
+void geis_instance_table_add(GeisInstanceTable type_table,
+                             GeisInstance      instance);
+
+GeisInstance geis_instance_table_get(GeisInstanceTable type_table,
+                                     uint32_t          window_id);
+
+void geis_instance_table_free(GeisInstanceTable type_table);
+
+#endif /* GEIS_INSTANCE_TABLE_H_ */

=== added file 'libutouch-geis-xcb/geis_logging.c'
--- libutouch-geis-xcb/geis_logging.c	1970-01-01 00:00:00 +0000
+++ libutouch-geis-xcb/geis_logging.c	2010-09-16 16:28:52 +0000
@@ -0,0 +1,87 @@
+/**
+ * @file geis_logging.h
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library 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 Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+#include "geis_logging.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+static const char *prefix_format  = "GEIS(%s)-%s:%d ";
+static const char *debug_marker   = "debug";
+static const char *warning_marker = "warning";
+static const char *error_marker   = "error";
+
+
+static int
+reporting_level()
+{
+  char *level = getenv("GEIS_DEBUG");
+  if (level)
+  {
+    return atoi(level);
+  }
+  return 0;
+}
+
+static int
+level_is_enabled(int desired_level)
+{
+  static int level = -1;
+  if (level < 0)
+    level = reporting_level();
+  return level >= desired_level;
+}
+
+
+int
+_geis_message(int level, const char* function, int line, const char *format, ...)
+{
+  int count = 0;
+  if (level_is_enabled(level))
+  {
+    const char *marker = NULL;
+    switch (level)
+    {
+      case _GEIS_LOG_LEVEL_DEBUG:
+	marker = debug_marker;
+	break;
+      case _GEIS_LOG_LEVEL_WARNING:
+	marker = warning_marker;
+	break;
+      default:
+	marker = error_marker;
+	break;
+    }
+
+    fprintf(stderr, prefix_format, marker, function, line);
+
+    va_list ap;
+    va_start(ap, format);
+    count = vfprintf(stderr, format, ap);
+    va_end(ap);
+
+    fprintf(stderr, "\n");
+  }
+  return count;
+}
+
+

=== added file 'libutouch-geis-xcb/geis_logging.h'
--- libutouch-geis-xcb/geis_logging.h	1970-01-01 00:00:00 +0000
+++ libutouch-geis-xcb/geis_logging.h	2010-09-16 16:28:52 +0000
@@ -0,0 +1,64 @@
+/**
+ * @file geis_logging.h
+ * @brief internal GEIS debug/logging facilities
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library 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 Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+#ifndef GEIS_LOGGING_H_
+#define GEIS_LOGGING_H_
+
+/**
+ * @defgroup geis_logging GEIS Logging Facilities
+ *
+ * This facility allows the run-time delivery of debugging and error emssages
+ * from the library.  By default, no debug or error diagnostics are emitted by
+ * the library.  However, if the environment variable GEIS_DEBUG is set to an
+ * appropriate value, these diagnostic messages will be emitted to stderr.
+ *
+ * The following GEIS_DEBUG values are supported.
+ *
+ * GEIS_DEBUG=1  error messages only are emitted
+ * GEIS_DEBUG=2  error and warning messages are emitted
+ * GEIS_DEBUG=3  error, warning, and debug messages are emitted
+ *
+ * @{
+ */
+
+#define _GEIS_LOG_LEVEL_ERROR    1
+#define _GEIS_LOG_LEVEL_WARNING  2
+#define _GEIS_LOG_LEVEL_DEBUG    3
+
+/**
+ * Emits a message at the DEBUG logging level.
+ * @param[in] fmt printf-style format string
+ */
+#define geis_debug(...) _geis_message(_GEIS_LOG_LEVEL_DEBUG, \
+                                      __FUNCTION__, __LINE__, \
+                                      __VA_ARGS__)
+#define geis_warning(...) _geis_message(_GEIS_LOG_LEVEL_WARNING, \
+                                        __FUNCTION__, __LINE__, \
+                                        __VA_ARGS__)
+#define geis_error(...) _geis_message(_GEIS_LOG_LEVEL_ERROR, \
+                                      __FUNCTION__, __LINE__, \
+                                      __VA_ARGS__)
+int _geis_message(int level,
+                  const char *function, int line,
+                  const char *format, ...) __attribute__((format(printf, 4, 5)));
+
+/* @} */
+
+#endif /* GEIS_LOGGING_H_ */

=== modified file 'libutouch-geis-xcb/geis_xcb.c'
--- libutouch-geis-xcb/geis_xcb.c	2010-08-23 14:54:15 +0000
+++ libutouch-geis-xcb/geis_xcb.c	2010-09-16 16:28:52 +0000
@@ -19,12 +19,14 @@
  */
 #include "geis_xcb.h"
 
-#include "geis_debug.h"
 #include "geis_instance.h"
+#include "geis_instance_table.h"
+#include "geis_logging.h"
 #include <grail.h>
 #include <grail-types.h>
 #include <stdlib.h>
 #include <string.h>
+#include <X11/Xlib-xcb.h>
 #include <X11/X.h>
 #include "xcb_gesture.h"
 #include <xcb/xcb.h>
@@ -32,15 +34,12 @@
 struct _GeisXcb
 {
   GeisXcbWinInfo   *win_info;
+  Display          *display;
   xcb_connection_t *connection;
   int               fd;
-};
-
-static GeisXcb s_geis_xcb =
-{
-  NULL,
-  NULL,
-  -1
+  GeisInstanceTable instance_table;
+  GeisInputFuncs   *input_funcs;
+  void             *input_cookie;
 };
 
 typedef struct _GrailAttrMap
@@ -171,71 +170,182 @@
 
 static const GrailTypeMap s_grail_type_map[] =
 {
-  { GEIS_GESTURE_TYPE_DRAG,   GEIS_GESTURE_DRAG,   sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),  s_grail_drag_attrs    },
-  { GEIS_GESTURE_TYPE_PINCH,  GEIS_GESTURE_PINCH,  sizeof(s_grail_pinch_attrs) / sizeof(GrailAttrMap), s_grail_pinch_attrs   },
-  { GEIS_GESTURE_TYPE_ROTATE, GEIS_GESTURE_ROTATE, sizeof(s_grail_rotate_attrs) / sizeof(GrailAttrMap), s_grail_rotate_attrs  },
-  { GEIS_GESTURE_TYPE_TAP,    GEIS_GESTURE_TAP,    sizeof(s_grail_tap_attrs) / sizeof(GrailAttrMap),   s_grail_tap_attrs     },
-  { 0, 0, 0, 0 }
-};
-
-
-GeisGestureAttr s_name_attr =
-{
-  .name="name",
-  .type=GEIS_ATTR_TYPE_STRING
-};
-
-/**
- * Dispatches gesture events to the instance's callback.
- */
-static void
-geis_xcb_dispatch_gesture_type(GeisInstance instance,
-                               const char **gesture_list)
-{
-  if (gesture_list == GEIS_ALL_GESTURES)
-  {
-      const GrailTypeMap *type = s_grail_type_map;
-      for (; type->name; ++type)
-      {
-	s_name_attr.string_val = type->name;
-	if (instance->gesture_funcs &&
-	    instance->gesture_funcs->added)
-	{
-	  instance->gesture_funcs->added (instance->gesture_cookie,
-					  type->type,
-					  0,
-					  1, &s_name_attr);
-	}
-      }
-  }
-  else
-  {
-    const char **gesture = NULL;
-    for (gesture = gesture_list; *gesture; ++gesture)
-    {
-      const GrailTypeMap *type = s_grail_type_map;
-      for (; type->name; ++type)
-      {
-      	if (strcmp(type->name, *gesture) == 0)
-	{
-	  s_name_attr.string_val = type->name;
-	  if (instance->gesture_funcs && instance->gesture_funcs->added)
-	  {
-	    instance->gesture_funcs->added (instance->gesture_cookie,
-					    type->type,
-					    0,
-					    1, &s_name_attr);
-	  }
-
-	  break;
-	}
-      }
-    }
-  }
-}
+  {
+    GEIS_GESTURE_TYPE_DRAG,
+    GEIS_GESTURE_DRAG,
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  {
+    GEIS_GESTURE_TYPE_PINCH,
+    GEIS_GESTURE_PINCH,
+    sizeof(s_grail_pinch_attrs) / sizeof(GrailAttrMap),
+    s_grail_pinch_attrs
+  },
+  {
+    GEIS_GESTURE_TYPE_ROTATE,
+    GEIS_GESTURE_ROTATE,
+    sizeof(s_grail_rotate_attrs) / sizeof(GrailAttrMap),
+    s_grail_rotate_attrs
+  },
+  {
+    GEIS_GESTURE_TYPE_TAP,
+    GEIS_GESTURE_TAP,
+    sizeof(s_grail_tap_attrs) / sizeof(GrailAttrMap),
+    s_grail_tap_attrs
+  },
+  {
+    GRAIL_TYPE_DRAG2,
+    GEIS_GESTURE_TYPE_DRAG2,
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  {
+    GRAIL_TYPE_PINCH2,
+    GEIS_GESTURE_TYPE_PINCH2,
+    sizeof(s_grail_pinch_attrs) / sizeof(GrailAttrMap),
+    s_grail_pinch_attrs
+  },
+  {
+    GRAIL_TYPE_ROTATE2,
+    GEIS_GESTURE_TYPE_ROTATE2,
+    sizeof(s_grail_rotate_attrs) / sizeof(GrailAttrMap),
+    s_grail_rotate_attrs
+  },
+  {
+    GRAIL_TYPE_DRAG3,
+    GEIS_GESTURE_TYPE_DRAG3,
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  {
+    GRAIL_TYPE_PINCH3,
+    GEIS_GESTURE_TYPE_PINCH3,
+    sizeof(s_grail_pinch_attrs) / sizeof(GrailAttrMap),
+    s_grail_pinch_attrs
+  },
+  {
+    GRAIL_TYPE_ROTATE3,
+    GEIS_GESTURE_TYPE_ROTATE3,
+    sizeof(s_grail_rotate_attrs) / sizeof(GrailAttrMap),
+    s_grail_rotate_attrs
+  },
+  {
+    GRAIL_TYPE_DRAG4,
+    GEIS_GESTURE_TYPE_DRAG4,
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  {
+    GRAIL_TYPE_PINCH4,
+    GEIS_GESTURE_TYPE_PINCH4,
+    sizeof(s_grail_pinch_attrs) / sizeof(GrailAttrMap),
+    s_grail_pinch_attrs
+  },
+  {
+    GRAIL_TYPE_ROTATE4,
+    GEIS_GESTURE_TYPE_ROTATE4,
+    sizeof(s_grail_rotate_attrs) / sizeof(GrailAttrMap),
+    s_grail_rotate_attrs
+  },
+  {
+    GRAIL_TYPE_DRAG5,
+    GEIS_GESTURE_TYPE_DRAG5,
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  {
+    GRAIL_TYPE_PINCH5,
+    GEIS_GESTURE_TYPE_PINCH5,
+    sizeof(s_grail_pinch_attrs) / sizeof(GrailAttrMap),
+    s_grail_pinch_attrs
+  },
+  {
+    GRAIL_TYPE_ROTATE5,
+    GEIS_GESTURE_TYPE_ROTATE5,
+    sizeof(s_grail_rotate_attrs) / sizeof(GrailAttrMap),
+    s_grail_rotate_attrs
+  },
+  {
+    GRAIL_TYPE_TAP1,
+    GEIS_GESTURE_TYPE_TAP1,
+    sizeof(s_grail_tap_attrs) / sizeof(GrailAttrMap),
+    s_grail_tap_attrs
+  },
+  {
+    GRAIL_TYPE_TAP2,
+    GEIS_GESTURE_TYPE_TAP2,
+    sizeof(s_grail_tap_attrs) / sizeof(GrailAttrMap),
+    s_grail_tap_attrs
+  },
+  {
+    GRAIL_TYPE_TAP3,
+    GEIS_GESTURE_TYPE_TAP3,
+    sizeof(s_grail_tap_attrs) / sizeof(GrailAttrMap),
+    s_grail_tap_attrs
+  },
+  {
+    GRAIL_TYPE_TAP4,
+    GEIS_GESTURE_TYPE_TAP4,
+    sizeof(s_grail_tap_attrs) / sizeof(GrailAttrMap),
+    s_grail_tap_attrs
+  },
+  {
+    GRAIL_TYPE_TAP5,
+    GEIS_GESTURE_TYPE_TAP5,
+    sizeof(s_grail_tap_attrs) / sizeof(GrailAttrMap),
+    s_grail_tap_attrs
+  },
+  // special (undocumented) gestures available in Grail
+  {
+    GRAIL_TYPE_EDRAG,
+    "EDrag",
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  {
+    GRAIL_TYPE_EPINCH,
+    "EPinch",
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  {
+    GRAIL_TYPE_EROTATE,
+    "ERotate",
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  {
+    GRAIL_TYPE_MDRAG,
+    "MDrag",
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  {
+    GRAIL_TYPE_MPINCH,
+    "MPinch",
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  {
+    GRAIL_TYPE_MROTATE,
+    "MRotate",
+    sizeof(s_grail_drag_attrs) / sizeof(GrailAttrMap),
+    s_grail_drag_attrs
+  },
+  { 0, NULL, 0, NULL }
+};
+
+
+
+GeisGestureAttr s_name_attr[2] =
+{
+  { GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME, GEIS_ATTR_TYPE_STRING, 0 },
+  { GEIS_GESTURE_ATTRIBUTE_TOUCHES, GEIS_ATTR_TYPE_INTEGER, 0 }
+};
 
 static GeisInteger
-geis_xcb_determine_gesture_type(int xcb_gesture_type)
+geis_xcb_determine_primitive_type(int xcb_gesture_type)
 {
   switch (xcb_gesture_type)
   {
@@ -322,6 +432,75 @@
   return 0;
 }
 
+static const char *
+geis_xcb_get_gesture_type_primitive_name(GeisInteger gesture_type)
+{
+  GeisInteger primitive_type = geis_xcb_determine_primitive_type(gesture_type);
+  const GrailTypeMap *type = s_grail_type_map;
+  for (; type->name; ++type)
+  {
+    if (type->type == primitive_type)
+    {
+      return type->name;
+    }
+  }
+  return "unknown";
+}
+
+/**
+ * Dispatches gesture events to the instance's callback.
+ */
+static void
+geis_xcb_dispatch_gesture_type(GeisInstance instance,
+                               const char **gesture_list)
+{
+  if (gesture_list == GEIS_ALL_GESTURES)
+  {
+      const GrailTypeMap *type = s_grail_type_map;
+      for (; type->name; ++type)
+      {
+	s_name_attr[0].string_val = 
+	      geis_xcb_get_gesture_type_primitive_name(type->type);
+	s_name_attr[1].integer_val = geis_xcb_determine_fingers(type->type);
+	if (instance->gesture_funcs && instance->gesture_funcs->added)
+	{
+	  instance->gesture_funcs->added(instance->gesture_cookie,
+	                                 type->type,
+	                                 0,
+	                                 sizeof(s_name_attr) / sizeof(GeisGestureAttr),
+	                                 s_name_attr);
+	}
+      }
+  }
+  else
+  {
+    const char **gesture = NULL;
+    for (gesture = gesture_list; *gesture; ++gesture)
+    {
+      const GrailTypeMap *type = s_grail_type_map;
+      for (; type->name; ++type)
+      {
+	if (strcmp(type->name, *gesture) == 0)
+	{
+	  s_name_attr[0].string_val = 
+	      geis_xcb_get_gesture_type_primitive_name(type->type);
+	  s_name_attr[1].integer_val = geis_xcb_determine_fingers(type->type);
+	  if (instance->gesture_funcs && instance->gesture_funcs->added)
+	  {
+	    instance->gesture_funcs->added(instance->gesture_cookie,
+	                                   type->type,
+	                                   0,
+	                                   sizeof(s_name_attr) / sizeof(GeisGestureAttr),
+	                                   s_name_attr);
+	  }
+
+	  break;
+	}
+      }
+    }
+  }
+}
+
 /**
  * Dispatches gesture events to the instance's callback.
  */
@@ -332,7 +511,7 @@
   static const int num_standard_attrs = 9;
   int num_attrs = num_standard_attrs + event->num_props;
   float *properties = NULL;
-  GeisInteger gesture_type = geis_xcb_determine_gesture_type(event->gesture_type);
+  GeisInteger gesture_type = geis_xcb_determine_primitive_type(event->gesture_type);
 
   GeisGestureAttr *attrs = calloc(num_attrs, sizeof(GeisGestureAttr));
   if (!attrs)
@@ -362,7 +541,7 @@
   attrs[6].type = GEIS_ATTR_TYPE_FLOAT;
   attrs[6].float_val = event->focus_y;
 
-  attrs[8].name = GEIS_GESTURE_ATTRIBUTE_FINGERS;
+  attrs[8].name = GEIS_GESTURE_ATTRIBUTE_TOUCHES;
   attrs[8].type = GEIS_ATTR_TYPE_INTEGER;
   attrs[8].integer_val = geis_xcb_determine_fingers(event->gesture_type);
 
@@ -442,82 +621,114 @@
 }
 
 
-/**
- * @param[in] win_info
- */
-GeisXcb *
-geis_xcb_get(GeisXcbWinInfo *win_info)
-{
-  if (!s_geis_xcb.connection)
-  {
-    xcb_generic_error_t *error;
-
-    s_geis_xcb.win_info = win_info;
-    s_geis_xcb.connection = xcb_connect(win_info->display_name,
-                                        win_info->screenp);
-    if (!s_geis_xcb.connection)
-    {
-      geis_debug("error connecting to X server.");
-      return NULL;
-    }
-
-#if 0
-    {
-      char buffer[128];
-      xcb_input_get_extension_version_cookie_t input_version_cookie;
-
-      input_version_cookie = xcb_input_get_extension_version(s_geis_xcb.connection,
-                                                             127,
-                                                             buffer);
-    }
-#endif
-
-    {
-      xcb_gesture_query_version_cookie_t  version_cookie;
-      xcb_gesture_query_version_reply_t  *version_reply = NULL;
-
-      version_cookie = xcb_gesture_query_version(s_geis_xcb.connection,
-                                                 XCB_GESTURE_MAJOR_VERSION,
-                                                 XCB_GESTURE_MINOR_VERSION);
-      version_reply = xcb_gesture_query_version_reply(s_geis_xcb.connection,
-                                                      version_cookie,
-                                                      &error);
-      if (!version_reply)
-      {
-	geis_debug("failed to receive gesture version reply\n");
-	return NULL;
-      }
-
-      if (version_reply->major_version != XCB_GESTURE_MAJOR_VERSION
-       && version_reply->minor_version != XCB_GESTURE_MINOR_VERSION)
-      {
-	geis_debug("server supports unrecognized version: %d.%d\n",
-	           version_reply->major_version, version_reply->minor_version);
-	return NULL;
-      }
-
-     free(version_reply);
-    }
-
-
-    s_geis_xcb.fd = xcb_get_file_descriptor(s_geis_xcb.connection);
-  }
-
-  return &s_geis_xcb;
-}
-
-
+GeisXcb
+geis_xcb_new(GeisXcbWinInfo *win_info)
+{
+  GeisXcb xcb = calloc(1, sizeof(struct _GeisXcb));
+  if (!xcb)
+  {
+    geis_error("error allocating GeisXcb");
+    return NULL;
+  }
+
+  xcb->win_info = win_info;
+  xcb->display = XOpenDisplay(win_info->display_name);
+  if (!xcb->display)
+  {
+    geis_error("error opening X server.");
+    goto error_exit;
+  }
+
+  xcb->connection = XGetXCBConnection(xcb->display);
+  if (!xcb->connection)
+  {
+    geis_error("error connecting to X server.");
+    goto error_exit;
+  }
+
+  {
+    xcb_gesture_query_version_cookie_t  version_cookie;
+    xcb_gesture_query_version_reply_t  *version_reply = NULL;
+    xcb_generic_error_t                *error = NULL;
+
+    version_cookie = xcb_gesture_query_version(xcb->connection,
+                                               XCB_GESTURE_MAJOR_VERSION,
+                                               XCB_GESTURE_MINOR_VERSION);
+    version_reply = xcb_gesture_query_version_reply(xcb->connection,
+                                                    version_cookie,
+                                                    &error);
+    if (!version_reply)
+    {
+      geis_error("failed to receive gesture version reply\n");
+      goto error_exit;
+    }
+
+    if (version_reply->major_version != XCB_GESTURE_MAJOR_VERSION
+     && version_reply->minor_version != XCB_GESTURE_MINOR_VERSION)
+    {
+      geis_error("server supports unrecognized version: %d.%d\n",
+                 version_reply->major_version, version_reply->minor_version);
+    }
+
+   free(version_reply);
+  }
+
+
+  xcb->fd = xcb_get_file_descriptor(xcb->connection);
+  xcb->instance_table = geis_instance_table_new(1);
+  if (!xcb->instance_table)
+  {
+    geis_error("error constructing instance table");
+    goto error_exit;
+  }
+
+  goto final_exit;
+
+error_exit:
+  free(xcb);
+
+final_exit:
+  return xcb;
+}
+
+
+/**
+ * Create a new GeisInstance for a windowId.
+ *
+ * @param[in] An X11 windowId.
+ */
+GeisInstance
+geis_xcb_create_instance(GeisXcb xcb, uint32_t window_id)
+{
+  GeisInstance instance = geis_instance_new(window_id);
+  if (!instance)
+  {
+    geis_error("failure to create GeisInstance");
+  }
+  else
+  {
+    geis_instance_table_add(xcb->instance_table, instance);
+  }
+  return instance;
+}
+
+
+/**
+ * Gets the file description on which events will appear.
+ */
 int
-geis_xcb_fd(GeisXcb *xcb)
+geis_xcb_fd(GeisXcb xcb)
 {
-	return xcb->fd;
+  return xcb->fd;
 }
 
 
+/**
+ * Dispatches events.
+ */
 void
-geis_xcb_dispatch(GeisInstance instance)
+geis_xcb_dispatch(GeisXcb xcb)
 {
-  GeisXcb *xcb = instance->xcb;
   if (xcb->connection)
   {
     const xcb_query_extension_reply_t *extension_info;
@@ -528,27 +739,37 @@
     {
       xcb_gesture_notify_event_t *gesture_event = NULL;
       if (event->response_type != GenericEvent) {
-	geis_debug("warning: Received non-generic event type: %d\n",
-	           event->response_type);
+	geis_warning("received non-generic event type: %d\n",
+	             event->response_type);
 	continue;
       }
 
       gesture_event = (xcb_gesture_notify_event_t*)event;
       if (gesture_event->extension != extension_info->major_opcode)
       {
-	geis_debug("warning: Received non-gesture extension event: %d\n",
-	           gesture_event->extension);
+	geis_warning("received non-gesture extension event: %d\n",
+	             gesture_event->extension);
 	continue;
       }
 
       if (gesture_event->event_type != XCB_GESTURE_NOTIFY)
       {
-	geis_debug("warning: Received unrecognized gesture event type: %d\n",
-	           gesture_event->event_type);
+	geis_warning("received unrecognized gesture event type: %d\n",
+	             gesture_event->event_type);
 	continue;
       }
 
-      geis_xcb_dispatch_gesture(instance, gesture_event);
+      GeisInstance instance = geis_instance_table_get(xcb->instance_table,
+                                                      gesture_event->event);
+      if (!instance)
+      {
+	geis_error("no instance found for window_id 0x%08x\n",
+	           gesture_event->event);
+      }
+      else
+      {
+	geis_xcb_dispatch_gesture(instance, gesture_event);
+      }
 
       event = xcb_poll_for_event(xcb->connection);
     }
@@ -557,89 +778,183 @@
 
 
 void
-geis_xcb_free(GeisXcb* xcb)
+geis_xcb_free(GeisXcb xcb)
 {
   xcb_disconnect(xcb->connection);
+  XCloseDisplay(xcb->display);
+}
+
+
+static void
+geis_xcb_map_gestures_to_mask(const char **gesture_list,
+                              uint32_t **gesture_mask,
+                              uint32_t *gesture_mask_len)
+{
+  *gesture_mask_len = 1;
+  *gesture_mask = calloc(sizeof(uint32_t), *gesture_mask_len);
+  if (!gesture_mask)
+    return;
+
+  const char **g = gesture_list;
+  if (g == GEIS_ALL_GESTURES)
+  {
+    uint32_t all = 0xffffffff;
+    memcpy(*gesture_mask, &all, sizeof(uint32_t));
+  }
+  else
+  {
+    while (*g)
+    {
+      const GrailTypeMap *type = s_grail_type_map;
+      for (; type->name; ++type)
+      {
+	if (strcmp(type->name, *g) == 0)
+	{
+	  if (type->type < 32)
+	  {
+	    **gesture_mask |= (1 << type->type);
+	  }
+	  break;
+	}
+      }
+      ++g;
+    }
+  }
+}
+
+
+static GeisStatus
+geis_xcb_verify_event_selection(GeisXcb   xcb,
+                                uint32_t  window_id,
+                                uint16_t  device_id,
+                                uint32_t  mask_len,
+                                uint32_t *mask)
+{
+  GeisStatus                                result = GEIS_UNKNOWN_ERROR;
+  xcb_generic_error_t                      *error;
+  xcb_gesture_get_selected_events_cookie_t  events_cookie;
+  xcb_gesture_get_selected_events_reply_t  *events_reply = NULL;
+  xcb_gesture_event_mask_iterator_t         event_mask_it;
+  uint32_t                                  mask_len_reply = 0;
+  uint32_t                                 *mask_reply = NULL;
+  int                                       device_is_found = 0;
+
+  events_cookie = xcb_gesture_get_selected_events(xcb->connection,
+                                                  window_id);
+  events_reply = xcb_gesture_get_selected_events_reply(xcb->connection,
+                                                       events_cookie,
+                                                       &error);
+  if (!events_reply)
+  {
+    geis_error("failed to receive selected events reply\n");
+    goto really_done;
+  }
+
+  for (event_mask_it = xcb_gesture_get_selected_events_masks_iterator(events_reply);
+       event_mask_it.rem;
+       xcb_gesture_event_mask_next(&event_mask_it))
+  {
+    xcb_gesture_event_mask_t *event_mask = event_mask_it.data;
+    if (event_mask->device_id == device_id)
+    {
+      mask_len_reply = xcb_gesture_event_mask_mask_data_length(event_mask);
+      if (mask_len_reply != mask_len)
+      {
+	geis_error("incorrect mask length returned by server - expected %d, got %d\n",
+	           mask_len, mask_len_reply);
+	goto done;
+      }
+
+      mask_reply = xcb_gesture_event_mask_mask_data(event_mask);
+      if (memcmp(mask, mask_reply, mask_len * 4) != 0)
+      {
+	geis_error("incorrect mask returned by server\n");
+	goto done;
+      }
+
+      device_is_found = 1;
+    }
+  }
+
+  if (!device_is_found)
+  {
+    geis_error("gesture mask for device %d not returned by server\n", device_id);
+    goto done;
+  }
+
+  result = GEIS_STATUS_SUCCESS;
+done:
+  free(events_reply);
+really_done:
+  return result;
 }
 
 
 GeisStatus
-geis_xcb_subscribe(GeisInstance   instance,
+geis_xcb_subscribe(GeisXcb        xcb,
+                   GeisInstance   instance,
+                   uint16_t       device_id,
                    const char   **gesture_list)
 {
-  uint16_t device_id = 0; //< temporary for dev testing
-  uint32_t mask_len = 1; //< temporary for dev testing
-  uint32_t mask[] = { 0xffffffff }; //< temporary for dev testing
-
-  xcb_generic_error_t *error;
-  xcb_void_cookie_t select_cookie;
-  GeisXcb *xcb = instance->xcb;
-
-  geis_xcb_dispatch_gesture_type(instance, gesture_list);
+  GeisStatus            result = GEIS_UNKNOWN_ERROR;
+  uint32_t              mask_len = 1;
+  uint32_t             *mask = 0;
+  const char          **g;
+  xcb_generic_error_t  *error;
+  xcb_void_cookie_t     select_cookie;
+  xcb_window_t          window_id = geis_instance_get_window_id(instance);
+
+  if (gesture_list == GEIS_ALL_GESTURES)
+  {
+    geis_debug("subscribing device %d for the all gestures\n", device_id);
+  }
+  else
+  {
+    geis_debug("subscribing device %d for the following gestures:\n", device_id);
+    for (g = gesture_list; *g; ++g)
+    {
+      geis_debug("\t\"%s\"\n", *g);
+    }
+  }
+
+  geis_xcb_map_gestures_to_mask(gesture_list, &mask, &mask_len);
+  if (!mask)
+  {
+    geis_error("failed to allocate mask\n");
+    goto really_done;
+  }
 
   select_cookie = xcb_gesture_select_events_checked(xcb->connection,
-						    xcb->win_info->window_id,
-						    device_id,
-						    mask_len,
-						    mask);
+                                                    window_id,
+                                                    device_id,
+                                                    mask_len,
+                                                    mask);
   error = xcb_request_check(xcb->connection, select_cookie);
   if (error)
   {
-    geis_debug("failed to select events\n");
-    return GEIS_UNKNOWN_ERROR;
+    geis_error("failed to select events for window 0x%08x\n", window_id);
+    goto done;
   }
 
+  result = geis_xcb_verify_event_selection(xcb, window_id, device_id, mask_len, mask);
+  if (result == GEIS_STATUS_SUCCESS)
   {
-    xcb_gesture_get_selected_events_cookie_t  events_cookie;
-    xcb_gesture_get_selected_events_reply_t  *events_reply = NULL;
-    xcb_gesture_event_mask_iterator_t         events_iterator;
-    unsigned masks_len_reply = 0;
-    unsigned mask_len_reply = 0;
-    uint32_t *mask_reply;
-
-    events_cookie = xcb_gesture_get_selected_events(xcb->connection,
-						    xcb->win_info->window_id);
-    events_reply = xcb_gesture_get_selected_events_reply(xcb->connection,
-							 events_cookie,
-							 &error);
-    if (!events_reply)
-    {
-      geis_debug("failed to receive selected events reply\n");
-      return GEIS_UNKNOWN_ERROR;
-    }
-
-    masks_len_reply = xcb_gesture_get_selected_events_masks_length(events_reply);
-    if (masks_len_reply != 1)
-    {
-      geis_debug("wrong selected masks length returned: %d\n", masks_len_reply);
-      return GEIS_UNKNOWN_ERROR;
-    }
-
-    events_iterator = xcb_gesture_get_selected_events_masks_iterator(events_reply);
-    if (events_iterator.data->device_id != device_id)
-    {
-      geis_debug("incorrect device id returned by server: %d\n",
-                 events_iterator.data->device_id);
-      return GEIS_UNKNOWN_ERROR;
-    }
-
-    mask_len_reply = xcb_gesture_event_mask_mask_data_length(events_iterator.data);
-    if (mask_len_reply != mask_len)
-    {
-      geis_debug("incorrect mask length returned by server: %d\n",
-                 mask_len_reply);
-      return GEIS_UNKNOWN_ERROR;
-    }
-
-    mask_reply = xcb_gesture_event_mask_mask_data(events_iterator.data);
-    if (memcmp(mask, mask_reply, mask_len * 4) != 0)
-    {
-      geis_debug("incorrect mask returned by server\n");
-      return GEIS_UNKNOWN_ERROR;
-    }
-
-    free(events_reply);
+    geis_xcb_dispatch_gesture_type(instance, gesture_list);
   }
 
+done:
+  free(mask);
+really_done:
+  return result;
+}
+
+
+GeisStatus
+geis_xcb_input_devices(GeisXcb xcb, GeisInputFuncs *funcs, void *cookie)
+{
+  xcb->input_funcs  = funcs;
+  xcb->input_cookie = cookie;
   return GEIS_STATUS_SUCCESS;
 }
+
+

=== modified file 'libutouch-geis-xcb/geis_xcb.h'
--- libutouch-geis-xcb/geis_xcb.h	2010-08-11 13:54:54 +0000
+++ libutouch-geis-xcb/geis_xcb.h	2010-09-16 16:28:52 +0000
@@ -4,18 +4,18 @@
  * Copyright 2010 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
  * This library 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 Lesser General Public License for
- * more details.
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 #ifndef GEIS_XCB_H_
 #define GEIS_XCB_H_
@@ -23,17 +23,25 @@
 #include "geis_config.h"
 #include <geis/geis.h>
 
-typedef struct _GeisXcb GeisXcb;
-
-GeisXcb *geis_xcb_get(GeisXcbWinInfo *win_info);
-
-GeisStatus geis_xcb_subscribe(GeisInstance instance,
+typedef struct _GeisXcb *GeisXcb;
+
+GeisXcb geis_xcb_new(GeisXcbWinInfo *win_info);
+
+GeisInstance geis_xcb_create_instance(GeisXcb xcb, uint32_t window_id);
+
+GeisStatus geis_xcb_input_devices(GeisXcb         xcb,
+                                  GeisInputFuncs *funcs,
+                                  void           *cookie);
+
+GeisStatus geis_xcb_subscribe(GeisXcb      xcb,
+                              GeisInstance instance,
+                              uint16_t     device_id,
                               const char **gesture_list);
 
-int geis_xcb_fd(GeisXcb* xcb);
-
-void geis_xcb_dispatch(GeisInstance instance);
-
-void geis_xcb_free(GeisXcb *xcb);
+int geis_xcb_fd(GeisXcb xcb);
+
+void geis_xcb_dispatch(GeisXcb xcb);
+
+void geis_xcb_free(GeisXcb xcb);
 
 #endif /* GEIS_XCB_H_ */

=== modified file 'testsuite/Makefile.in'
--- testsuite/Makefile.in	2010-08-20 22:03:52 +0000
+++ testsuite/Makefile.in	2010-09-16 16:28:52 +0000
@@ -158,11 +158,15 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+X11XCB_CFLAGS = @X11XCB_CFLAGS@
+X11XCB_LIBS = @X11XCB_LIBS@
 XCBINCLUDEDIR = @XCBINCLUDEDIR@
 XCBPROTO_XCBINCLUDEDIR = @XCBPROTO_XCBINCLUDEDIR@
 XCBPROTO_XCBPYTHONDIR = @XCBPROTO_XCBPYTHONDIR@
 XCB_CFLAGS = @XCB_CFLAGS@
 XCB_LIBS = @XCB_LIBS@
+XI2_CFLAGS = @XI2_CFLAGS@
+XI2_LIBS = @XI2_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

=== modified file 'testsuite/geistest/Makefile.in'
--- testsuite/geistest/Makefile.in	2010-08-20 22:03:52 +0000
+++ testsuite/geistest/Makefile.in	2010-09-16 16:28:52 +0000
@@ -141,11 +141,15 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+X11XCB_CFLAGS = @X11XCB_CFLAGS@
+X11XCB_LIBS = @X11XCB_LIBS@
 XCBINCLUDEDIR = @XCBINCLUDEDIR@
 XCBPROTO_XCBINCLUDEDIR = @XCBPROTO_XCBINCLUDEDIR@
 XCBPROTO_XCBPYTHONDIR = @XCBPROTO_XCBPYTHONDIR@
 XCB_CFLAGS = @XCB_CFLAGS@
 XCB_LIBS = @XCB_LIBS@
+XI2_CFLAGS = @XI2_CFLAGS@
+XI2_LIBS = @XI2_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

=== modified file 'testsuite/geistest/geistest.c'
--- testsuite/geistest/geistest.c	2010-08-11 13:54:54 +0000
+++ testsuite/geistest/geistest.c	2010-09-16 16:28:52 +0000
@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/select.h>
+#include <unistd.h>
+#include <xcb/xcb.h>
 
 
 static void
@@ -51,6 +53,24 @@
 
 
 static void
+input_device_added(void *cookie, GeisInputDeviceId device_id, void *attrs)
+{
+}
+
+
+static void
+input_device_changed(void *cookie, GeisInputDeviceId device_id, void *attrs)
+{
+}
+
+
+static void
+input_device_removed(void *cookie, GeisInputDeviceId device_id, void *attrs)
+{
+}
+
+
+static void
 gesture_added(void            *cookie,
 	      GeisGestureType  gesture_type,
 	      GeisGestureId    gesture_id,
@@ -116,6 +136,12 @@
 }
 
 
+GeisInputFuncs input_funcs = {
+  input_device_added,
+  input_device_changed,
+  input_device_removed
+};
+
 GeisGestureFuncs gesture_funcs = {
   gesture_added,
   gesture_removed,
@@ -128,22 +154,33 @@
 int
 parse_opts(int argc, char* argv[], uint32_t *window_id)
 {
-  if (argc != 2)
-    return 0;
-
-  *window_id = strtol(argv[1], NULL, 0);
+  int opt;
+
+  while ((opt = getopt(argc, argv, "w:")) != -1)
+  {
+    switch (opt)
+    {
+      case 'w':
+	*window_id = strtol(optarg, NULL, 0);
+	break;
+
+      default:
+      	return 0;
+    }
+  }
+
   return 1;
 }
 
 
-int
-main(int argc, char* argv[])
+static GeisInstance
+subscribe_window(uint32_t window_id)
 {
   GeisStatus status = GEIS_UNKNOWN_ERROR;
   GeisXcbWinInfo xcb_win_info = {
     .display_name  = NULL,
     .screenp       = NULL,
-    .window_id     = 0x296
+    .window_id     = window_id
   };
   GeisWinInfo win_info = {
     GEIS_XCB_FULL_WINDOW,
@@ -151,32 +188,18 @@
   };
   GeisInstance instance;
 
-  if (!parse_opts(argc, argv, &xcb_win_info.window_id))
-  {
-    fprintf(stderr, "usage: %s windowid\n", argv[0]);
-    return -1;
-  }
-
   status = geis_init(&win_info, &instance);
   if (status != GEIS_STATUS_SUCCESS)
   {
     fprintf(stderr, "error in geis_init\n");
-    return 1;
-  }
-
-  status = geis_configuration_supported(instance, GEIS_CONFIG_UNIX_FD);
-  if (status != GEIS_STATUS_SUCCESS)
-  {
-    fprintf(stderr, "GEIS does not support Unix fd\n");
-    return 1;
-  }
-
-  int fd = -1;
-  status = geis_configuration_get_value(instance, GEIS_CONFIG_UNIX_FD, &fd);
-  if (status != GEIS_STATUS_SUCCESS)
-  {
-    fprintf(stderr, "error retrieving GEIS fd\n");
-    return 1;
+    return NULL;
+  }
+
+  status = geis_input_devices(instance, &input_funcs, NULL);
+  if (status != GEIS_STATUS_SUCCESS)
+  {
+    fprintf(stderr, "error subscribing to input devices\n");
+    return NULL;
   }
 
   status = geis_subscribe(instance,
@@ -187,7 +210,155 @@
   if (status != GEIS_STATUS_SUCCESS)
   {
     fprintf(stderr, "error subscribing to gestures\n");
-    return 1;
+    return NULL;
+  }
+
+  return instance;
+}
+
+
+static size_t
+subscribe_windows_preorder(xcb_connection_t *xcb,
+                           xcb_window_t      window,
+                           size_t            instance_table_size,
+                           GeisInstance    **instance_table)
+{
+  ++instance_table_size;
+  GeisInstance  *new_instance_table;
+  new_instance_table = realloc(*instance_table,
+                               instance_table_size * sizeof(GeisInstance));
+  new_instance_table[instance_table_size-1] = subscribe_window(window);
+  if (!new_instance_table[instance_table_size-1])
+  {
+    fprintf(stderr, "error creating geis instance for window 0x%08x\n", window);
+    free(new_instance_table);
+    instance_table_size = 0;
+    goto error_exit;
+  }
+
+  xcb_generic_error_t *error;
+  xcb_query_tree_cookie_t tree_cookie = xcb_query_tree(xcb, window);
+  xcb_query_tree_reply_t *tree_reply = xcb_query_tree_reply(xcb,
+                                                            tree_cookie,
+                                                            &error);
+  if (!tree_reply)
+  {
+    fprintf(stderr, "failed to query tree for window 0x%x\n", window);
+    goto error_exit;
+  }
+
+  int num_children = xcb_query_tree_children_length(tree_reply);
+  if (num_children <= 0)
+    goto tree_exit;
+
+  xcb_window_t *children = xcb_query_tree_children(tree_reply);
+  if (!children)
+  {
+    fprintf(stderr, "failed to retrieve children of window 0x%x\n", window);
+    goto tree_exit;
+  }
+
+  int i;
+  for (i = 0; i < num_children; i++)
+  {
+    instance_table_size = subscribe_windows_preorder(xcb,
+                                                     children[i],
+                                                     instance_table_size,
+                                                     &new_instance_table);
+    if (instance_table_size == 0)
+      break;
+  }
+  
+tree_exit:
+  free(tree_reply);
+error_exit:
+  *instance_table = new_instance_table;
+  return instance_table_size;
+}
+
+
+static size_t
+subscribe_all_windows(GeisInstance **instance_table)
+{
+  int instance_table_size = 0;
+
+  xcb_connection_t *xcb = xcb_connect(NULL, NULL);
+  if (!xcb) {
+    fprintf(stderr, "error connecting to X server\n");
+    return -1;
+  }
+
+  const xcb_setup_t *setup = xcb_get_setup(xcb);
+  if (!setup)
+  {
+    fprintf(stderr, "error getting xcb setup\n");
+    return -1;
+  }
+
+  xcb_screen_iterator_t screen = xcb_setup_roots_iterator(setup);
+  while (screen.rem)
+  {
+    instance_table_size = subscribe_windows_preorder(xcb,
+                                                     screen.data->root,
+                                                     instance_table_size,
+                                                     instance_table);
+
+    xcb_screen_next(&screen);
+  }
+
+  xcb_disconnect(xcb);
+  return instance_table_size;
+}
+
+int
+main(int argc, char* argv[])
+{
+  int result = -1;
+  uint32_t      window_id = 0;
+  int           fd = -1;
+  GeisStatus    status = GEIS_UNKNOWN_ERROR;
+  GeisInstance *instance_table = NULL;
+  size_t        instance_table_size = 0;
+
+  if (!parse_opts(argc, argv, &window_id))
+  {
+    fprintf(stderr, "usage: %s windowid\n", argv[0]);
+    return -1;
+  }
+
+  if (window_id != 0)
+  {
+    instance_table_size = 1;
+    instance_table = calloc(instance_table_size, sizeof(GeisInstance));
+    instance_table[0] = subscribe_window(window_id);
+    if (!instance_table[0])
+    {
+      fprintf(stderr, "can not continue, exiting....\n");
+      goto error_exit;
+    }
+  }
+  else
+  {
+    instance_table_size = subscribe_all_windows(&instance_table);
+    if (instance_table_size == 0)
+    {
+      fprintf(stderr, "can not continue, exiting....\n");
+      goto error_exit;
+    }
+  }
+
+  status = geis_configuration_supported(instance_table[0], GEIS_CONFIG_UNIX_FD);
+  if (status != GEIS_STATUS_SUCCESS)
+  {
+    fprintf(stderr, "GEIS does not support Unix fd\n");
+    goto fail_exit;
+  }
+
+  status = geis_configuration_get_value(instance_table[0], GEIS_CONFIG_UNIX_FD, &fd);
+  if (status != GEIS_STATUS_SUCCESS)
+  {
+    fprintf(stderr, "error retrieving GEIS fd\n");
+    goto fail_exit;
   }
 
   while(1)
@@ -204,10 +375,24 @@
 
     if (FD_ISSET(fd, &read_fds))
     {
-      geis_event_dispatch(instance);
-    }
-  }
-
-  geis_finish(instance);
+      geis_event_dispatch(instance_table[0]);
+    }
+  }
+
+fail_exit:
+  {
+    int i;
+    for (i = 0; i < instance_table_size; ++i)
+    {
+      geis_finish(instance_table[i]);
+    }
+  }
+
+error_exit:
+  if (instance_table_size > 0)
+  {
+    free(instance_table);
+  }
+  return result;
 }