1
=== modified file 'src/server/graphics/nested/input_platform.cpp'
2
--- src/server/graphics/nested/input_platform.cpp	2017-05-08 03:04:26 +0000
3
+++ src/server/graphics/nested/input_platform.cpp	2017-06-23 16:26:45 +0000
4
@@ -33,6 +33,9 @@
5
33
#include "mir/events/event_builders.h"
33
#include "mir/events/event_builders.h"
6
34
34
7
35
#include <chrono>
35
#include <chrono>
8
36
#include <condition_variable>
9
37
#include <thread>
10
38
#include <queue>
11
36
39
12
37
namespace mi = mir::input;
40
namespace mi = mir::input;
13
38
namespace mgn = mir::graphics::nested;
41
namespace mgn = mir::graphics::nested;
14
@@ -52,9 +55,68 @@
15
52
    return mgn::UniqueInputConfig(nullptr, [](MirInputConfig const*){});
55
    return mgn::UniqueInputConfig(nullptr, [](MirInputConfig const*){});
16
53
}
56
}
17
54
57
21
55
}
58
class Postman
22
56
59
{
23
57
struct mgn::InputPlatform::InputDevice : mi::InputDevice
60
public:
24
61
25
62
    void start_work();
26
63
    void post(std::shared_ptr<MirEvent> const& event);
27
64
    void stop_work();
28
65
29
66
    mi::InputSink* destination{nullptr};
30
67
31
68
private:
32
69
    using EventQueue = std::queue<std::shared_ptr<MirEvent>>;
33
70
34
71
    std::thread worker_thread;
35
72
    std::mutex mutable mutex;
36
73
    std::condition_variable work_cv;
37
74
    EventQueue events;
38
75
39
76
    void do_work();
40
77
41
78
    std::shared_ptr<MirEvent> next_event();
42
79
};
43
80
44
81
void Postman::do_work()
45
82
{
46
83
    while (auto const event = next_event())
47
84
        destination->handle_input(*event);
48
85
}
49
86
50
87
std::shared_ptr<MirEvent> Postman::next_event()
51
88
{
52
89
    EventQueue::value_type event;
53
90
    {
54
91
        std::unique_lock<decltype(mutex)> lock{mutex};
55
92
        work_cv.wait(lock, [this] { return !events.empty(); });
56
93
        event.swap(events.front());
57
94
        events.pop();
58
95
    }
59
96
    return event;
60
97
}
61
98
62
99
void Postman::post(std::shared_ptr<MirEvent> const& event)
63
100
{
64
101
    std::lock_guard<decltype(mutex)> lock{mutex};
65
102
    events.push(event);
66
103
    work_cv.notify_one();
67
104
}
68
105
69
106
void Postman::start_work()
70
107
{
71
108
    worker_thread = std::thread([this] { do_work(); });
72
109
}
73
110
74
111
void Postman::stop_work()
75
112
{
76
113
    // We use a null event as a sentinel
77
114
    post({});
78
115
    worker_thread.join();
79
116
}
80
117
}
81
118
82
119
struct mgn::InputPlatform::InputDevice : mi::InputDevice, Postman
83
58
{
120
{
84
59
public:
121
public:
85
60
    InputDevice(MirInputDevice* dev, std::function<void()> config_change)
122
    InputDevice(MirInputDevice* dev, std::function<void()> config_change)
86
@@ -119,6 +181,12 @@
87
119
    {
181
    {
88
120
        this->destination = destination;
182
        this->destination = destination;
89
121
        this->builder = builder;
183
        this->builder = builder;
90
184
        start_work();
91
185
    }
92
186
93
187
    void post_event(std::shared_ptr<MirEvent> const event)
94
188
    {
95
189
        post(event);
96
122
    }
190
    }
97
123
191
98
124
    void emit_event(MirInputEvent const* event, mir::geometry::Rectangle const& frame)
192
    void emit_event(MirInputEvent const* event, mir::geometry::Rectangle const& frame)
99
@@ -147,20 +215,19 @@
100
147
                    contact.touch_major = mir_touch_event_axis_value(touch_event, i, mir_touch_axis_touch_major);
215
                    contact.touch_major = mir_touch_event_axis_value(touch_event, i, mir_touch_axis_touch_major);
101
148
                    contact.touch_minor = mir_touch_event_axis_value(touch_event, i, mir_touch_axis_touch_minor);
216
                    contact.touch_minor = mir_touch_event_axis_value(touch_event, i, mir_touch_axis_touch_minor);
102
149
                }
217
                }
104
150
                destination->handle_input(*builder->touch_event(event_time, contacts));
218
                post_event(builder->touch_event(event_time, contacts));
105
151
                break;
219
                break;
106
152
            }
220
            }
107
153
        case mir_input_event_type_key:
221
        case mir_input_event_type_key:
108
154
            {
222
            {
109
155
                auto const* key_event = mir_input_event_get_keyboard_event(event);
223
                auto const* key_event = mir_input_event_get_keyboard_event(event);
110
156
224
112
157
                auto new_kev = builder->key_event(
225
                post_event(builder->key_event(
113
158
                        event_time,
226
                        event_time,
114
159
                        mir_keyboard_event_action(key_event),
227
                        mir_keyboard_event_action(key_event),
115
160
                        mir_keyboard_event_key_code(key_event),
228
                        mir_keyboard_event_key_code(key_event),
116
161
                        mir_keyboard_event_scan_code(key_event)
229
                        mir_keyboard_event_scan_code(key_event)
119
162
                        );
230
                        ));
118
163
                destination->handle_input(*new_kev);
120
164
                break;
231
                break;
121
165
            }
232
            }
122
166
        case mir_input_event_type_pointer:
233
        case mir_input_event_type_pointer:
123
@@ -168,7 +235,7 @@
124
168
                auto const* pointer_event = mir_input_event_get_pointer_event(event);
235
                auto const* pointer_event = mir_input_event_get_pointer_event(event);
125
169
                auto x = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_x);
236
                auto x = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_x);
126
170
                auto y = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_y);
237
                auto y = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_y);
128
171
                auto new_event = builder->pointer_event(
238
                post_event(builder->pointer_event(
129
172
                        event_time,
239
                        event_time,
130
173
                        filter_pointer_action(mir_pointer_event_action(pointer_event)),
240
                        filter_pointer_action(mir_pointer_event_action(pointer_event)),
131
174
                        mir_pointer_event_buttons(pointer_event),
241
                        mir_pointer_event_buttons(pointer_event),
132
@@ -178,9 +245,7 @@
133
178
                        mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_vscroll),
245
                        mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_vscroll),
134
179
                        mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_relative_x),
246
                        mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_relative_x),
135
180
                        mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_relative_y)
247
                        mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_relative_y)
139
181
                        );
248
                        ));
137
182
138
183
                destination->handle_input(*new_event);
140
184
                break;
249
                break;
141
185
            }
250
            }
142
186
        default:
251
        default:
143
@@ -190,6 +255,7 @@
144
190
255
145
191
    void stop() override
256
    void stop() override
146
192
    {
257
    {
147
258
        stop_work();
148
193
        this->destination = nullptr;
259
        this->destination = nullptr;
149
194
        this->builder = nullptr;
260
        this->builder = nullptr;
150
195
    }
261
    }
151
@@ -272,7 +338,6 @@
152
272
338
153
273
    MirInputDeviceId device_id;
339
    MirInputDeviceId device_id;
154
274
    MirInputDevice* device{nullptr};
340
    MirInputDevice* device{nullptr};
155
275
    mi::InputSink* destination{nullptr};
156
276
    mi::EventBuilder* builder{nullptr};
341
    mi::EventBuilder* builder{nullptr};
157
277
    mi::InputDeviceInfo device_info;
342
    mi::InputDeviceInfo device_info;
158
278
    mir::optional_value<mi::PointerSettings> pointer_settings;
343
    mir::optional_value<mi::PointerSettings> pointer_settings;
159
279
344
160
=== modified file 'tests/unit-tests/input/test_nested_input_platform.cpp'
161
--- tests/unit-tests/input/test_nested_input_platform.cpp	2017-05-08 03:04:26 +0000
162
+++ tests/unit-tests/input/test_nested_input_platform.cpp	2017-06-23 16:26:45 +0000
163
@@ -153,6 +153,8 @@
164
153
    mock_host_connection.event_callback(*mev::make_event(a_mouse.id(), 12ns, cookie, mir_input_event_modifier_none,
153
    mock_host_connection.event_callback(*mev::make_event(a_mouse.id(), 12ns, cookie, mir_input_event_modifier_none,
165
154
                                                         mir_pointer_action_motion, mir_pointer_button_primary, 23, 42,
154
                                                         mir_pointer_action_motion, mir_pointer_button_primary, 23, 42,
166
155
                                                         0, 0, 12, 10), source_surface);
155
                                                         0, 0, 12, 10), source_surface);
167
156
168
157
    nested_input_device->stop();
169
156
}
158
}
170
157
159
171
158
TEST_F(TestNestedInputPlatform, devices_forward_key_events)
160
TEST_F(TestNestedInputPlatform, devices_forward_key_events)
172
@@ -172,6 +174,7 @@
173
172
174
174
173
    mock_host_connection.event_callback(*mev::make_event(a_keyboard.id(), 141ns, cookie, mir_keyboard_action_down, 0,
175
    mock_host_connection.event_callback(*mev::make_event(a_keyboard.id(), 141ns, cookie, mir_keyboard_action_down, 0,
175
174
                                                         scan_code, mir_input_event_modifier_none), source_surface);
176
                                                         scan_code, mir_input_event_modifier_none), source_surface);
176
177
    nested_input_device->stop();
177
175
}
178
}
178
176
179
179
177
TEST_F(TestNestedInputPlatform, replaces_enter_events_as_motion_event)
180
TEST_F(TestNestedInputPlatform, replaces_enter_events_as_motion_event)
180
@@ -199,6 +202,7 @@
181
199
                                 60.0f, 35.0f);
202
                                 60.0f, 35.0f);
182
200
203
183
201
    mock_host_connection.event_callback(*event, source_surface);
204
    mock_host_connection.event_callback(*event, source_surface);
184
205
    nested_input_device->stop();
185
202
}
206
}
186
203
207
187
204
TEST_F(TestNestedInputPlatform, device_configurations_are_forwarded_to_host_connection)
208
TEST_F(TestNestedInputPlatform, device_configurations_are_forwarded_to_host_connection)
188
@@ -216,4 +220,5 @@
189
216
    EXPECT_CALL(mock_host_connection, apply_input_configuration(_));
220
    EXPECT_CALL(mock_host_connection, apply_input_configuration(_));
190
217
221
191
218
    nested_input_device->apply_settings(left_handed);
222
    nested_input_device->apply_settings(left_handed);
192
223
    nested_input_device->stop();
193
219
}
224
}
Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)		2017-06-23	Approve on 2017-06-26
Andreas Pokorny (community)			Approve on 2017-06-25
Mir CI Bot	continuous-integration		Approve on 2017-06-23
Review via email: mp+326234@code.launchpad.net
1	=== modified file 'src/server/graphics/nested/input_platform.cpp'
2	--- src/server/graphics/nested/input_platform.cpp 2017-05-08 03:04:26 +0000
3	+++ src/server/graphics/nested/input_platform.cpp 2017-06-23 16:26:45 +0000
4	@@ -33,6 +33,9 @@
5	33	#include "mir/events/event_builders.h"	33	#include "mir/events/event_builders.h"
6	34		34
7	35	#include <chrono>	35	#include <chrono>
8			36	#include <condition_variable>
9			37	#include <thread>
10			38	#include <queue>
11	36		39
12	37	namespace mi = mir::input;	40	namespace mi = mir::input;
13	38	namespace mgn = mir::graphics::nested;	41	namespace mgn = mir::graphics::nested;
14	@@ -52,9 +55,68 @@
15	52	return mgn::UniqueInputConfig(nullptr, [](MirInputConfig const*){});	55	return mgn::UniqueInputConfig(nullptr, [](MirInputConfig const*){});
16	53	}	56	}
17	54		57
21	55	}	58	class Postman
22	56		59	{
23	57	struct mgn::InputPlatform::InputDevice : mi::InputDevice	60	public:
24			61
25			62	void start_work();
26			63	void post(std::shared_ptr<MirEvent> const& event);
27			64	void stop_work();
28			65
29			66	mi::InputSink* destination{nullptr};
30			67
31			68	private:
32			69	using EventQueue = std::queue<std::shared_ptr<MirEvent>>;
33			70
34			71	std::thread worker_thread;
35			72	std::mutex mutable mutex;
36			73	std::condition_variable work_cv;
37			74	EventQueue events;
38			75
39			76	void do_work();
40			77
41			78	std::shared_ptr<MirEvent> next_event();
42			79	};
43			80
44			81	void Postman::do_work()
45			82	{
46			83	while (auto const event = next_event())
47			84	destination->handle_input(*event);
48			85	}
49			86
50			87	std::shared_ptr<MirEvent> Postman::next_event()
51			88	{
52			89	EventQueue::value_type event;
53			90	{
54			91	std::unique_lock<decltype(mutex)> lock{mutex};
55			92	work_cv.wait(lock, [this] { return !events.empty(); });
56			93	event.swap(events.front());
57			94	events.pop();
58			95	}
59			96	return event;
60			97	}
61			98
62			99	void Postman::post(std::shared_ptr<MirEvent> const& event)
63			100	{
64			101	std::lock_guard<decltype(mutex)> lock{mutex};
65			102	events.push(event);
66			103	work_cv.notify_one();
67			104	}
68			105
69			106	void Postman::start_work()
70			107	{
71			108	worker_thread = std::thread([this] { do_work(); });
72			109	}
73			110
74			111	void Postman::stop_work()
75			112	{
76			113	// We use a null event as a sentinel
77			114	post({});
78			115	worker_thread.join();
79			116	}
80			117	}
81			118
82			119	struct mgn::InputPlatform::InputDevice : mi::InputDevice, Postman
83	58	{	120	{
84	59	public:	121	public:
85	60	InputDevice(MirInputDevice* dev, std::function<void()> config_change)	122	InputDevice(MirInputDevice* dev, std::function<void()> config_change)
86	@@ -119,6 +181,12 @@
87	119	{	181	{
88	120	this->destination = destination;	182	this->destination = destination;
89	121	this->builder = builder;	183	this->builder = builder;
90			184	start_work();
91			185	}
92			186
93			187	void post_event(std::shared_ptr<MirEvent> const event)
94			188	{
95			189	post(event);
96	122	}	190	}
97	123		191
98	124	void emit_event(MirInputEvent const* event, mir::geometry::Rectangle const& frame)	192	void emit_event(MirInputEvent const* event, mir::geometry::Rectangle const& frame)
99	@@ -147,20 +215,19 @@
100	147	contact.touch_major = mir_touch_event_axis_value(touch_event, i, mir_touch_axis_touch_major);	215	contact.touch_major = mir_touch_event_axis_value(touch_event, i, mir_touch_axis_touch_major);
101	148	contact.touch_minor = mir_touch_event_axis_value(touch_event, i, mir_touch_axis_touch_minor);	216	contact.touch_minor = mir_touch_event_axis_value(touch_event, i, mir_touch_axis_touch_minor);
102	149	}	217	}
104	150	destination->handle_input(*builder->touch_event(event_time, contacts));	218	post_event(builder->touch_event(event_time, contacts));
105	151	break;	219	break;
106	152	}	220	}
107	153	case mir_input_event_type_key:	221	case mir_input_event_type_key:
108	154	{	222	{
109	155	auto const* key_event = mir_input_event_get_keyboard_event(event);	223	auto const* key_event = mir_input_event_get_keyboard_event(event);
110	156		224
112	157	auto new_kev = builder->key_event(	225	post_event(builder->key_event(
113	158	event_time,	226	event_time,
114	159	mir_keyboard_event_action(key_event),	227	mir_keyboard_event_action(key_event),
115	160	mir_keyboard_event_key_code(key_event),	228	mir_keyboard_event_key_code(key_event),
116	161	mir_keyboard_event_scan_code(key_event)	229	mir_keyboard_event_scan_code(key_event)
119	162	);	230	));
118	163	destination->handle_input(*new_kev);
120	164	break;	231	break;
121	165	}	232	}
122	166	case mir_input_event_type_pointer:	233	case mir_input_event_type_pointer:
123	@@ -168,7 +235,7 @@
124	168	auto const* pointer_event = mir_input_event_get_pointer_event(event);	235	auto const* pointer_event = mir_input_event_get_pointer_event(event);
125	169	auto x = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_x);	236	auto x = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_x);
126	170	auto y = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_y);	237	auto y = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_y);
128	171	auto new_event = builder->pointer_event(	238	post_event(builder->pointer_event(
129	172	event_time,	239	event_time,
130	173	filter_pointer_action(mir_pointer_event_action(pointer_event)),	240	filter_pointer_action(mir_pointer_event_action(pointer_event)),
131	174	mir_pointer_event_buttons(pointer_event),	241	mir_pointer_event_buttons(pointer_event),
132	@@ -178,9 +245,7 @@
133	178	mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_vscroll),	245	mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_vscroll),
134	179	mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_relative_x),	246	mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_relative_x),
135	180	mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_relative_y)	247	mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_relative_y)
139	181	);	248	));
137	182
138	183	destination->handle_input(*new_event);
140	184	break;	249	break;
141	185	}	250	}
142	186	default:	251	default:
143	@@ -190,6 +255,7 @@
144	190		255
145	191	void stop() override	256	void stop() override
146	192	{	257	{
147			258	stop_work();
148	193	this->destination = nullptr;	259	this->destination = nullptr;
149	194	this->builder = nullptr;	260	this->builder = nullptr;
150	195	}	261	}
151	@@ -272,7 +338,6 @@
152	272		338
153	273	MirInputDeviceId device_id;	339	MirInputDeviceId device_id;
154	274	MirInputDevice* device{nullptr};	340	MirInputDevice* device{nullptr};
155	275	mi::InputSink* destination{nullptr};
156	276	mi::EventBuilder* builder{nullptr};	341	mi::EventBuilder* builder{nullptr};
157	277	mi::InputDeviceInfo device_info;	342	mi::InputDeviceInfo device_info;
158	278	mir::optional_value<mi::PointerSettings> pointer_settings;	343	mir::optional_value<mi::PointerSettings> pointer_settings;
159	279		344
160	=== modified file 'tests/unit-tests/input/test_nested_input_platform.cpp'
161	--- tests/unit-tests/input/test_nested_input_platform.cpp 2017-05-08 03:04:26 +0000
162	+++ tests/unit-tests/input/test_nested_input_platform.cpp 2017-06-23 16:26:45 +0000
163	@@ -153,6 +153,8 @@
164	153	mock_host_connection.event_callback(*mev::make_event(a_mouse.id(), 12ns, cookie, mir_input_event_modifier_none,	153	mock_host_connection.event_callback(*mev::make_event(a_mouse.id(), 12ns, cookie, mir_input_event_modifier_none,
165	154	mir_pointer_action_motion, mir_pointer_button_primary, 23, 42,	154	mir_pointer_action_motion, mir_pointer_button_primary, 23, 42,
166	155	0, 0, 12, 10), source_surface);	155	0, 0, 12, 10), source_surface);
167			156
168			157	nested_input_device->stop();
169	156	}	158	}
170	157		159
171	158	TEST_F(TestNestedInputPlatform, devices_forward_key_events)	160	TEST_F(TestNestedInputPlatform, devices_forward_key_events)
172	@@ -172,6 +174,7 @@
173	172		174
174	173	mock_host_connection.event_callback(*mev::make_event(a_keyboard.id(), 141ns, cookie, mir_keyboard_action_down, 0,	175	mock_host_connection.event_callback(*mev::make_event(a_keyboard.id(), 141ns, cookie, mir_keyboard_action_down, 0,
175	174	scan_code, mir_input_event_modifier_none), source_surface);	176	scan_code, mir_input_event_modifier_none), source_surface);
176			177	nested_input_device->stop();
177	175	}	178	}
178	176		179
179	177	TEST_F(TestNestedInputPlatform, replaces_enter_events_as_motion_event)	180	TEST_F(TestNestedInputPlatform, replaces_enter_events_as_motion_event)
180	@@ -199,6 +202,7 @@
181	199	60.0f, 35.0f);	202	60.0f, 35.0f);
182	200		203
183	201	mock_host_connection.event_callback(*event, source_surface);	204	mock_host_connection.event_callback(*event, source_surface);
184			205	nested_input_device->stop();
185	202	}	206	}
186	203		207
187	204	TEST_F(TestNestedInputPlatform, device_configurations_are_forwarded_to_host_connection)	208	TEST_F(TestNestedInputPlatform, device_configurations_are_forwarded_to_host_connection)
188	@@ -216,4 +220,5 @@
189	216	EXPECT_CALL(mock_host_connection, apply_input_configuration(_));	220	EXPECT_CALL(mock_host_connection, apply_input_configuration(_));
190	217		221
191	218	nested_input_device->apply_settings(left_handed);	222	nested_input_device->apply_settings(left_handed);
192			223	nested_input_device->stop();
193	219	}	224	}