1
=== modified file 'include/client/mir/events/event_builders.h'
2
--- include/client/mir/events/event_builders.h	2015-05-13 06:23:25 +0000
3
+++ include/client/mir/events/event_builders.h	2015-05-20 14:14:47 +0000
4
@@ -25,7 +25,6 @@
5
25
#include "mir/frontend/surface_id.h"
25
#include "mir/frontend/surface_id.h"
6
26
26
7
27
#include <memory>
27
#include <memory>
8
28
#include <vector>
9
29
#include <functional>
28
#include <functional>
10
30
#include <chrono>
29
#include <chrono>
11
31
30
12
@@ -63,7 +62,7 @@
13
63
// Pointer event
62
// Pointer event
14
64
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
63
EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
15
65
    MirInputEventModifiers modifiers, MirPointerAction action,
64
    MirInputEventModifiers modifiers, MirPointerAction action,
17
66
    std::vector<MirPointerButton> const& buttons_pressed,
65
    MirPointerButtons buttons_pressed,
18
67
    float x_axis_value, float y_axis_value,
66
    float x_axis_value, float y_axis_value,
19
68
    float hscroll_value, float vscroll_value);
67
    float hscroll_value, float vscroll_value);
20
69
}
68
}
21
70
69
22
=== modified file 'include/client/mir_toolkit/events/input/pointer_event.h'
23
--- include/client/mir_toolkit/events/input/pointer_event.h	2015-03-31 02:35:42 +0000
24
+++ include/client/mir_toolkit/events/input/pointer_event.h	2015-05-20 14:14:47 +0000
25
@@ -68,12 +68,13 @@
26
68
 * Identifiers for pointer buttons
68
 * Identifiers for pointer buttons
27
69
 */
69
 */
28
70
typedef enum {
70
typedef enum {
34
71
    mir_pointer_button_primary   = 1,
71
    mir_pointer_button_primary   = 1 << 0,
35
72
    mir_pointer_button_secondary = 2,
72
    mir_pointer_button_secondary = 1 << 1,
36
73
    mir_pointer_button_tertiary  = 3,
73
    mir_pointer_button_tertiary  = 1 << 2,
37
74
    mir_pointer_button_back      = 4,
74
    mir_pointer_button_back      = 1 << 3,
38
75
    mir_pointer_button_forward   = 5
75
    mir_pointer_button_forward   = 1 << 4
39
76
} MirPointerButton;
76
} MirPointerButton;
40
77
typedef unsigned int MirPointerButtons;
41
77
78
42
78
/**
79
/**
43
79
 * Retrieve the modifier keys pressed when the pointer action occured.
80
 * Retrieve the modifier keys pressed when the pointer action occured.
44
@@ -103,6 +104,15 @@
45
103
    MirPointerButton button);
104
    MirPointerButton button);
46
104
105
47
105
/**
106
/**
48
107
 * Retreive the pointer button state as a masked set of values.
49
108
 *
50
109
 * \param [in] event         The pointer event
51
110
 *
52
111
 * \return                   The button state
53
112
 */
54
113
MirPointerButtons mir_pointer_event_buttons(MirPointerEvent const* event);
55
114
56
115
/**
57
106
 * Retrieve the axis value reported by a given pointer event.
116
 * Retrieve the axis value reported by a given pointer event.
58
107
 *
117
 *
59
108
 *  \param [in] event       The pointer event
118
 *  \param [in] event       The pointer event
60
109
119
61
=== modified file 'src/client/events/event_builders.cpp'
62
--- src/client/events/event_builders.cpp	2015-05-19 14:02:31 +0000
63
+++ src/client/events/event_builders.cpp	2015-05-20 14:14:47 +0000
64
@@ -231,29 +231,40 @@
65
231
231
66
232
namespace
232
namespace
67
233
{
233
{
69
234
MirMotionAction old_action_from_pointer_action(MirPointerAction action, MirMotionButton button_state)
234
MirMotionAction old_action_from_pointer_action(MirPointerAction action, int buttons_pressed)
70
235
{
235
{
71
236
    switch (action)
236
    switch (action)
72
237
    {
237
    {
73
238
    case mir_pointer_action_button_up:
238
    case mir_pointer_action_button_up:
75
239
        return mir_motion_action_up;
239
        return buttons_pressed == 0 ? mir_motion_action_up : mir_motion_action_pointer_up;
76
240
    case mir_pointer_action_button_down:
240
    case mir_pointer_action_button_down:
78
241
        return mir_motion_action_down;
241
        return buttons_pressed == 1 ? mir_motion_action_down : mir_motion_action_pointer_down;
79
242
    case mir_pointer_action_enter:
242
    case mir_pointer_action_enter:
80
243
        return mir_motion_action_hover_enter;
243
        return mir_motion_action_hover_enter;
81
244
    case mir_pointer_action_leave:
244
    case mir_pointer_action_leave:
82
245
        return mir_motion_action_hover_exit;
245
        return mir_motion_action_hover_exit;
83
246
    case mir_pointer_action_motion:
246
    case mir_pointer_action_motion:
85
247
        return button_state ? mir_motion_action_move : mir_motion_action_hover_move;
247
        return buttons_pressed ? mir_motion_action_move : mir_motion_action_hover_move;
86
248
    default:
248
    default:
87
249
        BOOST_THROW_EXCEPTION(std::logic_error("Invalid pointer action"));
249
        BOOST_THROW_EXCEPTION(std::logic_error("Invalid pointer action"));
88
250
    }
250
    }
89
251
}
251
}
90
252
int count_buttons(MirPointerButtons buttons)
91
253
{
92
254
    int ret = 0;
93
255
    if (buttons & mir_pointer_button_primary) ret++;
94
256
    if (buttons & mir_pointer_button_secondary) ret++;
95
257
    if (buttons & mir_pointer_button_tertiary) ret++;
96
258
    if (buttons & mir_pointer_button_forward) ret++;
97
259
    if (buttons & mir_pointer_button_back) ret++;
98
260
99
261
    return ret;
100
262
}
101
252
}
263
}
102
253
264
103
254
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
265
mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
104
255
    MirInputEventModifiers modifiers, MirPointerAction action,
266
    MirInputEventModifiers modifiers, MirPointerAction action,
106
256
    std::vector<MirPointerButton> const& buttons_pressed,
267
    MirPointerButtons buttons_pressed,                               
107
257
    float x_axis_value, float y_axis_value,
268
    float x_axis_value, float y_axis_value,
108
258
    float hscroll_value, float vscroll_value)
269
    float hscroll_value, float vscroll_value)
109
259
{
270
{
110
@@ -266,31 +277,9 @@
111
266
    mev.event_time = timestamp;
277
    mev.event_time = timestamp;
112
267
    mev.modifiers = modifiers;
278
    mev.modifiers = modifiers;
113
268
    mev.source_id = AINPUT_SOURCE_MOUSE;
279
    mev.source_id = AINPUT_SOURCE_MOUSE;
139
269
280
    mev.buttons = buttons_pressed;
140
270
    int button_state = 0;
281
    
141
271
    for (auto button : buttons_pressed)
282
    mev.action = old_action_from_pointer_action(action, count_buttons(buttons_pressed));
117
272
    {
118
273
    switch (button)
119
274
    {
120
275
    case mir_pointer_button_primary:
121
276
        button_state |= mir_motion_button_primary;
122
277
        break;
123
278
    case mir_pointer_button_secondary:
124
279
        button_state |= mir_motion_button_secondary;
125
280
        break;
126
281
    case mir_pointer_button_tertiary:
127
282
        button_state |= mir_motion_button_tertiary;
128
283
        break;
129
284
    case mir_pointer_button_back:
130
285
        button_state |= mir_motion_button_back;
131
286
        break;
132
287
    case mir_pointer_button_forward:
133
288
        button_state |= mir_motion_button_forward;
134
289
        break;
135
290
    }
136
291
    }
137
292
    mev.button_state = static_cast<MirMotionButton>(button_state);
138
293
    mev.action = old_action_from_pointer_action(action, mev.button_state);
142
294
283
143
295
    mev.pointer_count = 1;
284
    mev.pointer_count = 1;
144
296
    auto& pc = mev.pointer_coordinates[0];
285
    auto& pc = mev.pointer_coordinates[0];
145
297
286
146
=== modified file 'src/client/input/android/android_input_lexicon.cpp'
147
--- src/client/input/android/android_input_lexicon.cpp	2015-05-13 06:23:25 +0000
148
+++ src/client/input/android/android_input_lexicon.cpp	2015-05-20 14:14:47 +0000
149
@@ -50,7 +50,7 @@
150
50
            mir_event.motion.source_id = android_event->getSource();
50
            mir_event.motion.source_id = android_event->getSource();
151
51
            mir_event.motion.action = mev->getAction();
51
            mir_event.motion.action = mev->getAction();
152
52
            mir_event.motion.modifiers = mia::mir_modifiers_from_android(mev->getMetaState());
52
            mir_event.motion.modifiers = mia::mir_modifiers_from_android(mev->getMetaState());
154
53
            mir_event.motion.button_state = static_cast<MirMotionButton>(mev->getButtonState());
53
            mir_event.motion.buttons = mia::mir_pointer_buttons_from_android(mev->getButtonState());
155
54
            mir_event.motion.event_time = mev->getEventTime();
54
            mir_event.motion.event_time = mev->getEventTime();
156
55
            mir_event.motion.pointer_count = mev->getPointerCount();
55
            mir_event.motion.pointer_count = mev->getPointerCount();
157
56
            for(unsigned int i = 0; i < mev->getPointerCount(); i++)
56
            for(unsigned int i = 0; i < mev->getPointerCount(); i++)
158
57
57
159
=== modified file 'src/client/input/android/event_conversion_helpers.cpp'
160
--- src/client/input/android/event_conversion_helpers.cpp	2015-05-13 06:23:25 +0000
161
+++ src/client/input/android/event_conversion_helpers.cpp	2015-05-20 14:14:47 +0000
162
@@ -100,3 +100,37 @@
163
100
        return AKEY_EVENT_ACTION_UP;
100
        return AKEY_EVENT_ACTION_UP;
164
101
    }
101
    }
165
102
}
102
}
166
103
167
104
MirPointerButtons mia::mir_pointer_buttons_from_android(int32_t android_state)
168
105
{
169
106
    MirPointerButtons buttons = 0;
170
107
    
171
108
    if (android_state & AMOTION_EVENT_BUTTON_PRIMARY)
172
109
        buttons |= mir_pointer_button_primary;
173
110
    if (android_state & AMOTION_EVENT_BUTTON_SECONDARY)
174
111
        buttons |= mir_pointer_button_secondary;
175
112
    if (android_state & AMOTION_EVENT_BUTTON_TERTIARY)
176
113
        buttons |= mir_pointer_button_tertiary;
177
114
    if (android_state & AMOTION_EVENT_BUTTON_BACK)
178
115
        buttons |= mir_pointer_button_back;
179
116
    if (android_state & AMOTION_EVENT_BUTTON_FORWARD)
180
117
        buttons |= mir_pointer_button_forward;
181
118
182
119
    return buttons;
183
120
}
184
121
185
122
int32_t mia::android_pointer_buttons_from_mir(MirPointerButtons buttons)
186
123
{
187
124
    int32_t android_state = 0;
188
125
    if (buttons & mir_pointer_button_primary)
189
126
        android_state |= AMOTION_EVENT_BUTTON_PRIMARY;
190
127
    if (buttons & mir_pointer_button_secondary)
191
128
        android_state |= AMOTION_EVENT_BUTTON_SECONDARY;
192
129
    if (buttons & mir_pointer_button_tertiary)
193
130
        android_state |= AMOTION_EVENT_BUTTON_TERTIARY;
194
131
    if (buttons & mir_pointer_button_back)
195
132
        android_state |= AMOTION_EVENT_BUTTON_BACK;
196
133
    if (buttons & mir_pointer_button_forward)
197
134
        android_state |= AMOTION_EVENT_BUTTON_FORWARD;
198
135
    return android_state;
199
136
}
200
103
137
201
=== modified file 'src/client/input/input_event.cpp'
202
--- src/client/input/input_event.cpp	2015-05-13 06:23:25 +0000
203
+++ src/client/input/input_event.cpp	2015-05-20 14:14:47 +0000
204
@@ -424,20 +424,26 @@
205
424
   switch (button)
424
   switch (button)
206
425
   {
425
   {
207
426
   case mir_pointer_button_primary:
426
   case mir_pointer_button_primary:
209
427
       return old_mev.button_state & mir_motion_button_primary;
427
       return old_mev.buttons & mir_pointer_button_primary;
210
428
   case mir_pointer_button_secondary:
428
   case mir_pointer_button_secondary:
212
429
       return old_mev.button_state & mir_motion_button_secondary;
429
       return old_mev.buttons & mir_pointer_button_secondary;
213
430
   case mir_pointer_button_tertiary:
430
   case mir_pointer_button_tertiary:
215
431
       return old_mev.button_state & mir_motion_button_tertiary;
431
       return old_mev.buttons & mir_pointer_button_tertiary;
216
432
   case mir_pointer_button_back:
432
   case mir_pointer_button_back:
218
433
       return old_mev.button_state & mir_motion_button_back;
433
       return old_mev.buttons & mir_pointer_button_back;
219
434
   case mir_pointer_button_forward:
434
   case mir_pointer_button_forward:
221
435
       return old_mev.button_state & mir_motion_button_forward;
435
       return old_mev.buttons & mir_pointer_button_forward;
222
436
   default:
436
   default:
223
437
       return false;
437
       return false;
224
438
   }
438
   }
225
439
}
439
}
226
440
440
227
441
MirPointerButtons mir_pointer_event_buttons(MirPointerEvent const* pev)
228
442
{
229
443
   auto const& old_mev = old_mev_from_new(pev);
230
444
   return old_mev.buttons;
231
445
}
232
446
233
441
float mir_pointer_event_axis_value(MirPointerEvent const* pev, MirPointerAxis axis)
447
float mir_pointer_event_axis_value(MirPointerEvent const* pev, MirPointerAxis axis)
234
442
{
448
{
235
443
   auto const& old_mev = old_mev_from_new(pev);
449
   auto const& old_mev = old_mev_from_new(pev);
236
444
450
237
=== modified file 'src/client/symbols.map'
238
--- src/client/symbols.map	2015-05-13 06:23:25 +0000
239
+++ src/client/symbols.map	2015-05-20 14:14:47 +0000
240
@@ -196,6 +196,7 @@
241
196
    mir_buffer_stream_release;
196
    mir_buffer_stream_release;
242
197
    mir_buffer_stream_release_sync;
197
    mir_buffer_stream_release_sync;
243
198
    mir_buffer_stream_is_valid;
198
    mir_buffer_stream_is_valid;
244
199
    mir_pointer_event_buttons; # Move to 8.5
245
199
} MIR_CLIENT_8.3;
200
} MIR_CLIENT_8.3;
246
200
201
247
201
MIR_CLIENT_DETAIL_8 {
202
MIR_CLIENT_DETAIL_8 {
248
@@ -208,6 +209,8 @@
249
208
      mir::input::android::mir_modifiers_from_android*;
209
      mir::input::android::mir_modifiers_from_android*;
250
209
      mir::input::android::mir_keyboard_action_from_android*;
210
      mir::input::android::mir_keyboard_action_from_android*;
251
210
      mir::input::android::android_keyboard_action_from_mir*;
211
      mir::input::android::android_keyboard_action_from_mir*;
252
212
      mir::input::android::mir_pointer_buttons_from_android*;
253
213
      mir::input::android::android_pointer_buttons_from_mir*;
254
211
      mir::client::DefaultConnectionConfiguration::DefaultConnectionConfiguration*;
214
      mir::client::DefaultConnectionConfiguration::DefaultConnectionConfiguration*;
255
212
      mir::client::DefaultConnectionConfiguration::the_surface_map*;
215
      mir::client::DefaultConnectionConfiguration::the_surface_map*;
256
213
      mir::client::DefaultConnectionConfiguration::the_rpc_channel*;
216
      mir::client::DefaultConnectionConfiguration::the_rpc_channel*;
257
214
217
258
=== modified file 'src/include/common/mir/events/event_private.h'
259
--- src/include/common/mir/events/event_private.h	2015-05-13 06:23:25 +0000
260
+++ src/include/common/mir/events/event_private.h	2015-05-20 14:14:47 +0000
261
@@ -60,14 +60,6 @@
262
60
} MirMotionAction;
60
} MirMotionAction;
263
61
61
264
62
typedef enum {
62
typedef enum {
265
63
    mir_motion_button_primary   = 1 << 0,
266
64
    mir_motion_button_secondary = 1 << 1,
267
65
    mir_motion_button_tertiary  = 1 << 2,
268
66
    mir_motion_button_back      = 1 << 3,
269
67
    mir_motion_button_forward   = 1 << 4
270
68
} MirMotionButton;
271
69
272
70
typedef enum {
273
71
   mir_motion_tool_type_unknown = 0,
63
   mir_motion_tool_type_unknown = 0,
274
72
   mir_motion_tool_type_finger  = 1,
64
   mir_motion_tool_type_finger  = 1,
275
73
   mir_motion_tool_type_stylus  = 2,
65
   mir_motion_tool_type_stylus  = 2,
276
@@ -125,7 +117,7 @@
277
125
    int action;
117
    int action;
278
126
    MirInputEventModifiers modifiers;
118
    MirInputEventModifiers modifiers;
279
127
119
281
128
    MirMotionButton button_state;
120
    MirPointerButtons buttons;
282
129
    std::chrono::nanoseconds event_time;
121
    std::chrono::nanoseconds event_time;
283
130
122
284
131
    size_t pointer_count;
123
    size_t pointer_count;
285
132
124
286
=== modified file 'src/include/common/mir/input/android/event_conversion_helpers.h'
287
--- src/include/common/mir/input/android/event_conversion_helpers.h	2015-05-13 06:23:25 +0000
288
+++ src/include/common/mir/input/android/event_conversion_helpers.h	2015-05-20 14:14:47 +0000
289
@@ -31,13 +31,15 @@
290
31
int32_t android_modifiers_from_mir(MirInputEventModifiers modifiers);
31
int32_t android_modifiers_from_mir(MirInputEventModifiers modifiers);
291
32
32
292
33
MirKeyboardAction mir_keyboard_action_from_android(int32_t android_action, int32_t repeat_count);
33
MirKeyboardAction mir_keyboard_action_from_android(int32_t android_action, int32_t repeat_count);
293
34
294
35
// Mir differentiates between mir_keyboard_action_down
34
// Mir differentiates between mir_keyboard_action_down
295
36
// and mir_keyboard_action_repeat whereas android encodes
35
// and mir_keyboard_action_repeat whereas android encodes
296
37
// keyrepeats as AKEY_EVENT_ACTION_DOWN and a repeatCount of > 0
36
// keyrepeats as AKEY_EVENT_ACTION_DOWN and a repeatCount of > 0
297
38
// Thus when converting from MirKeyboardAction to an android
37
// Thus when converting from MirKeyboardAction to an android
298
39
// action we must also fetch a repeat count for the android event.
38
// action we must also fetch a repeat count for the android event.
299
40
int32_t android_keyboard_action_from_mir(int32_t& repeat_count_out, MirKeyboardAction action);
39
int32_t android_keyboard_action_from_mir(int32_t& repeat_count_out, MirKeyboardAction action);
300
40
301
41
MirPointerButtons mir_pointer_buttons_from_android(int32_t android_state);
302
42
int32_t android_pointer_buttons_from_mir(MirPointerButtons buttons);
303
41
}
43
}
304
42
}
44
}
305
43
}
45
}
306
44
46
307
=== modified file 'src/server/input/android/android_input_dispatcher.cpp'
308
--- src/server/input/android/android_input_dispatcher.cpp	2015-05-13 06:23:25 +0000
309
+++ src/server/input/android/android_input_dispatcher.cpp	2015-05-20 14:14:47 +0000
310
@@ -102,7 +102,7 @@
311
102
            event.motion.action,
102
            event.motion.action,
312
103
            0, /* flags */
103
            0, /* flags */
313
104
            mia::android_modifiers_from_mir(event.motion.modifiers),
104
            mia::android_modifiers_from_mir(event.motion.modifiers),
315
105
            event.motion.button_state,
105
            mia::android_pointer_buttons_from_mir(event.motion.buttons),
316
106
            0, /* edge_flags */
106
            0, /* edge_flags */
317
107
            event.motion.pointer_count,
107
            event.motion.pointer_count,
318
108
            pointer_properties.data(),
108
            pointer_properties.data(),
319
109
109
320
=== modified file 'src/server/input/android/input_sender.cpp'
321
--- src/server/input/android/input_sender.cpp	2015-05-13 06:23:25 +0000
322
+++ src/server/input/android/input_sender.cpp	2015-05-20 14:14:47 +0000
323
@@ -288,7 +288,7 @@
324
288
        0, /* flags */
288
        0, /* flags */
325
289
        0, /* edge flags */
289
        0, /* edge flags */
326
290
        mia::android_modifiers_from_mir(event.modifiers),
290
        mia::android_modifiers_from_mir(event.modifiers),
328
291
        static_cast<int32_t>(event.button_state),
291
        mia::android_pointer_buttons_from_mir(event.buttons),
329
292
        0.0f,  // event.x_offset,
292
        0.0f,  // event.x_offset,
330
293
        0.0f,  // event.y_offset,
293
        0.0f,  // event.y_offset,
331
294
        0, 0, /* unused x/y precision */
294
        0, 0, /* unused x/y precision */
332
295
295
333
=== modified file 'src/server/input/android/input_translator.cpp'
334
--- src/server/input/android/input_translator.cpp	2015-05-13 06:23:25 +0000
335
+++ src/server/input/android/input_translator.cpp	2015-05-20 14:14:47 +0000
336
@@ -147,7 +147,7 @@
337
147
    mir_event.motion.source_id = args->source;
147
    mir_event.motion.source_id = args->source;
338
148
    mir_event.motion.action = args->action;
148
    mir_event.motion.action = args->action;
339
149
    mir_event.motion.modifiers = mia::mir_modifiers_from_android(args->metaState);
149
    mir_event.motion.modifiers = mia::mir_modifiers_from_android(args->metaState);
341
150
    mir_event.motion.button_state = static_cast<MirMotionButton>(args->buttonState);
150
    mir_event.motion.buttons = mia::mir_pointer_buttons_from_android(args->buttonState);
342
151
    mir_event.motion.event_time = args->eventTime;
151
    mir_event.motion.event_time = args->eventTime;
343
152
    mir_event.motion.pointer_count = args->pointerCount;
152
    mir_event.motion.pointer_count = args->pointerCount;
344
153
    for(unsigned int i = 0; i < args->pointerCount; i++)
153
    for(unsigned int i = 0; i < args->pointerCount; i++)
345
154
154
346
=== modified file 'tests/acceptance-tests/test_client_input.cpp'
347
--- tests/acceptance-tests/test_client_input.cpp	2015-05-19 14:02:31 +0000
348
+++ tests/acceptance-tests/test_client_input.cpp	2015-05-20 14:14:47 +0000
349
@@ -242,6 +242,49 @@
350
242
    first_client.all_events_received.wait_for_at_most_seconds(10);
242
    first_client.all_events_received.wait_for_at_most_seconds(10);
351
243
}
243
}
352
244
244
353
245
TEST_F(TestClientInput, clients_receive_many_button_events_inside_window)
354
246
{
355
247
    Client first_client(new_connection(), first);
356
248
    // The cursor starts at (0, 0).
357
249
358
250
    InSequence seq;
359
251
    auto expect_buttons = [&](MirPointerButtons b) {
360
252
        EXPECT_CALL(first_client, handle_input(mt::ButtonsDown(0, 0, b)));
361
253
    };
362
254
363
255
    MirPointerButtons buttons = mir_pointer_button_primary;
364
256
    expect_buttons(buttons);
365
257
    expect_buttons(buttons |= mir_pointer_button_secondary);
366
258
    expect_buttons(buttons |= mir_pointer_button_tertiary);
367
259
    expect_buttons(buttons |= mir_pointer_button_forward);
368
260
    expect_buttons(buttons |= mir_pointer_button_back);
369
261
    expect_buttons(buttons &= ~mir_pointer_button_back);
370
262
    expect_buttons(buttons &= ~mir_pointer_button_forward);
371
263
    expect_buttons(buttons &= ~mir_pointer_button_tertiary);
372
264
    expect_buttons(buttons &= ~mir_pointer_button_secondary);
373
265
    EXPECT_CALL(first_client, handle_input(mt::ButtonsDown(0, 0, 0))).WillOnce(
374
266
        mt::WakeUp(&first_client.all_events_received));
375
267
376
268
    auto press_button = [&](int button) {
377
269
        fake_mouse->emit_event(mis::a_button_down_event().of_button(button).with_action(mis::EventAction::Down));
378
270
    };
379
271
    auto release_button = [&](int button) {
380
272
        fake_mouse->emit_event(mis::a_button_up_event().of_button(button).with_action(mis::EventAction::Up));
381
273
    };
382
274
    press_button(BTN_LEFT);
383
275
    press_button(BTN_RIGHT);
384
276
    press_button(BTN_MIDDLE);
385
277
    press_button(BTN_FORWARD);
386
278
    press_button(BTN_BACK);
387
279
    release_button(BTN_BACK);
388
280
    release_button(BTN_FORWARD);
389
281
    release_button(BTN_MIDDLE);
390
282
    release_button(BTN_RIGHT);
391
283
    release_button(BTN_LEFT);
392
284
393
285
    first_client.all_events_received.wait_for_at_most_seconds(10);
394
286
}
395
287
396
245
TEST_F(TestClientInput, multiple_clients_receive_pointer_inside_windows)
288
TEST_F(TestClientInput, multiple_clients_receive_pointer_inside_windows)
397
246
{
289
{
398
247
    int const screen_width = screen_geometry.size.width.as_int();
290
    int const screen_width = screen_geometry.size.width.as_int();
399
248
291
400
=== modified file 'tests/acceptance-tests/test_surface_modifications.cpp'
401
--- tests/acceptance-tests/test_surface_modifications.cpp	2015-05-13 06:23:25 +0000
402
+++ tests/acceptance-tests/test_surface_modifications.cpp	2015-05-20 14:14:47 +0000
403
@@ -93,7 +93,6 @@
404
93
    void generate_alt_click_at(Point const& click_position)
93
    void generate_alt_click_at(Point const& click_position)
405
94
    {
94
    {
406
95
        auto const modifiers = mir_input_event_modifier_alt;
95
        auto const modifiers = mir_input_event_modifier_alt;
407
96
        std::vector<MirPointerButton> depressed_buttons{mir_pointer_button_tertiary};
408
97
96
409
98
        auto const x_axis_value = click_position.x.as_float();
97
        auto const x_axis_value = click_position.x.as_float();
410
99
        auto const y_axis_value = click_position.y.as_float();
98
        auto const y_axis_value = click_position.y.as_float();
411
@@ -102,7 +101,7 @@
412
102
        auto const action = mir_pointer_action_button_down;
101
        auto const action = mir_pointer_action_button_down;
413
103
102
414
104
        auto const click_event = mev::make_event(device_id, timestamp, modifiers,
103
        auto const click_event = mev::make_event(device_id, timestamp, modifiers,
416
105
            action, depressed_buttons, x_axis_value, y_axis_value, hscroll_value, vscroll_value);
104
            action, mir_pointer_button_tertiary, x_axis_value, y_axis_value, hscroll_value, vscroll_value);
417
106
105
418
107
        server.the_shell()->handle(*click_event);
106
        server.the_shell()->handle(*click_event);
419
108
    }
107
    }
420
@@ -110,7 +109,6 @@
421
110
    void generate_alt_move_to(Point const& drag_position)
109
    void generate_alt_move_to(Point const& drag_position)
422
111
    {
110
    {
423
112
        auto const modifiers = mir_input_event_modifier_alt;
111
        auto const modifiers = mir_input_event_modifier_alt;
424
113
        std::vector<MirPointerButton> depressed_buttons{mir_pointer_button_tertiary};
425
114
112
426
115
        auto const x_axis_value = drag_position.x.as_float();
113
        auto const x_axis_value = drag_position.x.as_float();
427
116
        auto const y_axis_value = drag_position.y.as_float();
114
        auto const y_axis_value = drag_position.y.as_float();
428
@@ -119,7 +117,7 @@
429
119
        auto const action = mir_pointer_action_motion;
117
        auto const action = mir_pointer_action_motion;
430
120
118
431
121
        auto const drag_event = mev::make_event(device_id, timestamp, modifiers,
119
        auto const drag_event = mev::make_event(device_id, timestamp, modifiers,
433
122
            action, depressed_buttons, x_axis_value, y_axis_value, hscroll_value, vscroll_value);
120
            action, mir_pointer_button_tertiary, x_axis_value, y_axis_value, hscroll_value, vscroll_value);
434
123
121
435
124
        server.the_shell()->handle(*drag_event);
122
        server.the_shell()->handle(*drag_event);
436
125
    }
123
    }
437
126
124
438
=== modified file 'tests/acceptance-tests/test_surface_placement.cpp'
439
--- tests/acceptance-tests/test_surface_placement.cpp	2015-05-13 06:23:25 +0000
440
+++ tests/acceptance-tests/test_surface_placement.cpp	2015-05-20 14:14:47 +0000
441
@@ -121,7 +121,7 @@
442
121
        MirInputDeviceId const device_id{7};
121
        MirInputDeviceId const device_id{7};
443
122
122
444
123
        auto const modifiers = mir_input_event_modifier_none;
123
        auto const modifiers = mir_input_event_modifier_none;
446
124
        std::vector<MirPointerButton> depressed_buttons{mir_pointer_button_primary};
124
        auto const depressed_buttons = mir_pointer_button_primary;
447
125
125
448
126
        auto const x_axis_value = click_position.x.as_float();
126
        auto const x_axis_value = click_position.x.as_float();
449
127
        auto const y_axis_value = click_position.y.as_float();
127
        auto const y_axis_value = click_position.y.as_float();
450
128
128
451
=== modified file 'tests/include/mir_test/event_matchers.h'
452
--- tests/include/mir_test/event_matchers.h	2015-05-19 14:02:31 +0000
453
+++ tests/include/mir_test/event_matchers.h	2015-05-20 14:14:47 +0000
454
@@ -135,10 +135,9 @@
455
135
        return false;
135
        return false;
456
136
    
136
    
457
137
    if(mir_keyboard_event_modifiers(kev) != modifiers)
137
    if(mir_keyboard_event_modifiers(kev) != modifiers)
460
138
        {
138
    {
459
139
            printf("modifiers: %d vs expected %d \n", mir_keyboard_event_modifiers(kev), modifiers);
461
140
        return false;
139
        return false;
463
141
        }
140
    }
464
142
    
141
    
465
143
    return true;
142
    return true;
466
144
}
143
}
467
@@ -229,36 +228,38 @@
468
229
    return false;
228
    return false;
469
230
}
229
}
470
231
230
471
231
inline bool button_event_matches(MirPointerEvent const* pev, float x, float y, MirPointerAction action, MirPointerButtons button_state,
472
232
                                  bool check_action = true)
473
233
{
474
234
    if (pev == nullptr)
475
235
        return false;
476
236
    if (check_action && mir_pointer_event_action(pev) != action)
477
237
        return false;
478
238
    if (mir_pointer_event_buttons(pev) != button_state)
479
239
        return false;
480
240
    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_x) != x)
481
241
        return false;
482
242
    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_y) != y)
483
243
        return false;
484
244
    return true;
485
245
}
486
246
487
232
MATCHER_P2(ButtonDownEvent, x, y, "")
247
MATCHER_P2(ButtonDownEvent, x, y, "")
488
233
{
248
{
489
234
    auto pev = maybe_pointer_event(to_address(arg));
249
    auto pev = maybe_pointer_event(to_address(arg));
501
235
    if (pev == nullptr)
250
    return button_event_matches(pev, x, y, mir_pointer_action_button_down, mir_pointer_button_primary);
491
236
        return false;
492
237
    if (mir_pointer_event_action(pev) != mir_pointer_action_button_down)
493
238
        return false;
494
239
    if (mir_pointer_event_button_state(pev, mir_pointer_button_primary) == false)
495
240
        return false;
496
241
    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_x) != x)
497
242
        return false;
498
243
    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_y) != y)
499
244
        return false;
500
245
    return true;
502
246
}
251
}
503
247
252
504
248
MATCHER_P2(ButtonUpEvent, x, y, "")
253
MATCHER_P2(ButtonUpEvent, x, y, "")
505
249
{
254
{
506
250
    auto pev = maybe_pointer_event(to_address(arg));
255
    auto pev = maybe_pointer_event(to_address(arg));
518
251
    if (pev == nullptr)
256
    return button_event_matches(pev, x, y, mir_pointer_action_button_up, 0);
519
252
        return false;
257
}
520
253
    if (mir_pointer_event_action(pev) != mir_pointer_action_button_up)
258
521
254
        return false;
259
MATCHER_P3(ButtonsDown, x, y, buttons, "")
522
255
    if (mir_pointer_event_button_state(pev, mir_pointer_button_primary) == true)
260
{
523
256
        return false;
261
    auto pev = maybe_pointer_event(to_address(arg));
524
257
    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_x) != x)
262
    return button_event_matches(pev, x, y, mir_pointer_action_button_down, buttons, false);
514
258
        return false;
515
259
    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_y) != y)
516
260
        return false;
517
261
    return true;
525
262
}
263
}
526
263
264
527
264
MATCHER_P2(TouchEvent, x, y, "")
265
MATCHER_P2(TouchEvent, x, y, "")
528
265
266
529
=== modified file 'tests/mir_test_framework/fake_input_device_impl.cpp'
530
--- tests/mir_test_framework/fake_input_device_impl.cpp	2015-05-19 14:02:31 +0000
531
+++ tests/mir_test_framework/fake_input_device_impl.cpp	2015-05-20 14:14:47 +0000
532
@@ -144,7 +144,7 @@
533
144
144
534
145
mtf::FakeInputDeviceImpl::InputDevice::InputDevice(mi::InputDeviceInfo const& info,
145
mtf::FakeInputDeviceImpl::InputDevice::InputDevice(mi::InputDeviceInfo const& info,
535
146
                                                   std::shared_ptr<mir::dispatch::Dispatchable> const& dispatchable)
146
                                                   std::shared_ptr<mir::dispatch::Dispatchable> const& dispatchable)
537
147
    : info(info), queue{dispatchable}
147
    : info(info), queue{dispatchable}, buttons{0}
538
148
{
148
{
539
149
}
149
}
540
150
150
541
@@ -197,12 +197,12 @@
542
197
{
197
{
543
198
    if (action == synthesis::EventAction::Down)
198
    if (action == synthesis::EventAction::Down)
544
199
    {
199
    {
546
200
        buttons.push_back(button);
200
        buttons |= button;
547
201
        return mir_pointer_action_button_down;
201
        return mir_pointer_action_button_down;
548
202
    }
202
    }
549
203
    else
203
    else
550
204
    {
204
    {
552
205
        buttons.erase(remove(begin(buttons), end(buttons), button));
205
        buttons &= ~button;
553
206
        return mir_pointer_action_button_up;
206
        return mir_pointer_action_button_up;
554
207
    }
207
    }
555
208
}
208
}
556
209
209
557
=== modified file 'tests/mir_test_framework/fake_input_device_impl.h'
558
--- tests/mir_test_framework/fake_input_device_impl.h	2015-05-19 14:02:31 +0000
559
+++ tests/mir_test_framework/fake_input_device_impl.h	2015-05-20 14:14:47 +0000
560
@@ -25,8 +25,6 @@
561
25
#include "mir/input/input_device_info.h"
25
#include "mir/input/input_device_info.h"
562
26
#include "mir/geometry/point.h"
26
#include "mir/geometry/point.h"
563
27
27
564
28
#include <vector>
565
29
566
30
namespace mir
28
namespace mir
567
31
{
29
{
568
32
namespace dispatch
30
namespace dispatch
569
@@ -76,7 +74,7 @@
570
76
        std::shared_ptr<mir::dispatch::Dispatchable> const queue;
74
        std::shared_ptr<mir::dispatch::Dispatchable> const queue;
571
77
        uint32_t modifiers{0};
75
        uint32_t modifiers{0};
572
78
        mir::geometry::Point pos, scroll;
76
        mir::geometry::Point pos, scroll;
574
79
        std::vector<MirPointerButton> buttons;
77
        MirPointerButtons buttons;
575
80
    };
78
    };
576
81
    std::shared_ptr<mir::dispatch::ActionQueue> queue;
79
    std::shared_ptr<mir::dispatch::ActionQueue> queue;
577
82
    std::shared_ptr<InputDevice> device;
80
    std::shared_ptr<InputDevice> device;
578
83
81
579
=== modified file 'tests/unit-tests/input/android/test_android_input_dispatcher.cpp'
580
--- tests/unit-tests/input/android/test_android_input_dispatcher.cpp	2015-05-13 06:23:25 +0000
581
+++ tests/unit-tests/input/android/test_android_input_dispatcher.cpp	2015-05-20 14:14:47 +0000
582
@@ -173,15 +173,16 @@
583
173
    std::memset(expected_coords, 0, sizeof(expected_coords));
173
    std::memset(expected_coords, 0, sizeof(expected_coords));
584
174
    std::memset(expected_properties, 0, sizeof(expected_properties));
174
    std::memset(expected_properties, 0, sizeof(expected_properties));
585
175
    MirEvent event;
175
    MirEvent event;
586
176
    std::memset(&event, 0, sizeof(event));
587
177
    
588
176
    event.type = mir_event_type_motion;
178
    event.type = mir_event_type_motion;
589
177
    event.motion.pointer_count = 1;
179
    event.motion.pointer_count = 1;
590
178
    event.motion.event_time = std::chrono::nanoseconds(2);
180
    event.motion.event_time = std::chrono::nanoseconds(2);
591
179
    event.motion.device_id = 3;
181
    event.motion.device_id = 3;
592
180
    event.motion.source_id = 4;
182
    event.motion.source_id = 4;
593
181
    event.motion.action = mir_motion_action_scroll;
183
    event.motion.action = mir_motion_action_scroll;
597
182
    event.motion.modifiers = mir_input_event_modifier_shift,
184
    event.motion.modifiers = mir_input_event_modifier_shift;
598
183
    event.motion.button_state =
185
    event.motion.buttons = mir_pointer_button_forward | mir_pointer_button_secondary;
596
184
        static_cast<MirMotionButton>(mir_motion_button_forward | mir_motion_button_secondary);
599
185
186
600
186
    auto & pointer = event.motion.pointer_coordinates[0];
187
    auto & pointer = event.motion.pointer_coordinates[0];
601
187
    pointer.id = 1;
188
    pointer.id = 1;
602
@@ -215,7 +216,7 @@
603
215
                                          event.motion.action,
216
                                          event.motion.action,
604
216
                                          0, /* flags */
217
                                          0, /* flags */
605
217
                                          AMETA_SHIFT_ON,
218
                                          AMETA_SHIFT_ON,
607
218
                                          event.motion.button_state,
219
                                          AMOTION_EVENT_BUTTON_FORWARD | AMOTION_EVENT_BUTTON_SECONDARY,
608
219
                                          0, /* edge_flags */
220
                                          0, /* edge_flags */
609
220
                                          event.motion.pointer_count,
221
                                          event.motion.pointer_count,
610
221
                                          expected_properties,
222
                                          expected_properties,
611
222
223
612
=== modified file 'tests/unit-tests/input/android/test_android_input_lexicon.cpp'
613
--- tests/unit-tests/input/android/test_android_input_lexicon.cpp	2015-05-13 06:23:25 +0000
614
+++ tests/unit-tests/input/android/test_android_input_lexicon.cpp	2015-05-20 14:14:47 +0000
615
@@ -78,7 +78,7 @@
616
78
    const int32_t flags = 4;
78
    const int32_t flags = 4;
617
79
    const int32_t edge_flags = 5;
79
    const int32_t edge_flags = 5;
618
80
    const int32_t meta_state = 6;
80
    const int32_t meta_state = 6;
620
81
    const int32_t button_state = 7;
81
    const int32_t button_state = 0;
621
82
    const float x_offset = 8;
82
    const float x_offset = 8;
622
83
    const float y_offset = 9;
83
    const float y_offset = 9;
623
84
    const float x_precision = 10;
84
    const float x_precision = 10;
624
@@ -134,7 +134,6 @@
625
134
134
626
135
    auto mir_motion_ev = &mir_ev.motion;
135
    auto mir_motion_ev = &mir_ev.motion;
627
136
136
628
137
    EXPECT_EQ(mir_motion_ev->button_state, button_state);
629
138
    EXPECT_EQ(mir_motion_ev->event_time, event_time);
137
    EXPECT_EQ(mir_motion_ev->event_time, event_time);
630
139
138
631
140
    EXPECT_EQ(mir_motion_ev->pointer_count, pointer_count);
139
    EXPECT_EQ(mir_motion_ev->pointer_count, pointer_count);
632
@@ -170,7 +169,6 @@
633
170
    const int32_t flags = 4;
169
    const int32_t flags = 4;
634
171
    const int32_t edge_flags = 5;
170
    const int32_t edge_flags = 5;
635
172
    const int32_t meta_state = 6;
171
    const int32_t meta_state = 6;
636
173
    const int32_t button_state = 7;
637
174
    const float x_offset = 8;
172
    const float x_offset = 8;
638
175
    const float y_offset = 9;
173
    const float y_offset = 9;
639
176
    const float x_precision = 10;
174
    const float x_precision = 10;
640
@@ -223,7 +221,7 @@
641
223
    }
221
    }
642
224
222
643
225
    android_motion_ev->initialize(device_id, source_id, action, flags,
223
    android_motion_ev->initialize(device_id, source_id, action, flags,
645
226
                                  edge_flags, meta_state, button_state,
224
                                  edge_flags, meta_state, 0,
646
227
                                  x_offset, y_offset, x_precision, y_precision,
225
                                  x_offset, y_offset, x_precision, y_precision,
647
228
                                  down_time, event_time, pointer_count,
226
                                  down_time, event_time, pointer_count,
648
229
                                  pointer_properties, pointer_coords);
227
                                  pointer_properties, pointer_coords);
649
@@ -241,7 +239,6 @@
650
241
239
651
242
    auto mir_motion_ev = &mir_ev.motion;
240
    auto mir_motion_ev = &mir_ev.motion;
652
243
241
653
244
    EXPECT_EQ(mir_motion_ev->button_state, button_state);
654
245
    EXPECT_EQ(mir_motion_ev->event_time, event_time);
242
    EXPECT_EQ(mir_motion_ev->event_time, event_time);
655
246
    EXPECT_EQ(mir_motion_ev->pointer_count, pointer_count);
243
    EXPECT_EQ(mir_motion_ev->pointer_count, pointer_count);
656
247
244
657
248
245
658
=== modified file 'tests/unit-tests/input/android/test_input_translator.cpp'
659
--- tests/unit-tests/input/android/test_input_translator.cpp	2015-05-13 06:23:25 +0000
660
+++ tests/unit-tests/input/android/test_input_translator.cpp	2015-05-20 14:14:47 +0000
661
@@ -266,8 +266,7 @@
662
266
    expected.motion.source_id = 4;
266
    expected.motion.source_id = 4;
663
267
    expected.motion.action = mir_motion_action_scroll;
267
    expected.motion.action = mir_motion_action_scroll;
664
268
    expected.motion.modifiers = 6;
268
    expected.motion.modifiers = 6;
667
269
    expected.motion.button_state =
269
    expected.motion.buttons = mir_pointer_button_forward | mir_pointer_button_secondary;
666
270
        static_cast<MirMotionButton>(mir_motion_button_forward | mir_motion_button_secondary);
668
271
270
669
272
    auto & pointer = expected.motion.pointer_coordinates[0];
271
    auto & pointer = expected.motion.pointer_coordinates[0];
670
273
    pointer.id = 1;
272
    pointer.id = 1;
671
@@ -303,7 +302,7 @@
672
303
                                          expected.motion.action,
302
                                          expected.motion.action,
673
304
                                          0, /* flags */
303
                                          0, /* flags */
674
305
                                          expected.motion.modifiers,
304
                                          expected.motion.modifiers,
676
306
                                          expected.motion.button_state,
305
                                          AMOTION_EVENT_BUTTON_FORWARD | AMOTION_EVENT_BUTTON_SECONDARY,
677
307
                                          0, /* edge flags */
306
                                          0, /* edge flags */
678
308
                                          expected.motion.pointer_count,
307
                                          expected.motion.pointer_count,
679
309
                                          properties,
308
                                          properties,
680
310
309
681
=== modified file 'tests/unit-tests/input/test_default_input_device_hub.cpp'
682
--- tests/unit-tests/input/test_default_input_device_hub.cpp	2015-05-19 14:28:28 +0000
683
+++ tests/unit-tests/input/test_default_input_device_hub.cpp	2015-05-20 14:14:47 +0000
684
@@ -368,9 +368,9 @@
685
368
    using namespace ::testing;
368
    using namespace ::testing;
686
369
369
687
370
    auto x = 12.2f, y = 14.3f;
370
    auto x = 12.2f, y = 14.3f;
691
371
    std::vector<MirPointerButton> none_pressed;
371
692
372
    auto event = mir::events::make_event(0, 0ns, mir_input_event_modifier_none, mir_pointer_action_motion, none_pressed,
372
    auto event = mir::events::make_event(0, 0ns, mir_input_event_modifier_none, mir_pointer_action_motion, 0,
693
373
                                         x, y, 0.0f, 0.0f);
373
        x, y, 0.0f, 0.0f);
694
374
374
695
375
    EXPECT_CALL(mock_cursor_listener, cursor_moved_to(x, y)).Times(1);
375
    EXPECT_CALL(mock_cursor_listener, cursor_moved_to(x, y)).Times(1);
696
376
376
697
377
377
698
=== modified file 'tests/unit-tests/input/test_event_builders.cpp'
699
--- tests/unit-tests/input/test_event_builders.cpp	2015-05-19 14:02:31 +0000
700
+++ tests/unit-tests/input/test_event_builders.cpp	2015-05-20 14:14:47 +0000
701
@@ -99,8 +99,7 @@
702
99
TEST_F(InputEventBuilder, makes_valid_pointer_event)
99
TEST_F(InputEventBuilder, makes_valid_pointer_event)
703
100
{
100
{
704
101
    MirPointerAction action = mir_pointer_action_enter;
101
    MirPointerAction action = mir_pointer_action_enter;
707
102
    std::vector<MirPointerButton> depressed_buttons = 
102
    auto depressed_buttons = mir_pointer_button_back | mir_pointer_button_tertiary;
706
103
        {mir_pointer_button_back, mir_pointer_button_tertiary};
708
104
    float x_axis_value = 3.9, y_axis_value = 7.4, hscroll_value = .9, vscroll_value = .3;
103
    float x_axis_value = 3.9, y_axis_value = 7.4, hscroll_value = .9, vscroll_value = .3;
709
105
    auto ev = mev::make_event(device_id, timestamp, modifiers, 
104
    auto ev = mev::make_event(device_id, timestamp, modifiers, 
710
106
        action, depressed_buttons, x_axis_value, y_axis_value, hscroll_value, vscroll_value);
105
        action, depressed_buttons, x_axis_value, y_axis_value, hscroll_value, vscroll_value);
711
@@ -162,11 +161,10 @@
712
162
161
713
163
TEST_F(InputEventBuilder, map_to_hover_if_no_button_pressed)
162
TEST_F(InputEventBuilder, map_to_hover_if_no_button_pressed)
714
164
{
163
{
715
165
    std::vector<MirPointerButton> no_pressed_buttons;
716
166
    float x_axis_value = 3.9, y_axis_value = 7.4, hscroll_value = .9, vscroll_value = .3;
164
    float x_axis_value = 3.9, y_axis_value = 7.4, hscroll_value = .9, vscroll_value = .3;
717
167
    MirPointerAction action = mir_pointer_action_motion;
165
    MirPointerAction action = mir_pointer_action_motion;
718
168
    auto ev = mev::make_event(device_id, timestamp, modifiers,
166
    auto ev = mev::make_event(device_id, timestamp, modifiers,
720
169
        action, no_pressed_buttons, x_axis_value, y_axis_value, hscroll_value, vscroll_value);
167
        action, 0, x_axis_value, y_axis_value, hscroll_value, vscroll_value);
721
170
    auto e = ev.get();
168
    auto e = ev.get();
722
171
169
723
172
    auto ie = mir_event_get_input_event(e);
170
    auto ie = mir_event_get_input_event(e);
724
173
171
725
=== modified file 'tests/unit-tests/input/test_input_event.cpp'
726
--- tests/unit-tests/input/test_input_event.cpp	2015-05-13 06:23:25 +0000
727
+++ tests/unit-tests/input/test_input_event.cpp	2015-05-20 14:14:47 +0000
728
@@ -61,15 +61,21 @@
729
61
MirEvent a_key_ev()
61
MirEvent a_key_ev()
730
62
{
62
{
731
63
    MirEvent key_ev;
63
    MirEvent key_ev;
732
64
    memset(&key_ev, 0, sizeof(key_ev));
733
65
    
734
64
    key_ev.type = mir_event_type_key;
66
    key_ev.type = mir_event_type_key;
735
67
    
736
65
    return key_ev;
68
    return key_ev;
737
66
}
69
}
738
67
70
739
68
MirEvent a_motion_ev(int device_class = AINPUT_SOURCE_UNKNOWN)
71
MirEvent a_motion_ev(int device_class = AINPUT_SOURCE_UNKNOWN)
740
69
{
72
{
741
70
    MirEvent motion_ev;
73
    MirEvent motion_ev;
742
74
    memset(&motion_ev, 0, sizeof(motion_ev));
743
75
    
744
71
    motion_ev.type = mir_event_type_motion;
76
    motion_ev.type = mir_event_type_motion;
745
72
    motion_ev.motion.source_id = device_class;
77
    motion_ev.motion.source_id = device_class;
746
78
    
747
73
    return motion_ev;
79
    return motion_ev;
748
74
}
80
}
749
75
81
750
@@ -350,13 +356,13 @@
751
350
{
356
{
752
351
    auto old_ev = a_motion_ev(AINPUT_SOURCE_MOUSE);
357
    auto old_ev = a_motion_ev(AINPUT_SOURCE_MOUSE);
753
352
358
755
353
    old_ev.motion.button_state = mir_motion_button_primary;
359
    old_ev.motion.buttons = mir_pointer_button_primary;
756
354
    auto pev = mir_input_event_get_pointer_event(mir_event_get_input_event(&old_ev));
360
    auto pev = mir_input_event_get_pointer_event(mir_event_get_input_event(&old_ev));
757
355
    
361
    
758
356
    EXPECT_TRUE(mir_pointer_event_button_state(pev, mir_pointer_button_primary));
362
    EXPECT_TRUE(mir_pointer_event_button_state(pev, mir_pointer_button_primary));
759
357
    EXPECT_FALSE(mir_pointer_event_button_state(pev, mir_pointer_button_secondary));
363
    EXPECT_FALSE(mir_pointer_event_button_state(pev, mir_pointer_button_secondary));
760
358
364
762
359
    old_ev.motion.button_state = static_cast<MirMotionButton>(old_ev.motion.button_state | (mir_motion_button_secondary));
365
    old_ev.motion.buttons |=  mir_pointer_button_secondary;
763
360
366
764
361
    EXPECT_TRUE(mir_pointer_event_button_state(pev, mir_pointer_button_primary));
367
    EXPECT_TRUE(mir_pointer_event_button_state(pev, mir_pointer_button_primary));
765
362
    EXPECT_TRUE(mir_pointer_event_button_state(pev, mir_pointer_button_secondary));
368
    EXPECT_TRUE(mir_pointer_event_button_state(pev, mir_pointer_button_secondary));
766
363
369
767
=== modified file 'tests/unit-tests/scene/test_abstract_shell.cpp'
768
--- tests/unit-tests/scene/test_abstract_shell.cpp	2015-05-13 06:23:25 +0000
769
+++ tests/unit-tests/scene/test_abstract_shell.cpp	2015-05-20 14:14:47 +0000
770
@@ -283,7 +283,7 @@
771
283
{
283
{
772
284
    MirInputEventModifiers const modifiers{mir_input_event_modifier_none};
284
    MirInputEventModifiers const modifiers{mir_input_event_modifier_none};
773
285
    MirPointerAction const action{mir_pointer_action_button_down};
285
    MirPointerAction const action{mir_pointer_action_button_down};
775
286
    std::vector<MirPointerButton> const buttons_pressed{mir_pointer_button_primary};
286
    auto const buttons_pressed = mir_pointer_button_primary;
776
287
    float const x_axis_value{0.0};
287
    float const x_axis_value{0.0};
777
288
    float const y_axis_value{0.0};
288
    float const y_axis_value{0.0};
778
289
    float const hscroll_value{0.0};
289
    float const hscroll_value{0.0};
Status:	Merged
Approved by:	Robert Carr on 2015-05-20
Approved revision:	no longer in the source branch.
Merged at revision:	2589
Proposed branch:	lp:~mir-team/mir/unify-pointer-button
Merge into:	lp:mir
Prerequisite:	lp:~andreas-pokorny/mir/connect-cursor-listener-to-input-device-hub
Diff against target:	778 lines (+190/-114) 25 files modified include/client/mir/events/event_builders.h (+1/-2) include/client/mir_toolkit/events/input/pointer_event.h (+15/-5) src/client/events/event_builders.cpp (+19/-30) src/client/input/android/android_input_lexicon.cpp (+1/-1) src/client/input/android/event_conversion_helpers.cpp (+34/-0) src/client/input/input_event.cpp (+11/-5) src/client/symbols.map (+3/-0) src/include/common/mir/events/event_private.h (+1/-9) src/include/common/mir/input/android/event_conversion_helpers.h (+3/-1) src/server/input/android/android_input_dispatcher.cpp (+1/-1) src/server/input/android/input_sender.cpp (+1/-1) src/server/input/android/input_translator.cpp (+1/-1) tests/acceptance-tests/test_client_input.cpp (+43/-0) tests/acceptance-tests/test_surface_modifications.cpp (+2/-4) tests/acceptance-tests/test_surface_placement.cpp (+1/-1) tests/include/mir_test/event_matchers.h (+26/-25) tests/mir_test_framework/fake_input_device_impl.cpp (+3/-3) tests/mir_test_framework/fake_input_device_impl.h (+1/-3) tests/unit-tests/input/android/test_android_input_dispatcher.cpp (+5/-4) tests/unit-tests/input/android/test_android_input_lexicon.cpp (+2/-5) tests/unit-tests/input/android/test_input_translator.cpp (+2/-3) tests/unit-tests/input/test_default_input_device_hub.cpp (+3/-3) tests/unit-tests/input/test_event_builders.cpp (+2/-4) tests/unit-tests/input/test_input_event.cpp (+8/-2) tests/unit-tests/scene/test_abstract_shell.cpp (+1/-1)
To merge this branch:	bzr merge lp:~mir-team/mir/unify-pointer-button
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2015-05-14	Approve on 2015-05-21
Alberto Aguirre (community)			Approve on 2015-05-18
Alan Griffiths		2015-05-14	Approve on 2015-05-18
Daniel van Vugt		2015-05-14	Pending
Alexandros Frantzis		2015-05-14	Pending
Andreas Pokorny		2015-05-14	Pending
Kevin DuBois		2015-05-14	Pending
Review via email: mp+259148@code.launchpad.net