1
=== modified file 'src/server/input/android/android_input_dispatcher.cpp'
2
--- src/server/input/android/android_input_dispatcher.cpp	2014-05-19 02:55:29 +0000
3
+++ src/server/input/android/android_input_dispatcher.cpp	2014-05-20 12:42:08 +0000
4
@@ -82,7 +82,7 @@
5
82
        for(auto i = 0U; i != event.motion.pointer_count; ++i)
82
        for(auto i = 0U; i != event.motion.pointer_count; ++i)
6
83
        {
83
        {
7
84
            pointer_properties[i].id = event.motion.pointer_coordinates[i].id;
84
            pointer_properties[i].id = event.motion.pointer_coordinates[i].id;
9
85
            pointer_properties[i].toolType = 0;
85
            pointer_properties[i].toolType = event.motion.pointer_coordinates[i].tool_type;
10
86
86
11
87
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_X, event.motion.pointer_coordinates[i].x);
87
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_X, event.motion.pointer_coordinates[i].x);
12
88
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_Y, event.motion.pointer_coordinates[i].y);
88
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_Y, event.motion.pointer_coordinates[i].y);
13
@@ -90,6 +90,8 @@
14
90
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_SIZE, event.motion.pointer_coordinates[i].size);
90
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_SIZE, event.motion.pointer_coordinates[i].size);
15
91
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MAJOR, event.motion.pointer_coordinates[i].touch_major);
91
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MAJOR, event.motion.pointer_coordinates[i].touch_major);
16
92
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MINOR, event.motion.pointer_coordinates[i].touch_minor);
92
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MINOR, event.motion.pointer_coordinates[i].touch_minor);
17
93
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_VSCROLL, event.motion.pointer_coordinates[i].vscroll);
18
94
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_HSCROLL, event.motion.pointer_coordinates[i].hscroll);
19
93
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_ORIENTATION, event.motion.pointer_coordinates[i].orientation);
95
            pointer_coords[i].setAxisValue(AMOTION_EVENT_AXIS_ORIENTATION, event.motion.pointer_coordinates[i].orientation);
20
94
        }
96
        }
21
95
97
22
96
98
23
=== modified file 'tests/unit-tests/input/android/test_android_input_dispatcher.cpp'
24
--- tests/unit-tests/input/android/test_android_input_dispatcher.cpp	2014-05-19 02:55:29 +0000
25
+++ tests/unit-tests/input/android/test_android_input_dispatcher.cpp	2014-05-20 12:42:08 +0000
26
@@ -29,6 +29,7 @@
27
29
#include <gmock/gmock.h>
29
#include <gmock/gmock.h>
28
30
30
29
31
#include <initializer_list>
31
#include <initializer_list>
30
32
#include <cstring>
31
32
33
32
33
namespace droidinput = android;
34
namespace droidinput = android;
33
34
35
34
@@ -59,6 +60,7 @@
35
59
    std::shared_ptr<mtd::MockAndroidInputDispatcher> dispatcher = std::make_shared<mtd::MockAndroidInputDispatcher>();
60
    std::shared_ptr<mtd::MockAndroidInputDispatcher> dispatcher = std::make_shared<mtd::MockAndroidInputDispatcher>();
36
60
    std::shared_ptr<MockInputThread> dispatcher_thread = std::make_shared<MockInputThread>();
61
    std::shared_ptr<MockInputThread> dispatcher_thread = std::make_shared<MockInputThread>();
37
61
    mia::AndroidInputDispatcher input_dispatcher{dispatcher,dispatcher_thread};
62
    mia::AndroidInputDispatcher input_dispatcher{dispatcher,dispatcher_thread};
38
63
    const uint32_t default_policy_flags = 0;
39
62
};
64
};
40
63
65
41
64
}
66
}
42
@@ -92,3 +94,164 @@
43
92
94
44
93
    input_dispatcher.stop();
95
    input_dispatcher.stop();
45
94
}
96
}
46
97
47
98
MATCHER_P(MotionArgsMatches, expected, "")
48
99
{
49
100
    bool scalar_members_identical =
50
101
        arg->eventTime == expected.eventTime &&
51
102
        arg->deviceId == expected.deviceId &&
52
103
        arg->action == expected.action &&
53
104
        arg->flags == expected.flags &&
54
105
        arg->metaState == expected.metaState &&
55
106
        arg->buttonState == expected.buttonState &&
56
107
        arg->edgeFlags == expected.edgeFlags &&
57
108
        arg->pointerCount == expected.pointerCount &&
58
109
        arg->xPrecision == expected.xPrecision &&
59
110
        arg->yPrecision == expected.yPrecision &&
60
111
        arg->downTime == expected.downTime;
61
112
62
113
    if (!scalar_members_identical)
63
114
        return false;
64
115
65
116
    int relevant_axis[] = {AMOTION_EVENT_AXIS_ORIENTATION, AMOTION_EVENT_AXIS_TOUCH_MAJOR, AMOTION_EVENT_AXIS_PRESSURE,
66
117
                           AMOTION_EVENT_AXIS_X,           AMOTION_EVENT_AXIS_Y,           AMOTION_EVENT_AXIS_SIZE,
67
118
                           AMOTION_EVENT_AXIS_HSCROLL,     AMOTION_EVENT_AXIS_VSCROLL};
68
119
    for (uint32_t i = 0; i != arg->pointerCount; ++i)
69
120
    {
70
121
        for (int j = 0; j != sizeof(relevant_axis)/sizeof(relevant_axis[0]); ++j)
71
122
        {
72
123
            float expected_axis = expected.pointerCoords[i].getAxisValue(relevant_axis[j]);
73
124
            float received_axis = arg->pointerCoords[i].getAxisValue(relevant_axis[j]);
74
125
            if (expected_axis != received_axis)
75
126
                return false;
76
127
        }
77
128
        if (expected.pointerProperties[i].id != arg->pointerProperties[i].id ||
78
129
            expected.pointerProperties[i].toolType!= arg->pointerProperties[i].toolType)
79
130
        {
80
131
            return false;
81
132
        }
82
133
    }
83
134
84
135
    return true;
85
136
}
86
137
87
138
MATCHER_P(KeyArgsMatches, expected, "")
88
139
{
89
140
    return
90
141
        arg->eventTime == expected.eventTime &&
91
142
        arg->deviceId == expected.deviceId &&
92
143
        arg->source == expected.source &&
93
144
        arg->action == expected.action &&
94
145
        arg->flags == expected.flags &&
95
146
        arg->keyCode == expected.keyCode &&
96
147
        arg->scanCode == expected.scanCode &&
97
148
        arg->metaState == expected.metaState &&
98
149
        arg->downTime == expected.downTime;
99
150
}
100
151
101
152
TEST_F(AndroidInputDispatcherTest, axis_values_are_properly_converted)
102
153
{
103
154
    using namespace ::testing;
104
155
    droidinput::PointerCoords expected_coords[MIR_INPUT_EVENT_MAX_POINTER_COUNT];
105
156
    droidinput::PointerProperties expected_properties[MIR_INPUT_EVENT_MAX_POINTER_COUNT];
106
157
107
158
    std::memset(expected_coords, 0, sizeof(expected_coords));
108
159
    std::memset(expected_properties, 0, sizeof(expected_properties));
109
160
    MirEvent event;
110
161
    event.type = mir_event_type_motion;
111
162
    event.motion.pointer_count = 1;
112
163
    event.motion.event_time = 2;
113
164
    event.motion.device_id = 3;
114
165
    event.motion.source_id = 4;
115
166
    event.motion.action = mir_motion_action_scroll;
116
167
    event.motion.flags = mir_motion_flag_window_is_obscured;
117
168
    event.motion.modifiers = 6;
118
169
    event.motion.edge_flags = 7;
119
170
    event.motion.button_state =
120
171
        static_cast<MirMotionButton>(mir_motion_button_forward | mir_motion_button_secondary);
121
172
    event.motion.x_offset = 0.0f;
122
173
    event.motion.y_offset = 0.0f;
123
174
    event.motion.x_precision = 9.0f;
124
175
    event.motion.y_precision = 10.0f;
125
176
    event.motion.down_time = 11;
126
177
127
178
    auto & pointer = event.motion.pointer_coordinates[0];
128
179
    pointer.id = 1;
129
180
    pointer.x = 12.0f;
130
181
    pointer.raw_x = 12.0f;
131
182
    pointer.y = 13.0f;
132
183
    pointer.raw_y = 13.0f;
133
184
    pointer.touch_major = 14.0f;
134
185
    pointer.touch_minor = 15.0f;
135
186
    pointer.size = 16.0f;
136
187
    pointer.pressure = 17.0f;
137
188
    pointer.orientation = 18.0f;
138
189
    pointer.vscroll = 19.0f;
139
190
    pointer.hscroll = 20.0f;
140
191
    pointer.tool_type = mir_motion_tool_type_finger;
141
192
142
193
    expected_coords[0].setAxisValue(AMOTION_EVENT_AXIS_X, pointer.x);
143
194
    expected_coords[0].setAxisValue(AMOTION_EVENT_AXIS_Y, pointer.y);
144
195
    expected_coords[0].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MAJOR, pointer.touch_major);
145
196
    expected_coords[0].setAxisValue(AMOTION_EVENT_AXIS_TOUCH_MINOR, pointer.touch_minor);
146
197
    expected_coords[0].setAxisValue(AMOTION_EVENT_AXIS_SIZE, pointer.size);
147
198
    expected_coords[0].setAxisValue(AMOTION_EVENT_AXIS_PRESSURE, pointer.pressure);
148
199
    expected_coords[0].setAxisValue(AMOTION_EVENT_AXIS_ORIENTATION, pointer.orientation);
149
200
    expected_coords[0].setAxisValue(AMOTION_EVENT_AXIS_VSCROLL, pointer.vscroll);
150
201
    expected_coords[0].setAxisValue(AMOTION_EVENT_AXIS_HSCROLL, pointer.hscroll);
151
202
    expected_properties[0].id = pointer.id;
152
203
    expected_properties[0].toolType = pointer.tool_type;
153
204
154
205
    droidinput::NotifyMotionArgs expected(event.motion.event_time,
155
206
                                          event.motion.device_id,
156
207
                                          event.motion.source_id,
157
208
                                          default_policy_flags,
158
209
                                          event.motion.action,
159
210
                                          event.motion.flags,
160
211
                                          event.motion.modifiers,
161
212
                                          event.motion.button_state,
162
213
                                          event.motion.edge_flags,
163
214
                                          event.motion.pointer_count,
164
215
                                          expected_properties,
165
216
                                          expected_coords,
166
217
                                          event.motion.x_precision,
167
218
                                          event.motion.y_precision,
168
219
                                          event.motion.down_time);
169
220
170
221
    EXPECT_CALL(*dispatcher, notifyMotion(MotionArgsMatches(expected)));
171
222
172
223
    input_dispatcher.dispatch(event);
173
224
}
174
225
175
226
TEST_F(AndroidInputDispatcherTest, forwards_all_key_event_paramters_correctly)
176
227
{
177
228
    using namespace ::testing;
178
229
    MirEvent event;
179
230
    event.type = mir_event_type_key;
180
231
    event.key.event_time = 1;
181
232
    event.key.device_id = 2;
182
233
    event.key.source_id = 3;
183
234
    event.key.action = mir_key_action_down;
184
235
    event.key.flags = mir_key_flag_long_press;
185
236
    event.key.scan_code = 4;
186
237
    event.key.key_code = 5;
187
238
    event.key.repeat_count = 0;
188
239
    event.key.down_time = 6;
189
240
    event.key.modifiers = 7;
190
241
    event.key.is_system_key = false;
191
242
192
243
    droidinput::NotifyKeyArgs expected(event.key.event_time,
193
244
                                       event.key.device_id,
194
245
                                       event.key.source_id,
195
246
                                       default_policy_flags,
196
247
                                       event.key.action,
197
248
                                       event.key.flags,
198
249
                                       event.key.key_code,
199
250
                                       event.key.scan_code,
200
251
                                       event.key.modifiers,
201
252
                                       event.key.down_time);
202
253
203
254
    EXPECT_CALL(*dispatcher, notifyKey(KeyArgsMatches(expected)));
204
255
205
256
    input_dispatcher.dispatch(event);
206
257
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-05-21
Alexandros Frantzis (community)			Approve on 2014-05-20
Alan Griffiths		2014-05-20	Approve on 2014-05-20
Daniel van Vugt		2014-05-20	Approve on 2014-05-20
Review via email: mp+220200@code.launchpad.net