Merge lp:geis/2.x into lp:geis

[Stephen M. Webb]

This looks like a big delta (and maybe it is) but it's mostly a bunch of boilerplate unit test code for implementing the GEIS v2.0 spec, plus sections 3.1 (general) and parts of 3.2 (library initialization) of the proposed GEIS v2.0 C Binding specification <https://bugs.launchpad.net/utouch-geis/+bug/674661/+attachment/1743566/+files/c-bindings.pdf>. Enough to get the GEIS v2.0 unit testing up and running.

The test suite is run with "make check" (requires the "check" package to be installed). Other build dependencies can be gleaned from the Ubuntu packaging.

The libutouch-geis library will continue to maintain backwards API and ABI compatibility with GEIS v1.0 after this.

[Chase Douglas (chasedouglas)]

1. Would it make sense to define GEIS_VERSION_2_0 as a negative number until its released? I'm just wondering what it will look like if someone is depending on it. They'll have to check if it's value is less than some huge number (i.e. 20101122) if they want to be sure it's an official release.

2. I didn't see a #define for the global error stack. Something like "#define GEIS_GLOBAL_ERR NULL" might be helpful.

I didn't go through this with a fine tooth comb, but everything else looks good to me. I'm approving it as is, you can decide to make changes for the above comments as you see fit. They aren't show stoppers :).

review: Approve

[Henrik Rydberg (rydberg)]

Looks nice.

review: Approve

[Mohamed IKBEL Boulabiar (boulabiar)]

in the libutouch-geis/geis_error.c file, is it intended for the function geis_error_message to be completed later ?

For the rest, everything looks pretty nice.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-11-12 15:54:32 +0000
+++ .bzrignore	2010-11-24 17:23:10 +0000
@@ -29,6 +29,10 @@
 libtool
 Makefile
 stamp-*
+testsuite/libutouch-geis/check_geis2_internals
+testsuite/libutouch-geis/*.log
 testsuite/geis1/check_geis_internals
 testsuite/geis1/*.log
+testsuite/geis2/check_geis2_api
+testsuite/geis2/*.log
 testsuite/geistest/geistest

=== modified file 'ChangeLog'
--- ChangeLog	2010-11-12 15:54:32 +0000
+++ ChangeLog	2010-11-24 17:23:10 +0000
@@ -1,3 +1,141 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Fixed a "make distcheck" problem.
+
+  * testsuite/libutouch-geis/Makefile.am (check_geis2_internals_CFLAGS): added
+    $(top_srcdir) to the header search path
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added unit testing for uTouch GEIS v2.0 internals.
+
+  * testsuite/libutouch-geis: new subdirectory
+  * testsuite/libutouch-geis/Makefile.am: new file
+  * testsuite/libutouch-geis/check_error_reporting.c: new file
+  * testsuite/libutouch-geis/check_geis2_internals.c: new file
+  * configure.ac (AC_OUTPUT): added new Makefile
+  * testsuite/Makefile.am (SUBDIRS): added new subdirectory
+  * testsuite/geis1/check_geis_internals.c: renamed test suite
+  * testsuite/geis2/check_geis2_api.c: renamed test suite
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added Error Reporting functions.
+
+  * libutouch-geis/geis_error.c: new file
+  * libutouch-geis/geis_error.h: new file
+  * libutouch-geis/geis_private.h: new file
+  * include/geis/geis.h (geis_error_count): new function
+    (geis_error_code): new function
+    (geis_error_message): new function
+  * libutouch-geis/Makefile.am: added new files
+  * libutouch-geis/geis.c: used new functions
+  * libutouch-geis/libutouch-geis.ver: added new function symbols
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added diagnostics to geis_new().
+
+  * libutouch-geis/geis.c (geis_error): reported calloc failure
+    (geis_set_valist): added debug diagnostics for init args
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Moved diagnostic logging from GEIS v1.0 to GEIS v2.0 libraries.
+
+  * libutouch-geis/geis_logging.h: renamed from libutouch-geis-xcb/geis_logging.h
+  * libutouch-geis/geis_logging.c: renamed from libutouch-geis-xcb/geis_logging.c
+  * libutouch-geis-xcb/Makefile.am: removed above renamed files
+  * libutouch-geis/Makefile.am: added above renamed files
+  * testsuite/geis1/Makefile.am: changed library path
+  * testsuite/geistest/Makefile.am: changed library path
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Merged GEIS v1.0 into GEIS v2.0 library for backwards compatibility.
+
+  * libutouch-geis-xcb/libutouch-geis-xcb.ver: removed
+  * libutouch-geis-xcb/Makefile.am: converted to build a convenience lib
+  * libutouch-geis/Makefile.am: added libutouch-geis-xcb as a conveniemnce lib
+  * libutouch-geis/libutouch-geis.ver: Added GEIS v1.0 symbols
+  * testsuite/geis2/Makefile.am: fixed path to shared library in build tree
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Refactored API initialization to use variadic arguments a la spec change.
+
+  * include/geis/geis.h (geis_new): changed function prototype
+  * libutouch-geis/geis.c (geis_new_empty): new function
+    (geis_set_valist): new function
+    (geis_new): changed parameters, used new functions
+  * testsuite/geis2/check_geis_new.c (geis_new_and_delete): changed geis_new()
+    arguments
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Fixed visibility of new GEIS 2.0 symbols.
+
+  * include/geis/geis.h (geis_new): fixed visibility
+    (geis_delete): same
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Made geis2_geis_new test case pass.
+
+  * libutouch-geis/geis.c (geis_hints_find_by_id): new static function
+    (geis_hints_append): new static function
+    (geis_new): used them, malloc'd struct _Geis
+    (geis_delete): free'd struct _Geis
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added test case for GEIS v2.0 geis_new() and geis_delete() functions, together
+  with a skeletal implementation of the libutouch-geis v2.0 library.
+  
+  * libutouch-geis: new source directory
+  * libutouch-geis/Makefile.am: new build recipe for libutouch-geis v2.0
+  * libutouch-geis/geis.c: new source file
+  * libutouch-geis/libutouch-geis.ver: new library version map
+  * testsuite/geis2/check_geis_new.c: new test suite
+  * Makefile.am (SUBDIRS): added libutouch-geis
+  * configure.ac (AC_OUTPUT): added libutouch-geis/Makefile
+  * include/geis/geis.h (GeisHints): new data structure
+    (Geis): new opaque data structure
+    (geis_new): new function
+    (geis_delete): new function
+  * testsuite/geis2/Makefile.am (check_geis2_api_SOURCES): added check_geis_new
+  * testsuite/geis2/check_geis2_api.c (main): added geis_new_suite
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added test case for geis v2.0 error codes.
+
+  * include/geis/geis.h: added required v2.0 error codes
+  * testsuite/geis2/check_error_codes.c: new test case
+  * testsuite/geis2/Makefile.am: added new test case
+  * testsuite/geis2/check_geis2_api.c: same
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added test case for geis v2.0 basic types.
+
+  * testsuite/geis2/check_general_types.c: new file
+  * testsuite/geis2/Makefile.am: added above new file
+  * testsuite/geis2/check_geis2_api.c (geis2_general_types_suite_new): added new
+    unit test
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added geis v2.0 test hardness and version macro test.
+
+  * include/geis/geis.h (GEIS_VERSION_2_0): added macro
+  * testsuite/geis2/check_geis_api.c: new testsuite.
+  * testsuite/geis2/check_version_macro.c: added unit test for geis 2.0 version
+    macro
+  * testsuite/geis2/Makefile: new file
+  * configure.ac (AC_OUTPUT): added above enw file
+  * testsuite/Makefile: added new testsuite directory geis2
+
 2010-11-12  Stephen M. Webb  <[e-mail]>
 
   Made existing unit test directory specific to geis v1.0.

=== modified file 'Makefile.am'
--- Makefile.am	2010-11-10 14:15:35 +0000
+++ Makefile.am	2010-11-24 17:23:10 +0000
@@ -5,7 +5,7 @@
 
 ACLOCAL_MFLAGS = -I m4
 
-SUBDIRS = include libutouch-geis-xcb testsuite doc
+SUBDIRS = include libutouch-geis-xcb libutouch-geis testsuite doc
 
 doc-%:
 	$(MAKE) -C doc $@

=== modified file 'configure.ac'
--- configure.ac	2010-11-12 15:54:32 +0000
+++ configure.ac	2010-11-24 17:23:10 +0000
@@ -1,6 +1,24 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 #
+#
+# Copyright 2010 Canonical, Ltd.
+#
+# This file is part of the utouch-geis library. 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
+#
+
 AC_PREREQ(2.65)
 AC_INIT([utouch-geis],[1.0.13],
 	[[e-mail]],,
@@ -67,7 +85,10 @@
                  include/Makefile
                  libutouch-geis-xcb/Makefile
                  libutouch-geis-xcb/xcb_gesture.xml
+                 libutouch-geis/Makefile
                  testsuite/Makefile
+                 testsuite/libutouch-geis/Makefile
                  testsuite/geis1/Makefile
+                 testsuite/geis2/Makefile
                  testsuite/geistest/Makefile])
 AC_OUTPUT

=== modified file 'include/geis/geis.h'
--- include/geis/geis.h	2010-09-28 18:36:37 +0000
+++ include/geis/geis.h	2010-11-24 17:23:10 +0000
@@ -25,6 +25,7 @@
 #endif
 
 #define GEIS_VERSION_1_0  1
+#define GEIS_VERSION_2_0  20101122
 
 #include <geis/geisimpl.h>
 
@@ -99,6 +100,11 @@
 #define GEIS_GESTURE_ATTRIBUTE_TOUCH_4_X        "touch 4 x"
 #define GEIS_GESTURE_ATTRIBUTE_TOUCH_4_Y        "touch 4 y"
 
+
+#define GEIS_FALSE 0
+#define GEIS_TRUE  1
+
+
 /**
  * @defgroup geis_status Status and Errors
  *
@@ -116,7 +122,9 @@
   GEIS_STATUS_SUCCESS       = 0,    /**< normal successful completion */
   GEIS_STATUS_NOT_SUPPORTED = 10,   /**< a requested feature is not supported */
   GEIS_BAD_ARGUMENT         = 1000, /**< a bad argument value was passed */
-  GEIS_UNKNOWN_ERROR        = 9999  /**< any other error condition */
+  GEIS_UNKNOWN_ERROR        = 9999, /**< any other error condition */
+  GEIS_STATUS_BAD_ARGUMENT  = -100, /**< a bad argument value was passed */
+  GEIS_STATUS_UNKNOWN_ERROR = -999  /**< any other error condition */
 } GeisStatus;
 
 /* @} */
@@ -182,6 +190,83 @@
 /* @} */
 
 /**
+ * @defgroup geis_2_geis The Geis API Object
+ *
+ * @{
+ */
+
+#define GEIS_INIT_SERVICE_PROVIDER  "geis-init-server"
+
+
+typedef struct _Geis *Geis;
+
+/**
+ * Initializes an instance of the GEIS v2.0 API.
+ *
+ * @param[in]  name  A name for the API instance (used for diagnostics).
+ * @param[in]  ...   A set of zero or more initialization arguments.
+ */
+GEIS_API Geis geis_new(GeisString init_arg_name, ...);
+
+/**
+ * Cleans up an instance of the GEIS v2.0 API.
+ *
+ * @param[in] geis  An instance of the GEIS v2.0 API.
+ *
+ * Tears down the instance of the API and releases any resources associated with
+ * that instance.
+ */
+GEIS_API GeisStatus geis_delete(Geis geis);
+
+/* @} */
+
+/**
+ * @defgroup geis_error Error Reporting
+ * @{
+ */
+
+/**
+ * Gets the number of status codes in the error stack.
+ *
+ * @param[in] geis A GEIS API instance or NULL for the global stack
+ *
+ * This function is used primarily to determine the failure details of a GEIS
+ * function that does not explicitly return a GeisStatus value.  This is
+ * required for _new() fucntions that return NULL to indicate failure.  If the
+ * call to geis_new() itself fails and returns a NULL, the global error stack
+ * must be used, otherwise the API instance error stack must be used.
+ *
+ * The error stack is reset on each GEIS API call, so failure reasons should be
+ * determined immmediately after a GEIS API call.
+ */
+GEIS_API GeisSize geis_error_count(Geis geis);
+
+/**
+ * Gets the indicated status code from the error stack.
+ *
+ * @param[in] geis  A GEIS API instance or NULL for the global stack
+ * @param[in] index Indicates the status value to retrieve.  Valid status values
+ *                  are between 0 and less than the value returned from
+ *                  geis_error_count() otherwise GEIS_STATUS_BAD_ARGUMENT will
+ *                  be returned.
+ */
+GEIS_API GeisStatus geis_error_code(Geis geis, GeisSize index);
+
+/**
+ * Gets the localized error message, if any, associated with the indicated
+ * error.
+ *
+ * @param[in] geis  A GEIS API instance or NULL for the global stack
+ * @param[in] index Indicates the status value to retrieve.  Valid status values
+ *                  are between 0 and less than the value returned from
+ *                  geis_error_count() otherwise GEIS_STATUS_BAD_ARGUMENT will
+ *                  be returned.
+ */
+GEIS_API GeisString geis_error_message(Geis geis, GeisSize index);
+
+/* @} */
+
+/**
  * @defgroup geis_config Configuration and Control
  * @{
  */

=== added directory 'libutouch-geis'
=== modified file 'libutouch-geis-xcb/Makefile.am'
--- libutouch-geis-xcb/Makefile.am	2010-11-10 14:15:35 +0000
+++ libutouch-geis-xcb/Makefile.am	2010-11-24 17:23:10 +0000
@@ -8,15 +8,12 @@
 # work around a problem with XCB tools
 XCB_CFLAGS += -I$(includedir)/xcb -I$(XCBINCLUDEDIR)/xcb
 
-version_script = $(srcdir)/libutouch-geis-xcb.ver
-
 dist_inc_HEADERS = geis/geisimpl.h
 
-lib_LTLIBRARIES = libutouch-geis.la
+noinst_LTLIBRARIES = libutouch-geis.la
 
 libutouch_geis_la_SOURCES = \
 	geis.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 
@@ -30,15 +27,13 @@
 	-DGEIS_BUILDING_DSO=1 \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/libutouch-geis \
 	$(GRAIL_CFLAGS) \
 	$(X11XCB_CFLAGS) \
 	$(XCB_CFLAGS) \
 	$(XI2_CFLAGS)
 
-libutouch_geis_la_LDFLAGS = \
-	-Wl,-z,defs -Wl,--as-needed \
-	-version-info 1:2:0 \
-	-Wl,--version-script=$(version_script)
+libutouch_geis_la_LDFLAGS = 
 
 libutouch_geis_la_LIBADD = \
 	$(X11XCB_LIBS) \
@@ -52,5 +47,5 @@
 $(dist_libutouch_geis_la_SOURCES): $(xcbproto_tools)
 	$(PYTHON) $(srcdir)/c_client.py -p $(XCBPROTO_XCBPYTHONDIR) $(builddir)/$<
 
-EXTRA_DIST = $(xcbproto_tools) $(version_script)
+EXTRA_DIST = $(xcbproto_tools)
 

=== removed file 'libutouch-geis-xcb/libutouch-geis-xcb.ver'
--- libutouch-geis-xcb/libutouch-geis-xcb.ver	2010-08-12 15:43:49 +0000
+++ libutouch-geis-xcb/libutouch-geis-xcb.ver	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-GEIS_1.0 {
-  global:
-    geis_configuration_get_value;
-    geis_configuration_set_value;
-    geis_configuration_supported;
-    geis_event_dispatch;
-    geis_finish;
-    geis_init;
-    geis_input_devices;
-    geis_subscribe;
-    geis_unsubscribe;
-
-  local:
-    *;
-};

=== added file 'libutouch-geis/Makefile.am'
--- libutouch-geis/Makefile.am	1970-01-01 00:00:00 +0000
+++ libutouch-geis/Makefile.am	2010-11-24 17:23:10 +0000
@@ -0,0 +1,47 @@
+#
+# @file libutouch-geis/Makefile.am 
+# @brief automake recipe for the uTouch GEIS v2.0 implementation
+#
+# Copyright 2010 Canonical, Ltd.
+#
+# This file is part of the utouch-geis library. 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
+#
+version_script = $(srcdir)/libutouch-geis.ver
+
+lib_LTLIBRARIES = libutouch-geis.la
+
+libutouch_geis_la_SOURCES = \
+	geis_error.h    geis_error.c \
+	geis_logging.h  geis_logging.c \
+	geis_private.h  geis.c
+
+libutouch_geis_la_CPPFLAGS = \
+	-Wall -Wextra \
+	-fvisibility=hidden \
+	-DGEIS_BUILDING_DSO=1 \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	$(GRAIL_CFLAGS) 
+
+libutouch_geis_la_LDFLAGS = \
+	-Wl,-z,defs -Wl,--as-needed \
+	-version-info 2:0:1 \
+	-Wl,--version-script=$(version_script)
+
+libutouch_geis_la_LIBADD = \
+	$(top_builddir)/libutouch-geis-xcb/libutouch-geis.la
+
+EXTRA_DIST = $(version_script)
+

=== added file 'libutouch-geis/geis.c'
--- libutouch-geis/geis.c	1970-01-01 00:00:00 +0000
+++ libutouch-geis/geis.c	2010-11-24 17:23:10 +0000
@@ -0,0 +1,104 @@
+/**
+ * @file libutouch-geis/geis.c
+ * @brief implementation of the uTouch GEIS v2.0 API instance
+ *
+ * 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_config.h"
+#include "geis_private.h"
+
+#include "geis_error.h"
+#include "geis_logging.h"
+#include <stdarg.h>
+
+
+
+/**
+ * Creates a new empty Geis API instance.
+ */
+static Geis
+geis_new_empty()
+{
+  geis_error_clear(NULL);
+  Geis geis = calloc(1, sizeof(struct _Geis));
+  if (!geis)
+  {
+    geis_error_push(NULL, GEIS_STATUS_UNKNOWN_ERROR);
+    geis_error("calloc failed");
+  }
+  return geis;
+}
+
+
+/**
+ * Sets optional parts of a Geis API instance from a variable argument list.
+ */
+static void
+geis_set_valist(Geis geis, GeisString init_arg_name, va_list varargs)
+{
+  while (init_arg_name)
+  {
+    if (0 == strcmp(init_arg_name, GEIS_INIT_SERVICE_PROVIDER))
+    {
+      geis_debug("initializing GEIS server");
+    }
+    else if (0 == strcmp(init_arg_name, "geis-test-fixture"))
+    {
+      geis_debug("initializing GEIS test fixture");
+      geis->is_test_fixture = GEIS_TRUE;
+    }
+
+    init_arg_name = va_arg(varargs, GeisString);
+  }
+}
+
+
+/**
+ * Creates an initialized Geis API instance.
+ */
+Geis
+geis_new(GeisString init_arg_name, ...)
+{
+  Geis geis = geis_new_empty();
+  if (geis)
+  {
+    va_list varargs;
+    va_start(varargs, init_arg_name);
+    geis_set_valist(geis, init_arg_name, varargs);
+    va_end(varargs);
+  }
+
+  return geis;
+}
+
+
+/**
+ * Disposes of a Geis API instance.
+ */
+GeisStatus
+geis_delete(Geis geis)
+{
+  if (geis == NULL)
+  {
+    return GEIS_STATUS_BAD_ARGUMENT;
+  }
+  free(geis);
+  return GEIS_STATUS_SUCCESS;
+}
+
+
+

=== added file 'libutouch-geis/geis_error.c'
--- libutouch-geis/geis_error.c	1970-01-01 00:00:00 +0000
+++ libutouch-geis/geis_error.c	2010-11-24 17:23:10 +0000
@@ -0,0 +1,143 @@
+/**
+ * @file libutouch-geis/geis_error.c
+ * @brief implementation of the uTouch GEIS v2.0 API error reporting module
+ *
+ * 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_config.h"
+#include "geis_error.h"
+
+#include "geis_logging.h"
+#include "geis_private.h"
+#include <stdlib.h>
+
+
+static GeisErrorStack g_error_stack = { 0, 0, 0 };
+
+
+static void
+geis_error_stack_clear(GeisErrorStack *error_stack)
+{
+  error_stack->error_count = 0;
+}
+
+
+static void
+geis_error_stack_push(GeisErrorStack *error_stack, GeisStatus code)
+{
+  if (error_stack->error_count < error_stack->store_size)
+  {
+    error_stack->store[++error_stack->error_count] = code;
+  }
+  else
+  {
+    error_stack->store_size += 2;
+    error_stack->store = realloc(error_stack->store, error_stack->store_size);
+    if (!error_stack->store)
+    {
+      geis_error("error_stack realloc failed for size %d",
+                 error_stack->store_size);
+      return;
+    }
+    error_stack->store[++error_stack->error_count] = code;
+  }
+}
+
+
+static GeisStatus
+geis_error_stack_get(GeisErrorStack *error_stack, GeisSize index)
+{
+  if (index < error_stack->error_count)
+  {
+    return error_stack->store[index];
+  }
+  return GEIS_STATUS_BAD_ARGUMENT;
+}
+
+
+void
+geis_error_clear(Geis geis)
+{
+  if (geis)
+  {
+    geis_error_stack_clear(&geis->error_stack);
+  }
+  else
+  {
+    geis_error_stack_clear(&g_error_stack);
+  }
+}
+
+
+void
+geis_error_push(Geis geis, GeisStatus code)
+{
+  if (geis)
+  {
+    geis_error_stack_push(&geis->error_stack, code);
+  }
+  else
+  {
+    geis_error_stack_push(&g_error_stack, code);
+  }
+}
+
+
+GeisSize
+geis_error_count(Geis geis)
+{
+  if (geis)
+  {
+    return geis->error_stack.error_count;
+  }
+  else
+  {
+    return g_error_stack.error_count;
+  }
+}
+
+
+GeisStatus
+geis_error_code(Geis geis, GeisSize index)
+{
+  GeisStatus status = GEIS_STATUS_UNKNOWN_ERROR;
+  if (geis)
+  {
+    status = geis_error_stack_get(&geis->error_stack, index);
+  }
+  else
+  {
+    status = geis_error_stack_get(&g_error_stack, index);
+  }
+  return status;
+}
+
+
+GeisString
+geis_error_message(Geis geis, GeisSize index)
+{
+  GeisString message = "";
+  if (geis)
+  {
+  }
+  else
+  {
+  }
+  return message;
+}
+
+

=== added file 'libutouch-geis/geis_error.h'
--- libutouch-geis/geis_error.h	1970-01-01 00:00:00 +0000
+++ libutouch-geis/geis_error.h	2010-11-24 17:23:10 +0000
@@ -0,0 +1,42 @@
+/**
+ * @file geis_error.h
+ * @brief internal GEIS error 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_ERROR_H_
+#define GEIS_ERROR_H_
+
+#include <geis/geis.h>
+
+
+/*
+ * A structure to hold the error stack
+ */
+typedef struct _GeisErrorStack
+{
+  GeisStatus *store;
+  GeisSize    store_size;
+  GeisSize    error_count;
+} GeisErrorStack;
+
+
+void geis_error_clear(Geis geis);
+
+void geis_error_push(Geis geis, GeisStatus code);
+
+#endif /* GEIS_ERROR_H_ */

=== renamed file 'libutouch-geis-xcb/geis_logging.c' => 'libutouch-geis/geis_logging.c'
=== renamed file 'libutouch-geis-xcb/geis_logging.h' => 'libutouch-geis/geis_logging.h'
=== added file 'libutouch-geis/geis_private.h'
--- libutouch-geis/geis_private.h	1970-01-01 00:00:00 +0000
+++ libutouch-geis/geis_private.h	2010-11-24 17:23:10 +0000
@@ -0,0 +1,36 @@
+/**
+ * @file geis_error.h
+ * @brief internal GEIS error 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_PRIVATE_H_
+#define GEIS_PRIVATE_H_
+
+#include <geis/geis.h>
+
+#include "geis_error.h"
+
+
+struct _Geis
+{
+  GeisBoolean    is_test_fixture;
+  GeisErrorStack error_stack;
+};
+
+
+#endif /* GEIS_PRIVATE_H_ */

=== added file 'libutouch-geis/libutouch-geis.ver'
--- libutouch-geis/libutouch-geis.ver	1970-01-01 00:00:00 +0000
+++ libutouch-geis/libutouch-geis.ver	2010-11-24 17:23:10 +0000
@@ -0,0 +1,24 @@
+GEIS_1.0 {
+  global:
+    geis_configuration_get_value;
+    geis_configuration_set_value;
+    geis_configuration_supported;
+    geis_event_dispatch;
+    geis_finish;
+    geis_init;
+    geis_input_devices;
+    geis_subscribe;
+    geis_unsubscribe;
+};
+
+GEIS_2.0 {
+  global:
+    geis_delete;
+    geis_error_count;
+    geis_error_code;
+    geis_error_message;
+    geis_new;
+
+  local:
+    *;
+};

=== modified file 'testsuite/Makefile.am'
--- testsuite/Makefile.am	2010-11-12 15:54:32 +0000
+++ testsuite/Makefile.am	2010-11-24 17:23:10 +0000
@@ -1,1 +1,24 @@
-SUBDIRS = geis1 geistest
+#
+# @file testsuite/Makefile.am 
+# @brief automake recipe for the GEIS test suite
+#
+#
+# Copyright 2010 Canonical, Ltd.
+#
+# This file is part of the utouch-geis library. 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
+#
+
+SUBDIRS = libutouch-geis geis1 geis2 geistest
+

=== modified file 'testsuite/geis1/Makefile.am'
--- testsuite/geis1/Makefile.am	2010-11-12 15:54:32 +0000
+++ testsuite/geis1/Makefile.am	2010-11-24 17:23:10 +0000
@@ -26,7 +26,7 @@
 	$(CHECK_CFLAGS)
 
 check_geis_internals_LDADD = \
-	$(top_builddir)/libutouch-geis-xcb/.libs/libutouch-geis.a \
+	$(top_builddir)/libutouch-geis/.libs/libutouch-geis.a \
 	$(X11XCB_LIBS) \
 	$(XCB_LIBS) \
 	$(XI2_LIBS) \

=== modified file 'testsuite/geis1/check_geis_internals.c'
--- testsuite/geis1/check_geis_internals.c	2010-10-20 17:35:47 +0000
+++ testsuite/geis1/check_geis_internals.c	2010-11-24 17:23:10 +0000
@@ -11,7 +11,7 @@
 {
   int num_failed = 0;
 
-  Suite *s = suite_create("\"geis internals\"");
+  Suite *s = suite_create("\"uTouch GEIS v1.0 internals\"");
 
   SRunner *sr = srunner_create(s);
   srunner_add_suite(sr, make_instance_table_suite());

=== added directory 'testsuite/geis2'
=== added file 'testsuite/geis2/Makefile.am'
--- testsuite/geis2/Makefile.am	1970-01-01 00:00:00 +0000
+++ testsuite/geis2/Makefile.am	2010-11-24 17:23:10 +0000
@@ -0,0 +1,36 @@
+#
+# @file testsuite/geis1/Makefile.am 
+# @brief automake recipe for the geis v1.0 testsuite unit testing directory
+#
+
+if HAVE_CHECK
+  test_targets = check_geis2_api
+else
+  test_targets = 
+endif
+
+TESTS = $(test_targets)
+
+check_PROGRAMS = $(test_targets)
+
+check_geis2_api_SOURCES = \
+	check_error_codes.c \
+	check_geis_new.c \
+	check_general_types.c \
+	check_version_macro.c \
+	check_geis2_api.c
+
+check_geis2_api_CFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	$(CHECK_CFLAGS)
+
+check_geis2_api_LDADD = \
+	$(top_builddir)/libutouch-geis/libutouch-geis.la \
+	$(X11XCB_LIBS) \
+	$(XCB_LIBS) \
+	$(XI2_LIBS) \
+	$(CHECK_LIBS)
+
+MOSTLYCLEANFILES = geis2_api.log
+

=== added file 'testsuite/geis2/check_error_codes.c'
--- testsuite/geis2/check_error_codes.c	1970-01-01 00:00:00 +0000
+++ testsuite/geis2/check_error_codes.c	2010-11-24 17:23:10 +0000
@@ -0,0 +1,31 @@
+/**
+ * unit tests for GEIS v2.0 error codes
+ */
+#include <check.h>
+
+#include <geis/geis.h>
+
+/* compile-time test to ensure required types are defined */
+START_TEST(error_codes)
+{
+  GeisStatus error = GEIS_STATUS_SUCCESS ;
+  error = GEIS_STATUS_NOT_SUPPORTED;
+  error = GEIS_STATUS_BAD_ARGUMENT;
+  error = GEIS_STATUS_UNKNOWN_ERROR;
+}
+END_TEST
+
+
+/* boilerplate */
+Suite *
+geis2_error_codes_suite_new()
+{
+  Suite *s = suite_create("geis2_error_codes");
+
+  TCase *create = tcase_create("error_codes");
+  tcase_add_test(create, error_codes);
+  suite_add_tcase(s, create);
+
+  return s;
+}
+

=== added file 'testsuite/geis2/check_geis2_api.c'
--- testsuite/geis2/check_geis2_api.c	1970-01-01 00:00:00 +0000
+++ testsuite/geis2/check_geis2_api.c	2010-11-24 17:23:10 +0000
@@ -0,0 +1,32 @@
+/**
+ * test driver for unit testing of geis internals
+ */
+#include <check.h>
+
+
+extern Suite *make_version_macro_suite();
+extern Suite *geis2_general_types_suite_new();
+extern Suite *geis2_error_codes_suite_new();
+extern Suite *geis2_geis_new_suite_new();
+
+int
+main(int argc, char* argv[])
+{
+  int num_failed = 0;
+
+  Suite *s = suite_create("\"GEIS v2.0 API\"");
+
+  SRunner *sr = srunner_create(s);
+  srunner_add_suite(sr, make_version_macro_suite());
+  srunner_add_suite(sr, geis2_general_types_suite_new());
+  srunner_add_suite(sr, geis2_error_codes_suite_new());
+  srunner_add_suite(sr, geis2_geis_new_suite_new());
+
+  srunner_set_log(sr, "geis2_api.log");
+  srunner_run_all(sr, CK_NORMAL);
+  num_failed = srunner_ntests_failed(sr);
+
+  srunner_free(sr);
+
+  return !(num_failed == 0);
+}

=== added file 'testsuite/geis2/check_geis_new.c'
--- testsuite/geis2/check_geis_new.c	1970-01-01 00:00:00 +0000
+++ testsuite/geis2/check_geis_new.c	2010-11-24 17:23:10 +0000
@@ -0,0 +1,32 @@
+/**
+ * Unit tests for GEIS v2.0 API instance creation.
+ */
+#include <check.h>
+
+#include <geis/geis.h>
+
+/* compile-time test to ensure required types are defined */
+START_TEST(geis_new_and_delete)
+{
+  Geis geis = geis_new("geis-test-fixture", NULL);
+  fail_unless(geis != NULL, "failed to create GEIS v2.0 API instance");
+
+  GeisStatus status = geis_delete(geis);
+  fail_unless(status == GEIS_STATUS_SUCCESS, "geis_delete failed");
+}
+END_TEST
+
+
+/* boilerplate */
+Suite *
+geis2_geis_new_suite_new()
+{
+  Suite *s = suite_create("geis2_geis_new");
+
+  TCase *create = tcase_create("geis_new_and_delete");
+  tcase_add_test(create, geis_new_and_delete);
+  suite_add_tcase(s, create);
+
+  return s;
+}
+

=== added file 'testsuite/geis2/check_general_types.c'
--- testsuite/geis2/check_general_types.c	1970-01-01 00:00:00 +0000
+++ testsuite/geis2/check_general_types.c	2010-11-24 17:23:10 +0000
@@ -0,0 +1,32 @@
+/**
+ * unit tests for the geis_instance_table module
+ */
+#include <check.h>
+
+#include <geis/geis.h>
+
+/* compile-time test to ensure required types are defined */
+START_TEST(general_types)
+{
+  GeisBoolean  geis_boolean;
+  GeisInteger  geis_integer;
+  GeisFloat    geis_float;
+  GeisSize     geis_size;
+  GeisString   geis_string;
+}
+END_TEST
+
+
+/* boilerplate */
+Suite *
+geis2_general_types_suite_new()
+{
+  Suite *s = suite_create("geis2_general_types");
+
+  TCase *create = tcase_create("general_types");
+  tcase_add_test(create, general_types);
+  suite_add_tcase(s, create);
+
+  return s;
+}
+

=== added file 'testsuite/geis2/check_version_macro.c'
--- testsuite/geis2/check_version_macro.c	1970-01-01 00:00:00 +0000
+++ testsuite/geis2/check_version_macro.c	2010-11-24 17:23:10 +0000
@@ -0,0 +1,32 @@
+/**
+ * unit tests for the geis_instance_table module
+ */
+#include <check.h>
+
+#include "geis/geis.h"
+
+
+START_TEST(existence)
+{
+#ifdef GEIS_VERSION_2_0
+  fail_unless(0==0);
+#else
+  fail_unless(0!=0);
+#endif
+}
+END_TEST
+
+
+/* boilerplate */
+Suite *
+make_version_macro_suite()
+{
+  Suite *s = suite_create("geis_version_macro");
+
+  TCase *create = tcase_create("existence");
+  tcase_add_test(create, existence);
+  suite_add_tcase(s, create);
+
+  return s;
+}
+

=== modified file 'testsuite/geistest/Makefile.am'
--- testsuite/geistest/Makefile.am	2010-11-10 14:15:35 +0000
+++ testsuite/geistest/Makefile.am	2010-11-24 17:23:10 +0000
@@ -1,6 +1,4 @@
 
-geis_impl = xcb
-
 bin_PROGRAMS = geistest
 
 geistest_SOURCES = \
@@ -12,4 +10,4 @@
 	-I$(top_srcdir)/libutouch-geis-$(geis_impl)
 
 geistest_LDADD = \
-	$(top_builddir)/libutouch-geis-$(geis_impl)/libutouch-geis.la
+	$(top_builddir)/libutouch-geis/libutouch-geis.la

=== added directory 'testsuite/libutouch-geis'
=== added file 'testsuite/libutouch-geis/Makefile.am'
--- testsuite/libutouch-geis/Makefile.am	1970-01-01 00:00:00 +0000
+++ testsuite/libutouch-geis/Makefile.am	2010-11-24 17:23:10 +0000
@@ -0,0 +1,53 @@
+#
+# @file testsuite/libutouch-geis/Makefile.am 
+# @brief automake recipe for the uTouch GEIS v2.0 internals unit test suite
+#
+#
+# Copyright 2010 Canonical, Ltd.
+#
+# This file is part of the utouch-geis library. 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
+#
+
+if HAVE_CHECK
+  test_targets = check_geis2_internals
+else
+  test_targets = 
+endif
+
+TESTS = $(test_targets)
+
+check_PROGRAMS = $(test_targets)
+
+check_geis2_internals_SOURCES = \
+	check_error_reporting.c \
+	check_geis2_internals.c
+
+check_geis2_internals_CFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	$(CHECK_CFLAGS)
+
+# 
+# Link against the (non-distributed) static libutouch-geis to pick up the
+# internal symbols.
+#
+check_geis2_internals_LDADD = \
+	$(top_builddir)/libutouch-geis/.libs/libutouch-geis.a \
+	$(CHECK_LIBS)
+
+MOSTLYCLEANFILES = \
+	geis2_internals.log \
+	geis2_internals.xml
+

=== added file 'testsuite/libutouch-geis/check_error_reporting.c'
--- testsuite/libutouch-geis/check_error_reporting.c	1970-01-01 00:00:00 +0000
+++ testsuite/libutouch-geis/check_error_reporting.c	2010-11-24 17:23:10 +0000
@@ -0,0 +1,39 @@
+/**
+ * unit tests for the geis_instance_table module
+ */
+#include <check.h>
+
+#include "geis/geis.h"
+#include "libutouch-geis/geis_error.h"
+
+
+START_TEST(global_error_stack)
+{
+  int i = 0;
+
+  geis_error_clear(NULL);
+  geis_error_push(NULL, GEIS_STATUS_SUCCESS);
+
+  fail_unless(geis_error_count(NULL) == 1, "unexpected error stack size");
+  for (i=0; i < geis_error_count(NULL); ++i)
+  {
+    fail_unless(geis_error_code(NULL, i) == GEIS_STATUS_SUCCESS,
+                "unexpected status code retrieved");
+  }
+}
+END_TEST
+
+
+/* boilerplate */
+Suite *
+make_error_reporting_suite()
+{
+  Suite *s = suite_create("geis2-error-reporting");
+
+  TCase *create = tcase_create("error-reporting");
+  tcase_add_test(create, global_error_stack);
+  suite_add_tcase(s, create);
+
+  return s;
+}
+

=== added file 'testsuite/libutouch-geis/check_geis2_internals.c'
--- testsuite/libutouch-geis/check_geis2_internals.c	1970-01-01 00:00:00 +0000
+++ testsuite/libutouch-geis/check_geis2_internals.c	2010-11-24 17:23:10 +0000
@@ -0,0 +1,26 @@
+/**
+ * test driver for unit testing of uTouch geis v2.0 internals
+ */
+#include <check.h>
+
+extern Suite *make_error_reporting_suite();
+
+
+int
+main(int argc, char* argv[])
+{
+  int num_failed = 0;
+
+  Suite *s = suite_create("\"uTouch GEIS v2.0 internals\"");
+
+  SRunner *sr = srunner_create(s);
+  srunner_add_suite(sr, make_error_reporting_suite());
+
+  srunner_set_log(sr, "geis2_internals.log");
+  srunner_run_all(sr, CK_NORMAL);
+  num_failed = srunner_ntests_failed(sr);
+
+  srunner_free(sr);
+
+  return !(num_failed == 0);
+}