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

[Stephen M. Webb]

Makes direct use of XI2.1 code optional at compile time.

Some downstream distributions stopped being able to compile when the XI2.1 stuff went in. This will restore buildability at the cost of device enumeration. The default configuration is to enable and build with XI2.1 support. Support can either be disabled through configure or automatically if XI2.1 is not available on the build system.

[Duncan McGreggor (oubiwann)]

"This will restore buildability at the cost of device enumeration."

Stephen, could you elaborate a little more on the reason for device enumeration being "lost"?

And to clarify:

Device will continue to work if XI2.1 is available and support for it is compiled, yes?

review: Needs Information

[Henrik Rydberg (rydberg)]

Are the two ways to test for the hidden attribute equivalent? If so, perhaps it should be saved for oneiric?

review: Needs Information

[Stephen M. Webb (bregma)]

> "This will restore buildability at the cost of device enumeration."
>
> Stephen, could you elaborate a little more on the reason for device
> enumeration being "lost"?

Absolutely.

Utouch-geis uses XI2.1 calls to the X server to enumerate the available multi-touch capable input devices. The functionality available through XI2.1 is an API-breaking change currently available only in Ubuntu 11.04 and later or those other distributions willing to port the Ubuntu-specific x.org patches.

The API breakage is in the x.org client library headers but also requires an ABI breakage in the entire x.org stack. Some distributions wish to take advantage of uTouch as it worked in Ubuntu 10.10 and the added functionality delivered by XI2.1 is not necessary for that.

This change makes the use of the API-breaking changes configurable at compile time for those downstream consumers who have been unable to build utouch-geis since version 2.0.4.

> And to clarify:
>
> Device will continue to work if XI2.1 is available and support for it is
> compiled, yes?

Functionality on Ubuntu will continue to work as before. Use of XI2.1 is enabled by default in development systems that support it unless steps are take to disable it with --disable-xi2.1 when running configure.

[Stephen M. Webb (bregma)]

> Are the two ways to test for the hidden attribute equivalent? If so, perhaps
> it should be saved for oneiric?

I'm not sure I understand this question. Do you mean utouch-geis should talk to the kernel of the host on which it's running to determine the capabilities of local hardware as an alternative to querying the X server if that choice is not available at compile time? That's possible as an add-on, but the changes in this merge would still be required.

This change is not targeted at Ubuntu. It does not need to get in to natty. It is for other downstream consumers of utouch-geis.

[Henrik Rydberg (rydberg)]

I was referring to lines 33-38 in the diff. Either way, since this is general development, no problem.

review: Approve

[Chase Douglas (chasedouglas)]

Looks good to me too!

review: Approve

[Stephen M. Webb (bregma)]

> I was referring to lines 33-38 in the diff. Either way, since this is general
> development, no problem.

Ah, I understand now.

AC_TRY_COMPILE is deprecated in autoconf in favour of AC_COMPILE_IFELSE. Since I was using the newer construct elsewhere I though I'd just go for consistency. The two compile tests are functionally equivalent in this case.

[lp:~bregma/geis/lp-741404]

135. By Stephen M. Webb on 2011-05-03

Fix a persistence problem with callbacks in the simplified interface (LP: #754135).

136. By Stephen M. Webb on 2011-05-03

Make direct use of XI2,1 code optional at compile time (LP: #741404)

=== modified file 'ChangeLog'
--- ChangeLog	2011-04-05 18:04:36 +0000
+++ ChangeLog	2011-04-13 01:55:45 +0000
@@ -1,3 +1,11 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Made direct use of XI2.1 optional at build time (LP: #741404).
+
+  * m4/ax_enable_xi2.m4: new autoconf macro
+  * configure.ac: invoked the new macro
+  * libutouch-geis/backend/xcb/geis_xcb_backend.c: optioned XI2.1 code
+
 2011-04-05  Stephen M. Webb  <[e-mail]>
 
   Fixed invalid pointer dereference on XI initialization failure in XCB back
 
=== modified file 'configure.ac'
--- configure.ac	2011-04-06 16:00:41 +0000
+++ configure.ac	2011-04-13 01:55:45 +0000
@@ -48,6 +48,8 @@
 PKG_CHECK_MODULES([XI2], [xi >= 1.3], ,
 		  AC_MSG_ERROR([XI2 development libraries not found]))
 
+AX_ENABLE_XI2
+
 # XCB code generation configuration
 PKG_CHECK_MODULES([XCB_PROTO], [xcb-proto >= 1.6])
 AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
@@ -66,8 +68,10 @@
 
 # Check toolchain features
 AC_MSG_CHECKING([whether hidden visibility is supported])
-AC_TRY_COMPILE([void __attribute__((visibility ("hidden"))) bar (void) {}],,
-               [geis_hidden=yes],[geis_hidden=no])
+geis_hidden=no
+AC_COMPILE_IFELSE(AC_LANG_PROGRAM([
+  void __attribute__((visibility ("hidden"))) bar (void) {}]),
+  [geis_hidden=yes])
 AC_MSG_RESULT($geis_hidden)
 if test x$geis_hidden = xyes; then
   AC_DEFINE([GEIS_DSO_PRIVATE],[1],[symbol visibility is supported])
 
=== modified file 'libutouch-geis/backend/xcb/geis_xcb_backend.c'
--- libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-04-06 15:16:00 +0000
+++ libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-04-13 01:55:45 +0000
@@ -112,6 +112,7 @@
   GeisBoolean is_direct = GEIS_FALSE;
   GeisBoolean is_independent = GEIS_FALSE;
 
+#ifdef HAVE_XI_2_1
   if (xi2_mode == XIDirectTouch)
     is_direct = GEIS_TRUE;
 
@@ -141,6 +142,7 @@
   {
     geis_device_add_attr(geis_device, device_attr);
   }
+#endif
 }
 
 
@@ -738,6 +740,7 @@
   for (class_index = 0; class_index < xcb_device->num_classes; ++class_index)
   {
     XIAnyClassInfo *any = xcb_device->classes[class_index];
+#ifdef HAVE_XI_2_1
     if (any->type == XITouchClass)
     {
       XITouchClassInfo *v = (XITouchClassInfo *)any;
@@ -807,6 +810,7 @@
 	geis_device_add_attr(geis_device, device_attr);
       }
     }
+#endif
   }
   geis_post_event(be->geis, device_event);
   goto final_exit;
@@ -840,11 +844,13 @@
          ++class_index)
     {
       XIAnyClassInfo *any = devices[device_index].classes[class_index];
+#ifdef HAVE_XI_2_1
       if (any->type == XITouchClass)
       {
 	_report_an_xcb_device(be, &devices[device_index]);
 	break;
       }
+#endif
     }
   }
 
 
=== added file 'm4/ax_enable_xi2.m4'
--- m4/ax_enable_xi2.m4	1970-01-01 00:00:00 +0000
+++ m4/ax_enable_xi2.m4	2011-04-13 01:55:45 +0000
@@ -0,0 +1,36 @@
+#
+# @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 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 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],
+                AS_HELP_STRING([--disable-xi2.1], [Disable XI2.1 features]))
+  AS_IF([test "x$enable_xi2_1" != "xno"],[
+    AC_MSG_CHECKING([for XI2.1])
+    ax_have_xi_2_1=no
+    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([
+      #include <X11/extensions/XInput2.h>
+      XITouchValuatorClassInfo* p = 0;
+      ]),
+      [ax_have_xi_2_1=yes
+       AC_DEFINE([HAVE_XI_2_1],[1],[XInput 2.1 is available])]
+    )
+    AC_MSG_RESULT([$ax_have_xi_2_1])
+  ])
+])
+