Merge lp:~brandontschaefer/mir/lp-1252498-fix into lp:mir

[Brandon Schaefer]

Adds support to the MirMotionEvent under pointer_coordinates called tool_type. This will allow clients to tell what type of tool is being used, from mouse/finger/etc.

The mir event api does not expose what type of tool is for each pointer_cord. Some toolkits need to know the difference between different types of tools.

Adds a new type to pointer_cords, removing an 'int unused' and replacing it with an enum MirMotionToolType.

Adds tests for single pointer events, and multiple.

[Kevin DuBois (kdub)]

looks okay to me

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1198
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/389/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/118
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/118
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/118/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/389/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Interesting that we explicitly support multiple simultaneous tools touching the screen :)

review: Approve

[Daniel van Vugt (vanvugt)]

I actually came up with a need for this myself yesterday, so thanks.

=== modified file 'include/shared/mir_toolkit/event.h'
--- include/shared/mir_toolkit/event.h	2013-10-22 01:36:21 +0000
+++ include/shared/mir_toolkit/event.h	2013-11-18 22:39:55 +0000
@@ -109,6 +109,14 @@
     mir_motion_button_forward   = 1 << 4
 } MirMotionButton;
 
+typedef enum {
+   mir_motion_tool_type_unknown = 0,
+   mir_motion_tool_type_finger  = 1,
+   mir_motion_tool_type_stylus  = 2,
+   mir_motion_tool_type_mouse   = 3,
+   mir_motion_tool_type_eraser  = 4
+} MirMotionToolType;
+
 typedef struct
 {
     MirEventType type;
@@ -164,8 +172,8 @@
         float orientation;
         float vscroll;
         float hscroll;
+        MirMotionToolType tool_type;
 
-        int unused0;
         int unused1;
         int unused2;
         int unused3;

=== modified file 'src/shared/input/android/android_input_lexicon.cpp'
--- src/shared/input/android/android_input_lexicon.cpp	2013-10-22 04:16:22 +0000
+++ src/shared/input/android/android_input_lexicon.cpp	2013-11-18 22:39:55 +0000
@@ -80,6 +80,9 @@
 
                     mir_event.motion.pointer_coordinates[i].hscroll =
                            mev->getRawAxisValue(AMOTION_EVENT_AXIS_HSCROLL, i);
+
+                    mir_event.motion.pointer_coordinates[i].tool_type =
+                           static_cast<MirMotionToolType>(mev->getToolType(i));
             }
             break;
         }

=== modified file 'tests/unit-tests/input/android/test_android_input_lexicon.cpp'
--- tests/unit-tests/input/android/test_android_input_lexicon.cpp	2013-10-23 18:00:50 +0000
+++ tests/unit-tests/input/android/test_android_input_lexicon.cpp	2013-11-18 22:39:55 +0000
@@ -108,6 +108,7 @@
     const float orientation = 700.0;
     const float vscroll = 800.0;
     const float hscroll = 900.0;
+    const MirMotionToolType tool_type = mir_motion_tool_type_mouse;
 
     pointer_coords.setAxisValue(AMOTION_EVENT_AXIS_X, x_axis);
     pointer_coords.setAxisValue(AMOTION_EVENT_AXIS_Y, y_axis);
@@ -118,6 +119,7 @@
     pointer_coords.setAxisValue(AMOTION_EVENT_AXIS_ORIENTATION, orientation);
     pointer_coords.setAxisValue(AMOTION_EVENT_AXIS_VSCROLL, vscroll);
     pointer_coords.setAxisValue(AMOTION_EVENT_AXIS_HSCROLL, hscroll);
+    pointer_properties.toolType = tool_type;
 
     android_motion_ev->initialize(device_id, source_id, action, flags, edge_flags,
                                   meta_state, button_state, x_offset, y_offset,
@@ -165,6 +167,7 @@
     EXPECT_EQ(mir_pointer_coords->orientation, orientation);
     EXPECT_EQ(mir_pointer_coords->vscroll, vscroll);
     EXPECT_EQ(mir_pointer_coords->hscroll, hscroll);
+    EXPECT_EQ(mir_pointer_coords->tool_type, tool_type);
 
 
     delete android_motion_ev;
@@ -208,6 +211,9 @@
     const float vscroll[2] = {800.0, 8000.0};
     const float hscroll[2] = {900.0, 9000.0};
 
+    const MirMotionToolType tool_types[2] = {mir_motion_tool_type_mouse,
+                                             mir_motion_tool_type_finger};
+
     for (size_t p = 0; p < pointer_count; p++)
     {
         pointer_properties[p].id = pointer_id[p];
@@ -227,6 +233,8 @@
                                        vscroll[p]);
         pointer_coords[p].setAxisValue(AMOTION_EVENT_AXIS_HSCROLL,
                                        hscroll[p]);
+
+        pointer_properties[p].toolType = tool_types[p];
     }
 
     android_motion_ev->initialize(device_id, source_id, action, flags,
@@ -276,6 +284,7 @@
         EXPECT_EQ(pointer[p].orientation, orientation[p]);
         EXPECT_EQ(pointer[p].vscroll, vscroll[p]);
         EXPECT_EQ(pointer[p].hscroll, hscroll[p]);
+        EXPECT_EQ(pointer[p].tool_type, tool_types[p]);
     }
 
     delete android_motion_ev;