Merge lp:~sergiusens/frame/update into lp:frame/phablet

[Sergio Schvezov]

Merging in trunk and bumping version

[Daniel d'Andrada (dandrader)]

Looks fine.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-11-29 15:30:50 +0000
+++ configure.ac	2013-03-22 17:36:22 +0000
@@ -1,7 +1,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([Touch Frame Library],
-        [2.4.4],
+        [2.5.0],
         [],
         [frame])
 AC_CONFIG_SRCDIR([Makefile.am])

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-29 21:16:47 +0000
+++ debian/changelog	2013-03-22 17:36:22 +0000
@@ -1,3 +1,36 @@
+frame (2.5.0daily13.03.12-0ubuntu1phablet1) quantal; urgency=low
+
+  * Merging current branch into phablet series.
+
+ -- Sergio Schvezov <[e-mail]>  Fri, 22 Mar 2013 13:25:22 -0300
+
+frame (2.5.0daily13.03.12-0ubuntu1) raring; urgency=low
+
+  [ Stephen M. Webb ]
+  * frame FTBFS out of source tree (LP: #1152741)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 119
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 12 Mar 2013 06:52:59 +0000
+
+frame (2.5.0daily12.12.13-0ubuntu1) raring; urgency=low
+
+  * Automatic snapshot from revision 117
+
+ -- Automatic PS uploader <[e-mail]>  Thu, 13 Dec 2012 02:01:19 +0000
+
+frame (2.5.0daily12.12.07.1-0ubuntu1) raring; urgency=low
+
+  [ Daniel d'Andrada ]
+  * Relicense under (L)GPL version 3 *only* (no +)
+  * new: frame_accept_touch() and frame_reject_touch()
+
+  [ Automatic PS uploader ]
+  * Automatic snapshot from revision 115
+
+ -- Automatic PS uploader <[e-mail]>  Fri, 07 Dec 2012 06:37:44 +0000
+
 frame (2.4.4phablet2) quantal; urgency=low
 
   * Bump for auto CI/land
@@ -10,6 +43,18 @@
 
  -- Daniel d'Andrada <[e-mail]>  Thu, 29 Nov 2012 13:56:37 -0200
 
+frame (2.4.4daily12.12.04-0ubuntu1) raring; urgency=low
+
+  * Automatic snapshot from revision 110
+
+ -- Automatic PS uploader <[e-mail]>  Tue, 04 Dec 2012 02:00:43 +0000
+
+frame (2.4.4daily12.12.03-0ubuntu1) raring; urgency=low
+
+  * Automatic snapshot from revision 108
+
+ -- Automatic PS uploader <[e-mail]>  Mon, 03 Dec 2012 02:01:32 +0000
+
 frame (2.4.4daily12.11.29.1-0ubuntu1) raring; urgency=low
 
   [ Robert Bruce Park ]

=== modified file 'debian/copyright'
--- debian/copyright	2012-11-22 22:16:27 +0000
+++ debian/copyright	2013-03-22 17:36:22 +0000
@@ -23,11 +23,10 @@
 Files: test/* tools/*
 Copyright: 2010-2012, Canonical Ltd.
            2010, Henrik Rydberg <[e-mail]>
-License: GPL-3+
+License: GPL-3
  This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ 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 warranty of

=== modified file 'debian/libframe6.symbols'
--- debian/libframe6.symbols	2012-11-29 16:05:53 +0000
+++ debian/libframe6.symbols	2013-03-22 17:36:22 +0000
@@ -1,6 +1,9 @@
 libframe.so.6 libframe6 #MINVER#
  FRAME_2.2@FRAME_2.2 2.2.0
  FRAME_2.4@FRAME_2.4 2.4.3
+ FRAME_2.5@FRAME_2.5 2.5.0
+ frame_accept_touch@FRAME_2.5 2.5.0
+ frame_reject_touch@FRAME_2.5 2.5.0
  frame_axis_get_maximum@FRAME_2.2 2.2.4
  frame_axis_get_minimum@FRAME_2.2 2.2.4
  frame_axis_get_resolution@FRAME_2.2 2.2.4

=== modified file 'include/oif/frame.h.in'
--- include/oif/frame.h.in	2012-11-20 14:13:20 +0000
+++ include/oif/frame.h.in	2013-03-22 17:36:22 +0000
@@ -2,7 +2,7 @@
  *
  * frame - Touch Frame Library
  *
- * Copyright (C) 2010-2012 Canonical Ltd.
+ * Copyright (C) 2010-2013 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 version 3
@@ -741,9 +741,46 @@
 FRAME_PUBLIC
 uint64_t frame_touch_get_start_time(UFTouch touch);
 
+/**
+ * Accept ownership of a touch
+ *
+ * All touches received should be eventally accepted or rejected.
+ * This decision can come even after they have already ended but
+ * should be done as soon as possible.
+ *
+ * You should accept a touch when you're going to use it and
+ * reject it if you're not interested in it.
+ *
+ * Not all window servers have this concept. Those that do use
+ * this information to pass rejected touches forward to other
+ * clients that might want it.
+ *
+ * @param [in] device The device object for the touch (const)
+ * @param [in] window The window to accept the touch for
+ * @param [in] touch_id The touch ID object for the touch
+ * @return UFStatusSuccess, UFStatusErrorInvalidTouch
+ * @see frame_reject_touch
+ */
+FRAME_PUBLIC
+UFStatus frame_accept_touch(UFDevice device, UFWindowId window,
+                            UFTouchId touch_id);
+
+/**
+ * Reject ownership of a touch
+ *
+ * @param [in] device The device object for the touch (const)
+ * @param [in] window The window to reject the touch for
+ * @param [in] touch_id The touch ID object for the touch
+ * @return UFStatusSuccess, UFStatusErrorInvalidTouch
+ * @see frame_accept_touch
+ */
+FRAME_PUBLIC
+UFStatus frame_reject_touch(UFDevice device, UFWindowId window,
+                            UFTouchId touch_id);
+
 /** @} */
 
-#include "frame_internal.h"
+#include "oif/frame_internal.h"
 
 #ifdef __cplusplus
 }

=== modified file 'include/oif/frame_backend.h'
--- include/oif/frame_backend.h	2012-11-09 13:07:06 +0000
+++ include/oif/frame_backend.h	2013-03-22 17:36:22 +0000
@@ -151,6 +151,9 @@
  *
  * Touches that had a "end" state on the given frame won't be present
  * on the new frame.
+ *
+ * The "ActiveTouches" property is automatically set to match the number
+ * of UFTouches present or remaining.
  */
 FRAME_PUBLIC
 UFBackendFrame frame_backend_frame_create_next(UFBackendFrame frame);

=== modified file 'include/oif/frame_x11.h'
--- include/oif/frame_x11.h	2012-07-24 21:36:05 +0000
+++ include/oif/frame_x11.h	2013-03-22 17:36:22 +0000
@@ -2,7 +2,7 @@
  *
  * frame - Touch Frame Library
  *
- * Copyright (C) 2010-2012 Canonical Ltd.
+ * Copyright (C) 2010-2013 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 version 3
@@ -21,7 +21,7 @@
 #ifndef FRAME_OIF_FRAME_X11_H_
 #define FRAME_OIF_FRAME_X11_H_
 
-#include "frame.h"
+#include "oif/frame.h"
 #include <X11/Xlib.h>
 
 #ifdef __cplusplus
@@ -71,6 +71,7 @@
 /**
  * Accept ownership of a touch
  *
+ * @deprecated Use frame_accept_touch instead.
  * @param [in] device The device object for the touch (const)
  * @param [in] window The window to accept the touch for
  * @param [in] touch_id The touch ID object for the touch
@@ -83,6 +84,7 @@
 /**
  * Reject ownership of a touch
  *
+ * @deprecated Use frame_reject_touch instead.
  * @param [in] device The device object for the touch (const)
  * @param [in] window The window to reject the touch for
  * @param [in] touch_id The touch ID object for the touch

=== modified file 'm4/gtest.m4'
--- m4/gtest.m4	2012-07-18 12:28:56 +0000
+++ m4/gtest.m4	2013-03-22 17:36:22 +0000
@@ -38,10 +38,18 @@
 
   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])
+  AC_LANG_PUSH(C++)
+  gtest_save_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$CPPFLAGS $GTEST_CPPFLAGS"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "src/gtest-all.cc"]])],
+                    [have_gtest=yes],
+                    [have_gtest=no])
+  AS_IF([test "x$have_gtest" = xyes],
+        [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include "src/gtest_main.cc"]])],
+                           [],
+                           [have_gtest=no])])
+  CPPFLAGS=$gtest_save_CPPFLAGS
+  AC_LANG_POP(C++)
 
   AS_IF([test "x$have_gtest" = xyes],
         [GTEST_LIBS=-lpthread

=== modified file 'm4/xorg-gtest.m4'
--- m4/xorg-gtest.m4	2012-06-21 19:41:40 +0000
+++ m4/xorg-gtest.m4	2013-03-22 17:36:22 +0000
@@ -1,4 +1,4 @@
-# serial 2
+# serial 3
 
 # 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_source" = 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,7 +32,7 @@
 # Both default actions are no-ops.
 AC_DEFUN([CHECK_XORG_GTEST],
 [
-  AC_REQUIRE([_CHECK_GTEST])
+  AC_REQUIRE([CHECK_GTEST])
 
   PKG_CHECK_EXISTS([xorg-gtest],
                    [have_xorg_gtest=yes],

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-11-20 14:13:20 +0000
+++ src/Makefile.am	2013-03-22 17:36:22 +0000
@@ -14,6 +14,7 @@
 	$(CXX_LIBS)
 
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include/ \
 	-I$(top_srcdir)/src \
 	$(WARNING_CPPFLAGS) \
@@ -29,7 +30,7 @@
 
 libframeincludedir = $(includedir)/oif
 libframeinclude_HEADERS = \
-	$(top_srcdir)/include/oif/frame.h \
+	$(top_builddir)/include/oif/frame.h \
 	$(top_srcdir)/include/oif/frame_backend.h \
 	$(top_srcdir)/include/oif/frame_internal.h
 
@@ -69,4 +70,4 @@
 	x11/window_x11.cpp
 endif
 
-EXTRA_DIST = $(version_script)
+EXTRA_DIST = $(version_script) 

=== modified file 'src/device.cpp'
--- src/device.cpp	2012-08-29 18:53:37 +0000
+++ src/device.cpp	2013-03-22 17:36:22 +0000
@@ -51,6 +51,20 @@
   return UFStatusSuccess;
 }
 
+UFStatus UFDevice::AcceptTouch(UFWindowId window_id, UFTouchId touch_id)
+{
+    (void)window_id;
+    (void)touch_id;
+    return UFStatusSuccess;
+}
+
+UFStatus UFDevice::RejectTouch(UFWindowId window_id, UFTouchId touch_id)
+{
+    (void)window_id;
+    (void)touch_id;
+    return UFStatusSuccess;
+}
+
 } // namespace frame
 } // namespace oif
 
@@ -143,6 +157,20 @@
   return resolution;
 }
 
+UFStatus frame_accept_touch(UFDevice device, UFWindowId window_id,
+                            UFTouchId touch_id)
+{
+  return static_cast<oif::frame::UFDevice*>(device)->
+      AcceptTouch(window_id, touch_id);
+}
+
+UFStatus frame_reject_touch(UFDevice device, UFWindowId window_id,
+                            UFTouchId touch_id)
+{
+  return static_cast<oif::frame::UFDevice*>(device)->
+      RejectTouch(window_id, touch_id);
+}
+
 UFBackendDevice frame_backend_device_new()
 {
   return new UFBackendDevice_(new oif::frame::UFDevice);

=== modified file 'src/device.h'
--- src/device.h	2012-08-28 18:20:51 +0000
+++ src/device.h	2013-03-22 17:36:22 +0000
@@ -55,6 +55,9 @@
   typedef std::unique_ptr<UFAxis> UniqueUFAxis;
 
   std::map<UFAxisType, UniqueUFAxis> axes_;
+
+  virtual UFStatus AcceptTouch(UFWindowId window_id, UFTouchId touch_id);
+  virtual UFStatus RejectTouch(UFWindowId window_id, UFTouchId touch_id);
 };
 
 } // namespace frame

=== modified file 'src/libframe.ver'
--- src/libframe.ver	2012-11-26 19:55:29 +0000
+++ src/libframe.ver	2013-03-22 17:36:22 +0000
@@ -103,3 +103,9 @@
     frame_event_set_frame;
     frame_event_set_time;
 } FRAME_2.2;
+
+FRAME_2.5 {
+  global:
+    frame_accept_touch;
+    frame_reject_touch;
+} FRAME_2.4;

=== modified file 'src/x11/device_x11.cpp'
--- src/x11/device_x11.cpp	2012-08-28 19:25:07 +0000
+++ src/x11/device_x11.cpp	2013-03-22 17:36:22 +0000
@@ -179,9 +179,10 @@
   return false;
 }
 
-UFStatus UFDeviceX11::AcceptTouch(::Window window_id,
-                                  UFTouchId touch_id) const {
-  auto it = windows_.find(window_id);
+UFStatus UFDeviceX11::AcceptTouch(UFWindowId window_id,
+                                  UFTouchId touch_id) {
+  ::Window x11_window_id = frame_x11_get_window_id(window_id);
+  auto it = windows_.find(x11_window_id);
   if (it != windows_.end()) {
     WindowX11* window = static_cast<WindowX11*>(it->second.get());
     return window->AcceptTouch(touch_id);
@@ -190,9 +191,10 @@
   return UFStatusErrorInvalidTouch;
 }
 
-UFStatus UFDeviceX11::RejectTouch(::Window window_id,
-                                  UFTouchId touch_id) const {
-  auto it = windows_.find(window_id);
+UFStatus UFDeviceX11::RejectTouch(UFWindowId window_id,
+                                  UFTouchId touch_id) {
+  ::Window x11_window_id = frame_x11_get_window_id(window_id);
+  auto it = windows_.find(x11_window_id);
   if (it != windows_.end()) {
     WindowX11* window = static_cast<WindowX11*>(it->second.get());
     return window->RejectTouch(touch_id);
@@ -212,18 +214,18 @@
 
 extern "C" {
 
-UFStatus frame_x11_accept_touch(UFDevice device, UFWindowId window,
+UFStatus frame_x11_accept_touch(UFDevice device, UFWindowId window_id,
                                 UFTouchId touch_id) {
   oif::frame::UFDeviceX11* device_x11 =
       static_cast<oif::frame::UFDeviceX11*>(device);
-  return device_x11->AcceptTouch(frame_x11_get_window_id(window), touch_id);
+  return device_x11->AcceptTouch(window_id, touch_id);
 }
 
-UFStatus frame_x11_reject_touch(UFDevice device, UFWindowId window,
+UFStatus frame_x11_reject_touch(UFDevice device, UFWindowId window_id,
                                 UFTouchId touch_id) {
   oif::frame::UFDeviceX11* device_x11 =
       static_cast<oif::frame::UFDeviceX11*>(device);
-  return device_x11->RejectTouch(frame_x11_get_window_id(window), touch_id);
+  return device_x11->RejectTouch(window_id, touch_id);
 }
 
 } // extern "C"

=== modified file 'src/x11/device_x11.h'
--- src/x11/device_x11.h	2012-06-21 19:41:40 +0000
+++ src/x11/device_x11.h	2013-03-22 17:36:22 +0000
@@ -45,8 +45,8 @@
   bool HandleDeviceEvent(const XIDeviceEvent* event, SharedUFFrame* frame);
   bool HandleOwnershipEvent(const XITouchOwnershipEvent* event,
                             SharedUFFrame* frame);
-  UFStatus AcceptTouch(::Window window_id, UFTouchId touch_id) const;
-  UFStatus RejectTouch(::Window window_id, UFTouchId touch_id) const;
+  virtual UFStatus AcceptTouch(UFWindowId window_id, UFTouchId touch_id);
+  virtual UFStatus RejectTouch(UFWindowId window_id, UFTouchId touch_id);
   void ReleaseFrames();
 
   UFDeviceX11(const UFDeviceX11&) = delete;

=== modified file 'test/integration/events.cpp'
--- test/integration/events.cpp	2012-07-24 20:47:15 +0000
+++ test/integration/events.cpp	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'test/integration/events.h'
--- test/integration/events.h	2012-07-24 20:47:15 +0000
+++ test/integration/events.h	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'test/integration/x11/device.cpp'
--- test/integration/x11/device.cpp	2012-06-21 19:41:40 +0000
+++ test/integration/x11/device.cpp	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'test/integration/x11/dynamic_type_checking.cpp'
--- test/integration/x11/dynamic_type_checking.cpp	2012-06-21 19:41:40 +0000
+++ test/integration/x11/dynamic_type_checking.cpp	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'test/integration/x11/fixture.cpp'
--- test/integration/x11/fixture.cpp	2012-06-21 19:41:40 +0000
+++ test/integration/x11/fixture.cpp	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'test/integration/x11/fixture.h'
--- test/integration/x11/fixture.h	2012-06-21 19:41:40 +0000
+++ test/integration/x11/fixture.h	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'test/integration/x11/ids.cpp'
--- test/integration/x11/ids.cpp	2012-06-21 19:41:40 +0000
+++ test/integration/x11/ids.cpp	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'test/integration/x11/recording.cpp'
--- test/integration/x11/recording.cpp	2012-06-21 19:41:40 +0000
+++ test/integration/x11/recording.cpp	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'test/regular/Makefile.am'
--- test/regular/Makefile.am	2012-11-20 14:13:20 +0000
+++ test/regular/Makefile.am	2013-03-22 17:36:22 +0000
@@ -15,6 +15,7 @@
 	$(COVERAGE_CFLAGS)
 
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-iquote$(srcdir)
 
@@ -46,6 +47,7 @@
 if HAVE_XINPUT
 check_regular_SOURCES += \
 	accept-ended-touch.cpp \
+    x11-accept-touch.cpp \
 	frame-x11-fixture.cpp \
 	frame-x11-fixture.h
 endif

=== added file 'test/regular/x11-accept-touch.cpp'
--- test/regular/x11-accept-touch.cpp	1970-01-01 00:00:00 +0000
+++ test/regular/x11-accept-touch.cpp	2013-03-22 17:36:22 +0000
@@ -0,0 +1,86 @@
+#include "frame-x11-fixture.h"
+#include "x11_mocks.h"
+
+class X11TouchAcceptance : public FrameX11Fixture
+{
+};
+
+/*
+ Calls frame_accept_touch and check if the corresponding X11 call is made
+ */
+TEST_F(X11TouchAcceptance, Accept)
+{
+  UFStatus status;
+  UFDevice device;
+
+  xmock_server_time = 1234;
+
+  CreateXMockTouchScreenDevice();
+
+  Display *display = XOpenDisplay(NULL);
+
+  status = frame_x11_new(display, &frame_handle);
+  ASSERT_EQ(UFStatusSuccess, status);
+
+  FetchDeviceAddedEvent(&device);
+  AssertNoMoreEvents();
+
+  SendTouchEvent(XI_TouchBegin, 1, 10.0f, 10.0f);
+  SendTouchOwnershipEvent(1);
+
+  UFWindowId frame_window_id = frame_x11_create_window_id(DefaultRootWindow(display));
+  status = frame_accept_touch(device, frame_window_id, 1);
+  ASSERT_EQ(UFStatusSuccess, status);
+
+  ASSERT_EQ(XIAcceptTouch,
+            xmock_get_touch_acceptance(xmock_devices[0].attachment /* device id */,
+                                       1 /* touch id */,
+                                       DefaultRootWindow(display)));
+
+  frame_x11_delete(frame_handle);
+  frame_handle = nullptr;
+
+  XCloseDisplay(display);
+
+  DestroyXMockDevices();
+}
+
+/*
+ Calls frame_reject_touch and check if the corresponding X11 call is made
+ */
+TEST_F(X11TouchAcceptance, Reject)
+{
+  UFStatus status;
+  UFDevice device;
+
+  xmock_server_time = 1234;
+
+  CreateXMockTouchScreenDevice();
+
+  Display *display = XOpenDisplay(NULL);
+
+  status = frame_x11_new(display, &frame_handle);
+  ASSERT_EQ(UFStatusSuccess, status);
+
+  FetchDeviceAddedEvent(&device);
+  AssertNoMoreEvents();
+
+  SendTouchEvent(XI_TouchBegin, 1, 10.0f, 10.0f);
+  SendTouchOwnershipEvent(1);
+
+  UFWindowId frame_window_id = frame_x11_create_window_id(DefaultRootWindow(display));
+  status = frame_reject_touch(device, frame_window_id, 1);
+  ASSERT_EQ(UFStatusSuccess, status);
+
+  ASSERT_EQ(XIRejectTouch,
+            xmock_get_touch_acceptance(xmock_devices[0].attachment /* device id */,
+                                       1 /* touch id */,
+                                       DefaultRootWindow(display)));
+
+  frame_x11_delete(frame_handle);
+  frame_handle = nullptr;
+
+  XCloseDisplay(display);
+
+  DestroyXMockDevices();
+}

=== modified file 'tools/Makefile.am'
--- tools/Makefile.am	2012-06-21 19:41:40 +0000
+++ tools/Makefile.am	2013-03-22 17:36:22 +0000
@@ -1,4 +1,7 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include/ $(WARNING_CPPFLAGS)
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	$(WARNING_CPPFLAGS)
 
 AM_CFLAGS = $(C11_CFLAGS) $(COVERAGE_CFLAGS)
 

=== modified file 'tools/common/device.c'
--- tools/common/device.c	2012-06-21 19:41:40 +0000
+++ tools/common/device.c	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'tools/common/device.h'
--- tools/common/device.h	2012-06-21 19:41:40 +0000
+++ tools/common/device.h	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'tools/common/frame.c'
--- tools/common/frame.c	2012-06-21 19:41:40 +0000
+++ tools/common/frame.c	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'tools/common/frame.h'
--- tools/common/frame.h	2012-06-21 19:41:40 +0000
+++ tools/common/frame.h	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'tools/common/touch.c'
--- tools/common/touch.c	2012-06-21 19:41:40 +0000
+++ tools/common/touch.c	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'tools/common/touch.h'
--- tools/common/touch.h	2012-06-21 19:41:40 +0000
+++ tools/common/touch.h	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of

=== modified file 'tools/frame-test-x11.c'
--- tools/frame-test-x11.c	2012-06-21 19:41:40 +0000
+++ tools/frame-test-x11.c	2013-03-22 17:36:22 +0000
@@ -5,9 +5,8 @@
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * 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 warranty of