Merge lp:~bregma/geis/lp-1169249 into lp:geis

[Stephen M. Webb]

Prevent garbage collector from reclaiming filters passed to subscriptions in the Python bindings (lp: #1169249).

Fixes some Python3-Unicode-ctypes and Python-GC-ctypes interaction problems that was causing invalid data to be passed into the C library from the Python code.

Since there is no test suite infrastructure for the Python bindings, the only available test is to start the geisview tool with GEIS_DEBUG=3 set on the command line and observe the correct windowid being used, and that the geisview tool once again produces gesture data.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:314
http://jenkins.qa.ubuntu.com/job/geis-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-raring-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-raring-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-raring-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/geis-ci/3/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Nice. Looks good, and +1 for moving over to utf-8.

review: Approve

=== modified file 'm4/ax_enable_xi2.m4'
--- m4/ax_enable_xi2.m4	2012-06-21 21:17:25 +0000
+++ m4/ax_enable_xi2.m4	2013-04-15 16:53:32 +0000
@@ -1,21 +1,20 @@
 #
 # @file m4/ac_enable_xi2.m4
-# @brief autoconf macro to enable or disable support for XInput 2.1
-#
-# Copyright 2011 Canonical, Ltd.
-#
-# This file is part of the 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 General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# @brief autoconf macro to enable or disable support for XInput 2.2
+#
+# Copyright 2011, 2013 Canonical, Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 AC_DEFUN([AX_ENABLE_XI2],[
   AC_ARG_ENABLE([xi2.1],
@@ -25,7 +24,7 @@
     ax_have_xi_2_1=no
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
       #include <X11/extensions/XInput2.h>
-      XITouchValuatorClassInfo* p = 0;
+      XITouchClassInfo* p = 0;
       ])],
       [ax_have_xi_2_1=yes
        AC_DEFINE([HAVE_XI_2_1],[1],[XInput 2.1 is available])]

=== modified file 'm4/xorg-gtest.m4'
--- m4/xorg-gtest.m4	2012-08-15 15:09:21 +0000
+++ m4/xorg-gtest.m4	2013-04-15 16:53:32 +0000
@@ -1,4 +1,4 @@
-# serial 5
+# serial 9
 
 # Copyright (C) 2012 Canonical, Ltd.
 #
@@ -21,35 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-# Checks whether the gtest source is available on the system. Allows for
-# adjusting the include and source path. Sets have_gtest=yes if the source is
-# present. Sets GTEST_CPPFLAGS and GTEST_SOURCE to the preprocessor flags and
-# source location respectively.
-AC_DEFUN([_CHECK_GTEST],
-[
-  AC_ARG_WITH([gtest-source-path],
-              [AS_HELP_STRING([--with-gtest-source-path],
-                              [location of the Google test sources, defaults to /usr/src/gtest])],
-              [GTEST_SOURCE="$withval"; GTEST_CPPFLAGS="-I$withval/include"],
-              [GTEST_SOURCE="/usr/src/gtest"])
-
-  AC_ARG_WITH([gtest-include-path],
-              [AS_HELP_STRING([--with-gtest-include-path],
-                              [location of the Google test headers])],
-              [GTEST_CPPFLAGS="-I$withval"])
-
-  GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$GTEST_SOURCE"
-
-  AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc]
-                 [$GTEST_SOURCE/src/gtest_main.cc],
-                 [have_gtest=yes],
-                 [have_gtest=no])
-
-  AS_IF([test "x$have_gtest" = xyes],
-        [AC_SUBST(GTEST_CPPFLAGS)]
-        [AC_SUBST(GTEST_SOURCE)] [:])
-]) # _CHECK_GTEST
-
 # CHECK_XORG_GTEST([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 #
 # Checks whether the xorg-gtest source is available on the system. Allows for
@@ -61,16 +32,17 @@
 # Both default actions are no-ops.
 AC_DEFUN([CHECK_XORG_GTEST],
 [
-  AC_REQUIRE([_CHECK_GTEST])
-
   PKG_CHECK_EXISTS([xorg-gtest],
                    [have_xorg_gtest=yes],
                    [have_xorg_gtest=no])
 
   XORG_GTEST_SOURCE=`$PKG_CONFIG --variable=sourcedir --print-errors xorg-gtest`
+  GTEST_SOURCE="$XORG_GTEST_SOURCE/src/gtest"
+  GTEST_CPPFLAGS="-I$XORG_GTEST_SOURCE/src/gtest/include -I$XORG_GTEST_SOURCE/src/gtest"
   XORG_GTEST_CPPFLAGS=`$PKG_CONFIG --variable=CPPflags --print-errors xorg-gtest`
   XORG_GTEST_CPPFLAGS="$GTEST_CPPFLAGS $XORG_GTEST_CPPFLAGS"
   XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -I$XORG_GTEST_SOURCE"
+  XORG_GTEST_LDFLAGS="-lpthread -lX11 -lXi"
 
   PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no])
 
@@ -92,12 +64,12 @@
   AS_IF([test "x$have_xorg_gtest_evemu" = xyes],
         [XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -DHAVE_EVEMU"])
 
-  AS_IF([test "x$have_gtest" != xyes -o "x$have_x11" != xyes],
-        [have_xorg_gtest=no])
-
   AS_IF([test "x$have_xorg_gtest" = xyes],
+        [AC_SUBST(GTEST_SOURCE)]
+        [AC_SUBST(GTEST_CPPFLAGS)]
         [AC_SUBST(XORG_GTEST_SOURCE)]
         [AC_SUBST(XORG_GTEST_CPPFLAGS)]
+        [AC_SUBST(XORG_GTEST_LDFLAGS)]
 
         # Get BASE_CXXFLAGS and STRICT_CXXFLAGS
         [XORG_MACROS_VERSION(1.17)]

=== modified file 'python/geis/geis_v2.py'
--- python/geis/geis_v2.py	2012-12-04 12:39:16 +0000
+++ python/geis/geis_v2.py	2013-04-15 16:53:32 +0000
@@ -480,7 +480,7 @@
         if (item_name == _geis_bindings.GEIS_CONFIGURATION_FD):
             fd = ctypes.c_long()
             status = _geis_get_configuration(self._instance,
-                                             item_name.encode('ascii'),
+                                             item_name.encode('utf-8'),
                                              ctypes.byref(fd))
             if status != _geis_bindings.GEIS_STATUS_SUCCESS:
                 raise GeisError('error retrieving GEIS fd')
@@ -568,7 +568,7 @@
     """
 
     def __init__(self, geis, name):
-        self._filter  = _geis_lib.geis_filter_new(geis, name)
+        self._filter  = _geis_lib.geis_filter_new(geis, name.encode('utf-8'))
 
     def __del__(self):
         _geis_lib.geis_filter_delete(self._filter)
@@ -593,8 +593,7 @@
                 raise ValueError('invalid filter term')
             name, op, value = term
             _geis_lib.geis_filter_add_term(self._filter, facility,
-                                           name, op, value,
-                                           0)
+                                           name.encode('utf-8'), op, value, 0)
 
 
 class Subscription(object):
@@ -615,7 +614,8 @@
         :raise: Exception
         """
         object.__init__(self)
-        self._sub = _geis_subscription_new(geis, "py", 0)
+        self._sub = _geis_subscription_new(geis, "py".encode('utf-8'), 0)
+        self._filters = []
 
     def __del__(self):
         _geis_subscription_delete(self._sub)
@@ -640,6 +640,9 @@
 
         :param filter: the filter to add
         """
+        # keep a reference to the filter for Python doesn't garbage collect it
+        if filt not in self._filters:
+            self._filters.append(filt)
         _geis_lib.geis_subscription_add_filter(self._sub, filt)
 
     def remove_filter(self, filt):