Merge lp:~dandrader/frame/missing_backend_funcs into lp:frame

[Daniel d'Andrada]

Add some missing functions to frame_backend.h

Namely frame_backend_frame_borrow_touch_by_index(),
frame_backend_touch_set_window_x() and frame_backend_touch_set_window_x().

The later two were added so that we can set the window coordinates independently.
We had only frame_backend_touch_set_window_pos(touch, x, y).

Add some missing functions to frame_backend.h

Namely frame_backend_frame_borrow_touch_by_index(), frame_backend_touch_set_window_x() and frame_backend_touch_set_window_x().

The later two were added so that we can set the window coordinates independently. We had only frame_backend_touch_set_window_pos(touch, x, y).

[lp:~dandrader/frame/missing_backend_funcs]

120. By Daniel d'Andrada on 2012-12-12

Update debian/libframe6.symbols

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:120
http://jenkins.qa.ubuntu.com/job/frame-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/frame-raring-amd64-ci/1//console
    FAILURE: http://jenkins.qa.ubuntu.com/job/frame-raring-armhf-ci/1//console
    FAILURE: http://jenkins.qa.ubuntu.com/job/frame-raring-i386-ci/1//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/frame-ci/1//rebuild/?

review: Needs Fixing (continuous-integration)

Unmerged revisions

120. By Daniel d'Andrada on 2012-12-12

Update debian/libframe6.symbols

119. By Daniel d'Andrada on 2012-12-11

Added frame_backend_frame_borrow_touch_by_index()

118. By Daniel d'Andrada on 2012-12-11

Added frame_backend_touch_set_window_x() and [...]_y()

So that we can set the window coordinates independently.
We had only frame_backend_touch_set_window_pos(touch, x, y), and it's not
uncommon for events out of /dev/event/input* to update only one coordinate
(i.e. only one coordinate between EV_SYNCs)

=== modified file 'configure.ac'
--- configure.ac	2012-12-04 18:46:01 +0000
+++ configure.ac	2012-12-12 11:49:20 +0000
@@ -1,7 +1,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([Touch Frame Library],
-        [2.5.0],
+        [2.6.0],
         [],
         [frame])
 AC_CONFIG_SRCDIR([Makefile.am])

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-07 06:37:45 +0000
+++ debian/changelog	2012-12-12 11:49:20 +0000
@@ -1,3 +1,10 @@
+frame (2.6.0daily12.12.11.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * Added frame_backend_touch_set_window_x() and [...]_y()
+  * Added frame_backend_frame_borrow_touch_by_index()
+
+ -- Daniel d'Andrada <[e-mail]>  Tue, 11 Dec 2012 12:06:51 -0200
+
 frame (2.5.0daily12.12.07.1-0ubuntu1) raring; urgency=low
 
   [ Daniel d'Andrada ]

=== modified file 'debian/libframe6.symbols'
--- debian/libframe6.symbols	2012-12-04 18:46:01 +0000
+++ debian/libframe6.symbols	2012-12-12 11:49:20 +0000
@@ -2,6 +2,10 @@
  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_2.6@FRAME_2.6 2.6.0
+ frame_backend_frame_borrow_touch_by_index@FRAME_2.6 2.6.0
+ frame_backend_touch_set_window_x@FRAME_2.6 2.6.0
+ frame_backend_touch_set_window_y@FRAME_2.6 2.6.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

=== modified file 'include/oif/frame_backend.h'
--- include/oif/frame_backend.h	2012-12-11 13:49:50 +0000
+++ include/oif/frame_backend.h	2012-12-12 11:49:20 +0000
@@ -175,11 +175,26 @@
  * will be made upon the first change made to it.
  *
  * Possible errors: UFStatusErrorInvalidTouch
+ * \sa frame_backend_frame_borrow_touch_by_index
  */
 FRAME_PUBLIC
 UFStatus frame_backend_frame_borrow_touch_by_id(UFBackendFrame frame,
                                                 UFTouchId id,
                                                 UFBackendTouch *touch);
+/**
+ * Gets a UFBackendTouch for the UFTouch in the specified index in the frame.
+ *
+ * Just like frame_backend_frame_borrow_touch_by_id, with the difference that
+ * you specify a index inside the given frame instead of the id of the touch
+ * you're interested in.
+ *
+ * Possible errors: UFStatusErrorInvalidTouch
+ * \sa frame_backend_frame_borrow_touch_by_id
+ */
+FRAME_PUBLIC
+UFStatus frame_backend_frame_borrow_touch_by_index(UFBackendFrame frame,
+                                                   unsigned int index,
+                                                   UFBackendTouch *touch);
 
 /**
  * Sets the "Device" property of the given frame
@@ -257,11 +272,26 @@
 
 /**
  * Sets the "WindowX" and "WindowY" properties of the given touch
+ * \sa frame_backend_touch_set_window_x, frame_backend_touch_set_window_y
  */
 FRAME_PUBLIC
 void frame_backend_touch_set_window_pos(UFBackendTouch touch, float x, float y);
 
 /**
+ * Sets the "WindowX" property of the given touch
+ * \sa frame_backend_touch_set_window_x, frame_backend_touch_set_window_pos
+ */
+FRAME_PUBLIC
+void frame_backend_touch_set_window_x(UFBackendTouch touch, float x);
+
+/**
+ * Sets the "WindowY" property of the given touch
+ * \sa frame_backend_touch_set_window_pos, frame_backend_touch_set_window_y
+ */
+FRAME_PUBLIC
+void frame_backend_touch_set_window_y(UFBackendTouch touch, float y);
+
+/**
  * Sets the "Time" property of the given touch
  */
 FRAME_PUBLIC

=== modified file 'src/frame.cpp'
--- src/frame.cpp	2012-08-31 19:07:05 +0000
+++ src/frame.cpp	2012-12-12 11:49:20 +0000
@@ -180,6 +180,13 @@
   return prev_->touches_array_[it->second]->GetValue(type, value);
 }
 
+SharedUFTouch* UFFrame::GetSharedTouchByIndex(unsigned int index) {
+  if (index >= touches_array_.size())
+    return nullptr;
+  else
+    return &(touches_array_[index]);
+}
+
 UFStatus UFFrame::GetTouchByIndex(unsigned int index, ::UFTouch* touch) const {
   if (index >= touches_array_.size())
     return UFStatusErrorInvalidTouch;
@@ -367,6 +374,22 @@
   }
 }
 
+UFStatus frame_backend_frame_borrow_touch_by_index(UFBackendFrame frame,
+                                                   unsigned int index,
+                                                   UFBackendTouch *touch)
+{
+  oif::frame::UFFrame* ufframe =
+    static_cast<oif::frame::UFFrame*>(frame->shared_ptr.get());
+
+  oif::frame::SharedUFTouch *shared_touch = ufframe->GetSharedTouchByIndex(index);
+  if (shared_touch) {
+    *touch = new UFBackendTouch_(*shared_touch);
+    return UFStatusSuccess;
+  } else {
+    return UFStatusErrorInvalidTouch;
+  }
+}
+
 void frame_backend_frame_set_device(UFBackendFrame frame, UFBackendDevice device)
 {
   static_cast<oif::frame::UFFrame*>(frame->shared_ptr.get())->

=== modified file 'src/frame.h'
--- src/frame.h	2012-08-31 17:04:43 +0000
+++ src/frame.h	2012-12-12 11:49:20 +0000
@@ -58,6 +58,7 @@
                                  float* value) const;
   UFStatus GetPreviousTouchProperty(const UFTouch* touch,
                                     UFTouchProperty property, void* value) const;
+  SharedUFTouch* GetSharedTouchByIndex(unsigned int index);
   UFStatus GetTouchByIndex(unsigned int index, ::UFTouch* touch) const;
   SharedUFTouch* GetSharedTouchById(UFTouchId touch_id);
   UFStatus GetTouchById(UFTouchId touch_id, ::UFTouch* touch) const;

=== modified file 'src/libframe.ver'
--- src/libframe.ver	2012-12-04 18:46:01 +0000
+++ src/libframe.ver	2012-12-12 11:49:20 +0000
@@ -109,3 +109,10 @@
     frame_accept_touch;
     frame_reject_touch;
 } FRAME_2.4;
+
+FRAME_2.6 {
+  global:
+    frame_backend_frame_borrow_touch_by_index;
+    frame_backend_touch_set_window_x;
+    frame_backend_touch_set_window_y;
+} FRAME_2.5;

=== modified file 'src/touch.cpp'
--- src/touch.cpp	2012-08-31 17:04:43 +0000
+++ src/touch.cpp	2012-12-12 11:49:20 +0000
@@ -264,6 +264,18 @@
   touch->InsertProperty(UFTouchPropertyWindowY, new oif::frame::Value(y));
 }
 
+void frame_backend_touch_set_window_x(UFBackendTouch touch_backend, float x)
+{
+  oif::frame::UFTouch *touch = touch_backend->GetModifiableTouch();
+  touch->InsertProperty(UFTouchPropertyWindowX, new oif::frame::Value(x));
+}
+
+void frame_backend_touch_set_window_y(UFBackendTouch touch_backend, float y)
+{
+  oif::frame::UFTouch *touch = touch_backend->GetModifiableTouch();
+  touch->InsertProperty(UFTouchPropertyWindowY, new oif::frame::Value(y));
+}
+
 void frame_backend_touch_set_time(UFBackendTouch touch_backend, uint64_t time)
 {
   oif::frame::UFTouch *touch = touch_backend->GetModifiableTouch();

=== modified file 'test/regular/backend.cpp'
--- test/regular/backend.cpp	2012-08-31 19:26:43 +0000
+++ test/regular/backend.cpp	2012-12-12 11:49:20 +0000
@@ -23,6 +23,12 @@
   ASSERT_EQ(1.2f, frame_touch_get_window_x(touch));
   ASSERT_EQ(3.4f, frame_touch_get_window_y(touch));
 
+  frame_backend_touch_set_window_x(touch_backend, 5.6f);
+  ASSERT_EQ(5.6f, frame_touch_get_window_x(touch));
+
+  frame_backend_touch_set_window_y(touch_backend, 7.8f);
+  ASSERT_EQ(7.8f, frame_touch_get_window_y(touch));
+
   frame_backend_touch_set_time(touch_backend, 852);
   ASSERT_EQ(852, frame_touch_get_time(touch));
 
@@ -191,6 +197,31 @@
   frame_backend_frame_delete(frame_backend);
 }
 
+TEST(Backend, FrameBorrowTouchByIndex)
+{
+  UFStatus status;
+
+  UFBackendFrame frame_backend = frame_backend_frame_new();
+
+  UFBackendTouch touch_backend = frame_backend_touch_new();
+  frame_backend_touch_set_id(touch_backend, 12);
+
+  status = frame_backend_frame_give_touch(frame_backend, &touch_backend);
+  ASSERT_EQ(UFStatusSuccess, status);
+
+  status = frame_backend_frame_borrow_touch_by_index(frame_backend, 0, &touch_backend);
+  ASSERT_EQ(UFStatusSuccess, status);
+
+  UFTouch touch = frame_backend_touch_get_touch(touch_backend);
+  ASSERT_EQ(12, frame_touch_get_id(touch));
+
+  status = frame_backend_frame_give_touch(frame_backend, &touch_backend);
+  ASSERT_EQ(UFStatusSuccess, status);
+
+  /* clean up */
+  frame_backend_frame_delete(frame_backend);
+}
+
 TEST(Backend, FrameCreateNext)
 {
   UFStatus status;