1
=== modified file 'doc/component_reports.md'
2
--- doc/component_reports.md	2015-04-28 07:54:10 +0000
3
+++ doc/component_reports.md	2016-08-01 21:28:24 +0000
4
@@ -23,6 +23,7 @@
5
23
display-report               | log,lttng
23
display-report               | log,lttng
6
24
input-report                 | log,lttng
24
input-report                 | log,lttng
7
25
legacy-input-report          | log
25
legacy-input-report          | log
8
26
seat-report                  | log
9
26
msg-processor-report         | log,lttng
27
msg-processor-report         | log,lttng
10
27
session-mediator-report      | log,lttng
28
session-mediator-report      | log,lttng
11
28
scene-report                 | log,lttng
29
scene-report                 | log,lttng
12
29
30
13
=== added file 'include/server/mir/input/seat_report.h'
14
--- include/server/mir/input/seat_report.h	1970-01-01 00:00:00 +0000
15
+++ include/server/mir/input/seat_report.h	2016-08-01 21:28:24 +0000
16
@@ -0,0 +1,55 @@
17
1
/*
18
2
 * Copyright © 2016 Canonical Ltd.
19
3
 *
20
4
 * This program is free software: you can redistribute it and/or modify it
21
5
 * under the terms of the GNU General Public License version 3,
22
6
 * as published by the Free Software Foundation.
23
7
 *
24
8
 * This program is distributed in the hope that it will be useful,
25
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
26
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
27
11
 * GNU General Public License for more details.
28
12
 *
29
13
 * You should have received a copy of the GNU General Public License
30
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
31
15
 *
32
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
33
17
 */
34
18
35
19
36
20
#ifndef MIR_INPUT_SEAT_REPORT_H_
37
21
#define MIR_INPUT_SEAT_REPORT_H_
38
22
39
23
#include <string>
40
24
#include <vector>
41
25
42
26
class MirEvent;
43
27
44
28
namespace mir
45
29
{
46
30
namespace geometry
47
31
{
48
32
class Rectangles;
49
33
class Rectangle;
50
34
}
51
35
namespace input
52
36
{
53
37
class SeatReport
54
38
{
55
39
public:
56
40
    virtual ~SeatReport() = default;
57
41
    
58
42
    virtual void seat_add_device(uint64_t id) = 0;
59
43
    virtual void seat_remove_device(uint64_t id) = 0;
60
44
    virtual void seat_dispatch_event(MirEvent const& event) = 0;
61
45
    virtual void seat_get_rectangle_for(uint64_t id, geometry::Rectangle const& out_rect) = 0;
62
46
    virtual void seat_set_key_state(uint64_t id, std::vector<uint32_t> const& scan_codes) = 0;
63
47
    virtual void seat_set_pointer_state(uint64_t id, unsigned buttons) = 0;
64
48
    virtual void seat_set_cursor_position(float cursor_x, float cursor_y) = 0;
65
49
    virtual void seat_set_confinement_region_called(geometry::Rectangles const& regions) = 0;
66
50
    virtual void seat_reset_confinement_regions() = 0;
67
51
};
68
52
}
69
53
}
70
54
71
55
#endif /* MIR_INPUT_SEAT_REPORT_H_ */
72
0
56
73
=== modified file 'include/server/mir/scene/null_surface_observer.h'
74
--- include/server/mir/scene/null_surface_observer.h	2016-07-26 03:56:14 +0000
75
+++ include/server/mir/scene/null_surface_observer.h	2016-08-01 21:28:24 +0000
76
@@ -45,7 +45,6 @@
77
45
    void keymap_changed(MirInputDeviceId id, std::string const& model, std::string const& layout, std::string const& variant, std::string const& options) override;
45
    void keymap_changed(MirInputDeviceId id, std::string const& model, std::string const& layout, std::string const& variant, std::string const& options) override;
78
46
    void renamed(char const* name) override;
46
    void renamed(char const* name) override;
79
47
    void cursor_image_removed() override;
47
    void cursor_image_removed() override;
80
48
    void confinement_region_updated(geometry::Rectangle const& rect) override;
81
49
48
82
50
protected:
49
protected:
83
51
    NullSurfaceObserver(NullSurfaceObserver const&) = delete;
50
    NullSurfaceObserver(NullSurfaceObserver const&) = delete;
84
52
51
85
=== modified file 'include/server/mir/scene/surface_observer.h'
86
--- include/server/mir/scene/surface_observer.h	2016-07-26 03:56:14 +0000
87
+++ include/server/mir/scene/surface_observer.h	2016-08-01 21:28:24 +0000
88
@@ -60,7 +60,6 @@
89
60
                                std::string const& variant, std::string const& options) = 0;
60
                                std::string const& variant, std::string const& options) = 0;
90
61
    virtual void renamed(char const* name) = 0;
61
    virtual void renamed(char const* name) = 0;
91
62
    virtual void cursor_image_removed() = 0;
62
    virtual void cursor_image_removed() = 0;
92
63
    virtual void confinement_region_updated(geometry::Rectangle const& rect) = 0;
93
64
63
94
65
protected:
64
protected:
95
66
    SurfaceObserver() = default;
65
    SurfaceObserver() = default;
96
67
66
97
=== modified file 'include/server/mir/server.h'
98
--- include/server/mir/server.h	2016-07-20 04:54:07 +0000
99
+++ include/server/mir/server.h	2016-08-01 21:28:24 +0000
100
@@ -61,6 +61,10 @@
101
61
class SurfaceFactory;
61
class SurfaceFactory;
102
62
class CoordinateTranslator;
62
class CoordinateTranslator;
103
63
}
63
}
104
64
namespace input
105
65
{
106
66
class SeatReport;
107
67
}
108
64
68
109
65
class Fd;
69
class Fd;
110
66
class MainLoop;
70
class MainLoop;
111
@@ -283,6 +287,9 @@
112
283
    /// Sets an override functor for creating the session mediator report.
287
    /// Sets an override functor for creating the session mediator report.
113
284
    void override_the_session_mediator_report(Builder<frontend::SessionMediatorReport> const& session_mediator_builder);
288
    void override_the_session_mediator_report(Builder<frontend::SessionMediatorReport> const& session_mediator_builder);
114
285
289
115
290
    /// Sets an override functor for creating the seat report.
116
291
    void override_the_seat_report(Builder<input::SeatReport> const& seat_report_builder);
117
292
118
286
    /// Sets an override functor for creating the shell.
293
    /// Sets an override functor for creating the shell.
119
287
    void override_the_shell(Builder<shell::Shell> const& wrapper);
294
    void override_the_shell(Builder<shell::Shell> const& wrapper);
120
288
295
121
289
296
122
=== modified file 'include/server/mir/shell/abstract_shell.h'
123
--- include/server/mir/shell/abstract_shell.h	2016-07-26 03:56:14 +0000
124
+++ include/server/mir/shell/abstract_shell.h	2016-08-01 21:28:24 +0000
125
@@ -122,6 +122,8 @@
126
122
122
127
123
    bool handle(MirEvent const& event) override;
123
    bool handle(MirEvent const& event) override;
128
124
124
129
125
    void update_focused_surface_confined_region();
130
126
131
125
protected:
127
protected:
132
126
    std::shared_ptr<InputTargeter> const input_targeter;
128
    std::shared_ptr<InputTargeter> const input_targeter;
133
127
    std::shared_ptr<SurfaceStack> const surface_stack;
129
    std::shared_ptr<SurfaceStack> const surface_stack;
134
@@ -136,7 +138,7 @@
135
136
    std::mutex mutable focus_mutex;
138
    std::mutex mutable focus_mutex;
136
137
    std::weak_ptr<scene::Surface> focus_surface;
139
    std::weak_ptr<scene::Surface> focus_surface;
137
138
    std::weak_ptr<scene::Session> focus_session;
140
    std::weak_ptr<scene::Session> focus_session;
139
139
    std::shared_ptr<scene::SurfaceObserver> const focus_surface_observer;
141
    std::shared_ptr<scene::SurfaceObserver> focus_surface_observer;
140
140
142
141
141
    void set_focus_to_locked(
143
    void set_focus_to_locked(
142
142
        std::unique_lock<std::mutex> const& lock,
144
        std::unique_lock<std::mutex> const& lock,
143
143
145
144
=== added file 'include/test/mir/test/doubles/mock_seat_report.h'
145
--- include/test/mir/test/doubles/mock_seat_report.h	1970-01-01 00:00:00 +0000
146
+++ include/test/mir/test/doubles/mock_seat_report.h	2016-08-01 21:28:24 +0000
147
@@ -0,0 +1,52 @@
148
1
/*
149
2
 * Copyright © 2016 Canonical Ltd.
150
3
 *
151
4
 * This program is free software: you can redistribute it and/or modify
152
5
 * it under the terms of the GNU General Public License version 3 as
153
6
 * published by the Free Software Foundation.
154
7
 *
155
8
 * This program is distributed in the hope that it will be useful,
156
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
157
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
158
11
 * GNU General Public License for more details.
159
12
 *
160
13
 * You should have received a copy of the GNU General Public License
161
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
162
15
 *
163
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
164
17
 */
165
18
166
19
#ifndef MIR_TEST_DOUBLES_MOCK_SEAT_REPORT_H_
167
20
#define MIR_TEST_DOUBLES_MOCK_SEAT_REPORT_H_
168
21
169
22
#include "mir/input/seat_report.h"
170
23
#include <gmock/gmock.h>
171
24
172
25
class MirEvent;
173
26
174
27
namespace mir
175
28
{
176
29
namespace test
177
30
{
178
31
namespace doubles
179
32
{
180
33
181
34
class MockSeatReport : public input::SeatReport
182
35
{
183
36
public:
184
37
    MOCK_METHOD1(seat_add_device, void(uint64_t /*id*/));
185
38
    MOCK_METHOD1(seat_remove_device, void(uint64_t /*id*/));
186
39
    MOCK_METHOD1(seat_dispatch_event, void(MirEvent const& /*event*/));
187
40
    MOCK_METHOD2(seat_get_rectangle_for, void(uint64_t /*id*/, geometry::Rectangle const& /*out_rect*/));
188
41
    MOCK_METHOD2(seat_set_key_state, void(uint64_t /*id*/, std::vector<uint32_t> const& /*scan_codes*/));
189
42
    MOCK_METHOD2(seat_set_pointer_state, void(uint64_t /*id*/, unsigned /*buttons*/));
190
43
    MOCK_METHOD2(seat_set_cursor_position, void(float /*cursor_x*/, float /*cursor_y*/));
191
44
    MOCK_METHOD1(seat_set_confinement_region_called, void(geometry::Rectangles const& /*regions*/));
192
45
    MOCK_METHOD0(seat_reset_confinement_regions, void());
193
46
};
194
47
195
48
}
196
49
}
197
50
}
198
51
199
52
#endif /* MIR_TEST_DOUBLES_MOCK_SEAT_REPORT_H_ */
200
0
53
201
=== modified file 'include/test/mir_test_framework/placement_applying_shell.h'
202
--- include/test/mir_test_framework/placement_applying_shell.h	2016-05-03 06:55:25 +0000
203
+++ include/test/mir_test_framework/placement_applying_shell.h	2016-08-01 21:28:24 +0000
204
@@ -56,6 +56,9 @@
205
56
        mir::shell::SurfaceSpecification const& modifications) override;
56
        mir::shell::SurfaceSpecification const& modifications) override;
206
57
57
207
58
    bool wait_for_modify_surface(std::chrono::seconds timeout);
58
    bool wait_for_modify_surface(std::chrono::seconds timeout);
208
59
209
60
    std::weak_ptr <mir::scene::Surface> latest_surface;
210
61
211
59
private:
62
private:
212
60
    ClientInputRegions const& client_input_regions;
63
    ClientInputRegions const& client_input_regions;
213
61
    ClientPositions const& client_positions;
64
    ClientPositions const& client_positions;
214
62
65
215
=== modified file 'src/include/platform/mir/options/configuration.h'
216
--- src/include/platform/mir/options/configuration.h	2016-07-07 11:14:26 +0000
217
+++ src/include/platform/mir/options/configuration.h	2016-08-01 21:28:24 +0000
218
@@ -42,6 +42,7 @@
219
42
extern char const* const connector_report_opt;
42
extern char const* const connector_report_opt;
220
43
extern char const* const scene_report_opt;
43
extern char const* const scene_report_opt;
221
44
extern char const* const input_report_opt;
44
extern char const* const input_report_opt;
222
45
extern char const* const seat_report_opt;
223
45
extern char const* const host_socket_opt;
46
extern char const* const host_socket_opt;
224
46
extern char const* const frontend_threads_opt;
47
extern char const* const frontend_threads_opt;
225
47
extern char const* const touchspots_opt;
48
extern char const* const touchspots_opt;
226
48
49
227
=== modified file 'src/include/server/mir/default_server_configuration.h'
228
--- src/include/server/mir/default_server_configuration.h	2016-07-20 04:54:07 +0000
229
+++ src/include/server/mir/default_server_configuration.h	2016-08-01 21:28:24 +0000
230
@@ -122,6 +122,7 @@
231
122
namespace input
122
namespace input
232
123
{
123
{
233
124
class InputReport;
124
class InputReport;
234
125
class SeatReport;
235
125
class Scene;
126
class Scene;
236
126
class InputManager;
127
class InputManager;
237
127
class SurfaceInputDispatcher;
128
class SurfaceInputDispatcher;
238
@@ -302,6 +303,7 @@
239
302
    /** @name input configuration
303
    /** @name input configuration
240
303
     *  @{ */
304
     *  @{ */
241
304
    virtual std::shared_ptr<input::InputReport> the_input_report();
305
    virtual std::shared_ptr<input::InputReport> the_input_report();
242
306
    virtual std::shared_ptr<input::SeatReport> the_seat_report();
243
305
    virtual std::shared_ptr<input::CompositeEventFilter> the_composite_event_filter();
307
    virtual std::shared_ptr<input::CompositeEventFilter> the_composite_event_filter();
244
306
308
245
307
    virtual std::shared_ptr<input::EventFilterChainDispatcher> the_event_filter_chain_dispatcher();
309
    virtual std::shared_ptr<input::EventFilterChainDispatcher> the_event_filter_chain_dispatcher();
246
@@ -366,6 +368,7 @@
247
366
    CachedPtr<frontend::Connector>   prompt_connector;
368
    CachedPtr<frontend::Connector>   prompt_connector;
248
367
369
249
368
    CachedPtr<input::InputReport> input_report;
370
    CachedPtr<input::InputReport> input_report;
250
371
    CachedPtr<input::SeatReport> seat_report;
251
369
    CachedPtr<input::EventFilterChainDispatcher> event_filter_chain_dispatcher;
372
    CachedPtr<input::EventFilterChainDispatcher> event_filter_chain_dispatcher;
252
370
    CachedPtr<input::CompositeEventFilter> composite_event_filter;
373
    CachedPtr<input::CompositeEventFilter> composite_event_filter;
253
371
    CachedPtr<input::InputManager>    input_manager;
374
    CachedPtr<input::InputManager>    input_manager;
254
372
375
255
=== modified file 'src/include/server/mir/scene/surface_observers.h'
256
--- src/include/server/mir/scene/surface_observers.h	2016-07-26 03:56:14 +0000
257
+++ src/include/server/mir/scene/surface_observers.h	2016-08-01 21:28:24 +0000
258
@@ -49,7 +49,6 @@
259
49
                        std::string const& variant, std::string const& options) override;
49
                        std::string const& variant, std::string const& options) override;
260
50
    void renamed(char const*) override;
50
    void renamed(char const*) override;
261
51
    void cursor_image_removed() override;
51
    void cursor_image_removed() override;
262
52
    void confinement_region_updated(geometry::Rectangle const& rect) override;
263
53
};
52
};
264
54
53
265
55
}
54
}
266
56
55
267
=== modified file 'src/platform/options/default_configuration.cpp'
268
--- src/platform/options/default_configuration.cpp	2016-07-07 11:14:26 +0000
269
+++ src/platform/options/default_configuration.cpp	2016-08-01 21:28:24 +0000
270
@@ -40,6 +40,7 @@
271
40
char const* const mo::connector_report_opt        = "connector-report";
40
char const* const mo::connector_report_opt        = "connector-report";
272
41
char const* const mo::scene_report_opt            = "scene-report";
41
char const* const mo::scene_report_opt            = "scene-report";
273
42
char const* const mo::input_report_opt            = "input-report";
42
char const* const mo::input_report_opt            = "input-report";
274
43
char const* const mo::seat_report_opt            = "seat-report";
275
43
char const* const mo::shared_library_prober_report_opt = "shared-library-prober-report";
44
char const* const mo::shared_library_prober_report_opt = "shared-library-prober-report";
276
44
char const* const mo::shell_report_opt            = "shell-report";
45
char const* const mo::shell_report_opt            = "shell-report";
277
45
char const* const mo::host_socket_opt             = "host-socket";
46
char const* const mo::host_socket_opt             = "host-socket";
278
@@ -161,6 +162,8 @@
279
161
            "How to handle to Input report. [{log,lttng,off}]")
162
            "How to handle to Input report. [{log,lttng,off}]")
280
162
        (legacy_input_report_opt, po::value<std::string>()->default_value(off_opt_value),
163
        (legacy_input_report_opt, po::value<std::string>()->default_value(off_opt_value),
281
163
            "How to handle the Legacy Input report. [{log,off}]")
164
            "How to handle the Legacy Input report. [{log,off}]")
282
165
        (seat_report_opt, po::value<std::string>()->default_value(off_opt_value),
283
166
            "How to handle to Seat report. [{log,off}]")
284
164
        (session_mediator_report_opt, po::value<std::string>()->default_value(off_opt_value),
167
        (session_mediator_report_opt, po::value<std::string>()->default_value(off_opt_value),
285
165
            "How to handle the SessionMediator report. [{log,lttng,off}]")
168
            "How to handle the SessionMediator report. [{log,lttng,off}]")
286
166
        (msg_processor_report_opt, po::value<std::string>()->default_value(off_opt_value),
169
        (msg_processor_report_opt, po::value<std::string>()->default_value(off_opt_value),
287
167
170
288
=== modified file 'src/platform/symbols.map'
289
--- src/platform/symbols.map	2016-08-01 09:37:45 +0000
290
+++ src/platform/symbols.map	2016-08-01 21:28:24 +0000
291
@@ -124,6 +124,7 @@
292
124
    mir::options::host_socket_opt*;
124
    mir::options::host_socket_opt*;
293
125
    mir::options::input_report_opt*;
125
    mir::options::input_report_opt*;
294
126
    mir::options::legacy_input_report_opt*;
126
    mir::options::legacy_input_report_opt*;
295
127
    mir::options::seat_report_opt*;
296
127
    mir::options::log_opt_value*;
128
    mir::options::log_opt_value*;
297
128
    mir::options::lttng_opt_value*;
129
    mir::options::lttng_opt_value*;
298
129
    mir::options::msg_processor_report_opt*;
130
    mir::options::msg_processor_report_opt*;
299
130
131
300
=== modified file 'src/server/input/basic_seat.cpp'
301
--- src/server/input/basic_seat.cpp	2016-07-01 20:32:34 +0000
302
+++ src/server/input/basic_seat.cpp	2016-08-01 21:28:24 +0000
303
@@ -31,8 +31,16 @@
304
31
                         std::shared_ptr<mi::CursorListener> const& cursor_listener,
31
                         std::shared_ptr<mi::CursorListener> const& cursor_listener,
305
32
                         std::shared_ptr<mi::InputRegion> const& input_region,
32
                         std::shared_ptr<mi::InputRegion> const& input_region,
306
33
                         std::shared_ptr<mi::KeyMapper> const& key_mapper,
33
                         std::shared_ptr<mi::KeyMapper> const& key_mapper,
309
34
                         std::shared_ptr<time::Clock> const& clock)
34
                         std::shared_ptr<time::Clock> const& clock,
310
35
    : input_state_tracker{dispatcher, touch_visualizer, cursor_listener, input_region, key_mapper, clock}, input_region{input_region}
35
                         std::shared_ptr<mi::SeatReport> const& report) :
311
36
      input_state_tracker{dispatcher,
312
37
                          touch_visualizer,
313
38
                          cursor_listener,
314
39
                          input_region,
315
40
                          key_mapper,
316
41
                          clock,
317
42
                          report},
318
43
      input_region{input_region}
319
36
{
44
{
320
37
}
45
}
321
38
46
322
39
47
323
=== modified file 'src/server/input/basic_seat.h'
324
--- src/server/input/basic_seat.h	2016-07-01 20:32:34 +0000
325
+++ src/server/input/basic_seat.h	2016-08-01 21:28:24 +0000
326
@@ -39,6 +39,7 @@
327
39
class InputRegion;
39
class InputRegion;
328
40
class InputDispatcher;
40
class InputDispatcher;
329
41
class KeyMapper;
41
class KeyMapper;
330
42
class SeatReport;
331
42
43
332
43
class BasicSeat : public Seat
44
class BasicSeat : public Seat
333
44
{
45
{
334
@@ -48,7 +49,8 @@
335
48
              std::shared_ptr<CursorListener> const& cursor_listener,
49
              std::shared_ptr<CursorListener> const& cursor_listener,
336
49
              std::shared_ptr<InputRegion> const& input_region,
50
              std::shared_ptr<InputRegion> const& input_region,
337
50
              std::shared_ptr<KeyMapper> const& key_mapper,
51
              std::shared_ptr<KeyMapper> const& key_mapper,
339
51
              std::shared_ptr<time::Clock> const& clock);
52
              std::shared_ptr<time::Clock> const& clock,
340
53
              std::shared_ptr<SeatReport> const& report);
341
52
    // Seat methods:
54
    // Seat methods:
342
53
    void add_device(Device const& device) override;
55
    void add_device(Device const& device) override;
343
54
    void remove_device(Device const& device) override;
56
    void remove_device(Device const& device) override;
344
55
57
345
=== modified file 'src/server/input/default_configuration.cpp'
346
--- src/server/input/default_configuration.cpp	2016-06-03 08:39:59 +0000
347
+++ src/server/input/default_configuration.cpp	2016-08-01 21:28:24 +0000
348
@@ -333,7 +333,8 @@
349
333
                    the_cursor_listener(),
333
                    the_cursor_listener(),
350
334
                    the_input_region(),
334
                    the_input_region(),
351
335
                    the_key_mapper(),
335
                    the_key_mapper(),
353
336
                    the_clock());
336
                    the_clock(),
354
337
                    the_seat_report());
355
337
        });
338
        });
356
338
}
339
}
357
339
340
358
340
341
359
=== modified file 'src/server/input/seat_input_device_tracker.cpp'
360
--- src/server/input/seat_input_device_tracker.cpp	2016-07-01 20:32:34 +0000
361
+++ src/server/input/seat_input_device_tracker.cpp	2016-08-01 21:28:24 +0000
362
@@ -23,6 +23,7 @@
363
23
#include "mir/input/input_region.h"
23
#include "mir/input/input_region.h"
364
24
#include "mir/input/input_dispatcher.h"
24
#include "mir/input/input_dispatcher.h"
365
25
#include "mir/input/key_mapper.h"
25
#include "mir/input/key_mapper.h"
366
26
#include "mir/input/seat_report.h"
367
26
#include "mir/geometry/displacement.h"
27
#include "mir/geometry/displacement.h"
368
27
#include "mir/events/event_builders.h"
28
#include "mir/events/event_builders.h"
369
28
#include "mir/events/event_private.h"
29
#include "mir/events/event_private.h"
370
@@ -46,16 +47,17 @@
371
46
                                                   std::shared_ptr<CursorListener> const& cursor_listener,
47
                                                   std::shared_ptr<CursorListener> const& cursor_listener,
372
47
                                                   std::shared_ptr<InputRegion> const& input_region,
48
                                                   std::shared_ptr<InputRegion> const& input_region,
373
48
                                                   std::shared_ptr<KeyMapper> const& key_mapper,
49
                                                   std::shared_ptr<KeyMapper> const& key_mapper,
375
49
                                                   std::shared_ptr<time::Clock> const& clock)
50
                                                   std::shared_ptr<time::Clock> const& clock,
376
51
                                                   std::shared_ptr<SeatReport> const& report)
377
50
    : dispatcher{dispatcher}, touch_visualizer{touch_visualizer}, cursor_listener{cursor_listener},
52
    : dispatcher{dispatcher}, touch_visualizer{touch_visualizer}, cursor_listener{cursor_listener},
380
51
      input_region{input_region}, key_mapper{key_mapper}, clock{clock}, buttons{0},
53
      input_region{input_region}, key_mapper{key_mapper}, clock{clock}, report{report}, buttons{0}
379
52
      confine_function{[input_region](mir::geometry::Point& pos) { input_region->confine(pos); }}
381
53
{
54
{
382
54
}
55
}
383
55
56
384
56
void mi::SeatInputDeviceTracker::add_device(MirInputDeviceId id)
57
void mi::SeatInputDeviceTracker::add_device(MirInputDeviceId id)
385
57
{
58
{
386
58
    device_data[id];
59
    device_data[id];
387
60
    report->seat_add_device(id);
388
59
}
61
}
389
60
62
390
61
void mi::SeatInputDeviceTracker::remove_device(MirInputDeviceId id)
63
void mi::SeatInputDeviceTracker::remove_device(MirInputDeviceId id)
391
@@ -75,6 +77,8 @@
392
75
        update_states();
77
        update_states();
393
76
    if (spot_update_needed)
78
    if (spot_update_needed)
394
77
        update_spots();
79
        update_spots();
395
80
396
81
    report->seat_remove_device(id);
397
78
}
82
}
398
79
83
399
80
void mi::SeatInputDeviceTracker::dispatch(MirEvent &event)
84
void mi::SeatInputDeviceTracker::dispatch(MirEvent &event)
400
@@ -99,6 +103,7 @@
401
99
    }
103
    }
402
100
104
403
101
    dispatcher->dispatch(event);
105
    dispatcher->dispatch(event);
404
106
    report->seat_dispatch_event(event);
405
102
}
107
}
406
103
108
407
104
bool mi::SeatInputDeviceTracker::filter_input_event(MirInputEvent const* event)
109
bool mi::SeatInputDeviceTracker::filter_input_event(MirInputEvent const* event)
408
@@ -201,16 +206,23 @@
409
201
206
410
202
void mi::SeatInputDeviceTracker::set_confinement_regions(geometry::Rectangles const& regions)
207
void mi::SeatInputDeviceTracker::set_confinement_regions(geometry::Rectangles const& regions)
411
203
{
208
{
417
204
    confine_function = [regions, this](mir::geometry::Point& pos)
209
    std::lock_guard<std::mutex> lg(region_mutex);
418
205
    {
210
    confined_region = regions;
419
206
        input_region->confine(pos);
211
    report->seat_set_confinement_region_called(regions);
415
207
        regions.confine(pos);
416
208
    };
420
209
}
212
}
421
210
213
422
211
void mi::SeatInputDeviceTracker::reset_confinement_regions()
214
void mi::SeatInputDeviceTracker::reset_confinement_regions()
423
212
{
215
{
425
213
    confine_function = [this](mir::geometry::Point& pos) { input_region->confine(pos); };
216
    std::lock_guard<std::mutex> lg(region_mutex);
426
217
    confined_region.clear();
427
218
    report->seat_reset_confinement_regions();
428
219
}
429
220
430
221
void mi::SeatInputDeviceTracker::confine_function(mir::geometry::Point& p) const
431
222
{
432
223
    std::lock_guard<std::mutex> lg(region_mutex);
433
224
    input_region->confine(p);
434
225
    confined_region.confine(p);
435
214
}
226
}
436
215
227
437
216
void mi::SeatInputDeviceTracker::confine_pointer()
228
void mi::SeatInputDeviceTracker::confine_pointer()
438
@@ -238,8 +250,16 @@
439
238
    devices.reserve(device_data.size());
250
    devices.reserve(device_data.size());
440
239
    for (auto const& item : device_data)
251
    for (auto const& item : device_data)
441
240
        devices.push_back({item.first, item.second.scan_codes, item.second.buttons});
252
        devices.push_back({item.first, item.second.scan_codes, item.second.buttons});
444
241
    return mev::make_event(
253
445
242
        clock->now().time_since_epoch(), buttons, key_mapper->modifiers(), cursor_x, cursor_y, std::move(devices));
254
    auto out_ev = mev::make_event(
446
255
        clock->now().time_since_epoch(),
447
256
        buttons,
448
257
        key_mapper->modifiers(),
449
258
        cursor_x,
450
259
        cursor_y,
451
260
        std::move(devices));
452
261
453
262
    return out_ev;
454
243
}
263
}
455
244
264
456
245
void mi::SeatInputDeviceTracker::DeviceData::update_scan_codes(MirKeyboardEvent const* event)
265
void mi::SeatInputDeviceTracker::DeviceData::update_scan_codes(MirKeyboardEvent const* event)
457
@@ -260,6 +280,8 @@
458
260
280
459
261
    if (device != end(device_data))
281
    if (device != end(device_data))
460
262
        device->second.scan_codes = scan_codes;
282
        device->second.scan_codes = scan_codes;
461
283
462
284
    report->seat_set_key_state(id, scan_codes);
463
263
}
285
}
464
264
286
465
265
void mi::SeatInputDeviceTracker::set_pointer_state(MirInputDeviceId id, MirPointerButtons buttons)
287
void mi::SeatInputDeviceTracker::set_pointer_state(MirInputDeviceId id, MirPointerButtons buttons)
466
@@ -268,12 +290,16 @@
467
268
290
468
269
    if (device != end(device_data))
291
    if (device != end(device_data))
469
270
        device->second.update_button_state(buttons);
292
        device->second.update_button_state(buttons);
470
293
471
294
    report->seat_set_pointer_state(id, buttons);
472
271
}
295
}
473
272
296
474
273
void mi::SeatInputDeviceTracker::set_cursor_position(float x, float y)
297
void mi::SeatInputDeviceTracker::set_cursor_position(float x, float y)
475
274
{
298
{
476
275
    cursor_x = x;
299
    cursor_x = x;
477
276
    cursor_y = y;
300
    cursor_y = y;
478
301
479
302
    report->seat_set_cursor_position(x, y);
480
277
}
303
}
481
278
304
482
279
bool mi::SeatInputDeviceTracker::DeviceData::allowed_scan_code_action(MirKeyboardEvent const* event) const
305
bool mi::SeatInputDeviceTracker::DeviceData::allowed_scan_code_action(MirKeyboardEvent const* event) const
483
280
306
484
=== modified file 'src/server/input/seat_input_device_tracker.h'
485
--- src/server/input/seat_input_device_tracker.h	2016-07-01 20:32:34 +0000
486
+++ src/server/input/seat_input_device_tracker.h	2016-08-01 21:28:24 +0000
487
@@ -26,6 +26,7 @@
488
26
#include "mir_toolkit/event.h"
26
#include "mir_toolkit/event.h"
489
27
#include <unordered_map>
27
#include <unordered_map>
490
28
#include <memory>
28
#include <memory>
491
29
#include <mutex>
492
29
30
493
30
namespace mir
31
namespace mir
494
31
{
32
{
495
@@ -40,6 +41,7 @@
496
40
class InputRegion;
41
class InputRegion;
497
41
class InputDispatcher;
42
class InputDispatcher;
498
42
class KeyMapper;
43
class KeyMapper;
499
44
class SeatReport;
500
43
45
501
44
/*
46
/*
502
45
 * The SeatInputDeviceTracker bundles the input device properties of a group of devices defined by a seat:
47
 * The SeatInputDeviceTracker bundles the input device properties of a group of devices defined by a seat:
503
@@ -56,7 +58,8 @@
504
56
                           std::shared_ptr<CursorListener> const& cursor_listener,
58
                           std::shared_ptr<CursorListener> const& cursor_listener,
505
57
                           std::shared_ptr<InputRegion> const& input_region,
59
                           std::shared_ptr<InputRegion> const& input_region,
506
58
                           std::shared_ptr<KeyMapper> const& key_mapper,
60
                           std::shared_ptr<KeyMapper> const& key_mapper,
508
59
                           std::shared_ptr<time::Clock> const& clock);
61
                           std::shared_ptr<time::Clock> const& clock,
509
62
                           std::shared_ptr<SeatReport> const& report);
510
60
    void add_device(MirInputDeviceId);
63
    void add_device(MirInputDeviceId);
511
61
    void remove_device(MirInputDeviceId);
64
    void remove_device(MirInputDeviceId);
512
62
65
513
@@ -77,6 +80,7 @@
514
77
    void update_spots();
80
    void update_spots();
515
78
    void update_states();
81
    void update_states();
516
79
    bool filter_input_event(MirInputEvent const* event);
82
    bool filter_input_event(MirInputEvent const* event);
517
83
    void confine_function(mir::geometry::Point& p) const;
518
80
    void confine_pointer();
84
    void confine_pointer();
519
81
85
520
82
    std::shared_ptr<InputDispatcher> const dispatcher;
86
    std::shared_ptr<InputDispatcher> const dispatcher;
521
@@ -85,6 +89,7 @@
522
85
    std::shared_ptr<InputRegion> const input_region;
89
    std::shared_ptr<InputRegion> const input_region;
523
86
    std::shared_ptr<KeyMapper> const key_mapper;
90
    std::shared_ptr<KeyMapper> const key_mapper;
524
87
    std::shared_ptr<time::Clock> const clock;
91
    std::shared_ptr<time::Clock> const clock;
525
92
    std::shared_ptr<SeatReport> const report;
526
88
93
527
89
    struct DeviceData
94
    struct DeviceData
528
90
    {
95
    {
529
@@ -106,7 +111,9 @@
530
106
    MirPointerButtons buttons;
111
    MirPointerButtons buttons;
531
107
    std::unordered_map<MirInputDeviceId, DeviceData> device_data;
112
    std::unordered_map<MirInputDeviceId, DeviceData> device_data;
532
108
    std::vector<TouchVisualizer::Spot> spots;
113
    std::vector<TouchVisualizer::Spot> spots;
534
109
    std::function<void(mir::geometry::Point&)> confine_function;
114
    mir::geometry::Rectangles confined_region;
535
115
536
116
    std::mutex mutable region_mutex;
537
110
};
117
};
538
111
118
539
112
}
119
}
540
113
120
541
=== modified file 'src/server/report/default_server_configuration.cpp'
542
--- src/server/report/default_server_configuration.cpp	2016-01-29 08:18:22 +0000
543
+++ src/server/report/default_server_configuration.cpp	2016-08-01 21:28:24 +0000
544
@@ -118,6 +118,15 @@
545
118
        });
118
        });
546
119
}
119
}
547
120
120
548
121
auto mir::DefaultServerConfiguration::the_seat_report() -> std::shared_ptr<mi::SeatReport>
549
122
{
550
123
    return seat_report(
551
124
        [this]()->std::shared_ptr<mi::SeatReport>
552
125
        {
553
126
            return report_factory(options::seat_report_opt)->create_seat_report();
554
127
        });
555
128
}
556
129
557
121
auto mir::DefaultServerConfiguration::the_scene_report() -> std::shared_ptr<ms::SceneReport>
130
auto mir::DefaultServerConfiguration::the_scene_report() -> std::shared_ptr<ms::SceneReport>
558
122
{
131
{
559
123
    return scene_report(
132
    return scene_report(
560
124
133
561
=== modified file 'src/server/report/logging/CMakeLists.txt'
562
--- src/server/report/logging/CMakeLists.txt	2016-01-29 08:18:22 +0000
563
+++ src/server/report/logging/CMakeLists.txt	2016-08-01 21:28:24 +0000
564
@@ -10,6 +10,7 @@
565
10
  input_report.cpp
10
  input_report.cpp
566
11
  compositor_report.cpp
11
  compositor_report.cpp
567
12
  scene_report.cpp
12
  scene_report.cpp
568
13
  seat_report.cpp
569
13
  shell_report.cpp
14
  shell_report.cpp
570
14
  shell_report.h
15
  shell_report.h
571
15
  logging_report_factory.cpp
16
  logging_report_factory.cpp
572
16
17
573
=== modified file 'src/server/report/logging/logging_report_factory.cpp'
574
--- src/server/report/logging/logging_report_factory.cpp	2016-01-29 08:18:22 +0000
575
+++ src/server/report/logging/logging_report_factory.cpp	2016-08-01 21:28:24 +0000
576
@@ -26,6 +26,7 @@
577
26
#include "session_mediator_report.h"
26
#include "session_mediator_report.h"
578
27
#include "shell_report.h"
27
#include "shell_report.h"
579
28
#include "input_report.h"
28
#include "input_report.h"
580
29
#include "seat_report.h"
581
29
#include "mir/logging/shared_library_prober_report.h"
30
#include "mir/logging/shared_library_prober_report.h"
582
30
31
583
31
#include "mir/default_server_configuration.h"
32
#include "mir/default_server_configuration.h"
584
@@ -74,6 +75,11 @@
585
74
    return std::make_shared<logging::InputReport>(logger);
75
    return std::make_shared<logging::InputReport>(logger);
586
75
}
76
}
587
76
77
588
78
std::shared_ptr<mir::input::SeatReport> mr::LoggingReportFactory::create_seat_report()
589
79
{
590
80
    return std::make_shared<logging::SeatReport>(logger);
591
81
}
592
82
593
77
std::shared_ptr<mir::SharedLibraryProberReport> mr::LoggingReportFactory::create_shared_library_prober_report()
83
std::shared_ptr<mir::SharedLibraryProberReport> mr::LoggingReportFactory::create_shared_library_prober_report()
594
78
{
84
{
595
79
    return std::make_shared<mir::logging::SharedLibraryProberReport>(logger);
85
    return std::make_shared<mir::logging::SharedLibraryProberReport>(logger);
596
80
86
597
=== added file 'src/server/report/logging/seat_report.cpp'
598
--- src/server/report/logging/seat_report.cpp	1970-01-01 00:00:00 +0000
599
+++ src/server/report/logging/seat_report.cpp	2016-08-01 21:28:24 +0000
600
@@ -0,0 +1,146 @@
601
1
/*
602
2
 * Copyright © 2016 Canonical Ltd.
603
3
 *
604
4
 * This program is free software: you can redistribute it and/or modify it
605
5
 * under the terms of the GNU General Public License version 3,
606
6
 * as published by the Free Software Foundation.
607
7
 *
608
8
 * This program is distributed in the hope that it will be useful,
609
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
610
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
611
11
 * GNU General Public License for more details.
612
12
 *
613
13
 * You should have received a copy of the GNU General Public License
614
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
615
15
 *
616
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
617
17
 */
618
18
619
19
#include <sstream>
620
20
621
21
#include "seat_report.h"
622
22
#include "mir/events/event.h"
623
23
#include "mir/geometry/rectangles.h"
624
24
#include "mir/logging/logger.h"
625
25
#include "mir/input/device.h"
626
26
627
27
namespace mi   = mir::input;
628
28
namespace ml   = mir::logging;
629
29
namespace mrl  = mir::report::logging;
630
30
namespace geom = mir::geometry;
631
31
632
32
namespace
633
33
{
634
34
char const* const component = "input::Seat";
635
35
636
36
std::string scan_codes_to_string(std::vector<uint32_t> const& scan_codes)
637
37
{
638
38
    std::stringstream ss;
639
39
    ss << "{";
640
40
641
41
    for (auto const& s : scan_codes)
642
42
    {
643
43
        ss << s << ", ";
644
44
    }
645
45
646
46
    auto str = ss.str();
647
47
648
48
    // Remove the extra , and space
649
49
    str.pop_back();
650
50
    str.pop_back();
651
51
652
52
    return str + "}";
653
53
}
654
54
655
55
}
656
56
657
57
mrl::SeatReport::SeatReport(std::shared_ptr<ml::Logger> const& log) :
658
58
    log(log)
659
59
{
660
60
}
661
61
662
62
void mrl::SeatReport::seat_add_device(uint64_t id)
663
63
{
664
64
    std::stringstream ss;
665
65
    ss << "Add device"
666
66
       << " device_id=" << id;
667
67
668
68
    log->log(ml::Severity::informational, ss.str(), component);
669
69
}
670
70
671
71
void mrl::SeatReport::seat_remove_device(uint64_t id)
672
72
{
673
73
    std::stringstream ss;
674
74
    ss << "Remove device"
675
75
       << " device_id=" << id;
676
76
677
77
    log->log(ml::Severity::informational, ss.str(), component);
678
78
}
679
79
680
80
void mrl::SeatReport::seat_dispatch_event(MirEvent const& event)
681
81
{
682
82
    std::stringstream ss;
683
83
    ss << "Dispatch event"
684
84
       << " event_type=" << event.type();
685
85
686
86
    log->log(ml::Severity::informational, ss.str(), component);
687
87
}
688
88
689
89
void mrl::SeatReport::seat_get_rectangle_for(uint64_t id, geometry::Rectangle const& out_rect)
690
90
{
691
91
    std::stringstream ss;
692
92
    ss << "Get rectangle for"
693
93
       << " device_id=" << id
694
94
       << " out_rect=" << out_rect;
695
95
696
96
    log->log(ml::Severity::informational, ss.str(), component);
697
97
}
698
98
699
99
void mrl::SeatReport::seat_set_key_state(uint64_t id, std::vector<uint32_t> const& scan_codes)
700
100
{
701
101
    std::stringstream ss;
702
102
    ss << "Set key state"
703
103
       << " device_id="  << id
704
104
       << " scan_codes=" << scan_codes_to_string(scan_codes);
705
105
706
106
    log->log(ml::Severity::informational, ss.str(), component);
707
107
}
708
108
709
109
void mrl::SeatReport::seat_set_pointer_state(uint64_t id, unsigned buttons)
710
110
{
711
111
    std::stringstream ss;
712
112
    ss << "Set pointer state"
713
113
       << " devie_id=" << id
714
114
       << " buttons="  << buttons;
715
115
716
116
    log->log(ml::Severity::informational, ss.str(), component);
717
117
}
718
118
719
119
void mrl::SeatReport::seat_set_cursor_position(float cursor_x, float cursor_y)
720
120
{
721
121
    std::stringstream ss;
722
122
    ss << "Set cursor position"
723
123
       << " cursor_x=" << cursor_x
724
124
       << " cursor_y=" << cursor_y;
725
125
726
126
    log->log(ml::Severity::informational, ss.str(), component);
727
127
}
728
128
729
129
void mrl::SeatReport::seat_set_confinement_region_called(geom::Rectangles const& regions)
730
130
{
731
131
    std::stringstream ss;
732
132
733
133
    auto bound_rect = regions.bounding_rectangle();
734
134
    ss << "Set confinement region"
735
135
       << " regions=" << bound_rect;
736
136
737
137
    log->log(ml::Severity::informational, ss.str(), component);
738
138
}
739
139
740
140
void mrl::SeatReport::seat_reset_confinement_regions()
741
141
{
742
142
    std::stringstream ss;
743
143
    ss << "Reset confinement regions";
744
144
745
145
    log->log(ml::Severity::informational, ss.str(), component);
746
146
}
747
0
147
748
=== added file 'src/server/report/logging/seat_report.h'
749
--- src/server/report/logging/seat_report.h	1970-01-01 00:00:00 +0000
750
+++ src/server/report/logging/seat_report.h	2016-08-01 21:28:24 +0000
751
@@ -0,0 +1,67 @@
752
1
/*
753
2
 * Copyright © 2016 Canonical Ltd.
754
3
 *
755
4
 * This program is free software: you can redistribute it and/or modify it
756
5
 * under the terms of the GNU General Public License version 3,
757
6
 * as published by the Free Software Foundation.
758
7
 *
759
8
 * This program is distributed in the hope that it will be useful,
760
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
761
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
762
11
 * GNU General Public License for more details.
763
12
 *
764
13
 * You should have received a copy of the GNU General Public License
765
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
766
15
 *
767
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
768
17
 */
769
18
770
19
#ifndef MIR_REPORT_LOGGING_SEAT_REPORT_H_
771
20
#define MIR_REPORT_LOGGING_SEAT_REPORT_H_
772
21
773
22
#include <mir/input/seat_report.h>
774
23
775
24
#include <memory>
776
25
777
26
class MirEvent;
778
27
779
28
namespace mir
780
29
{
781
30
namespace logging
782
31
{
783
32
class Logger;
784
33
}
785
34
namespace geometry
786
35
{
787
36
class Rectangles;
788
37
class Rectangle;
789
38
}
790
39
namespace report
791
40
{
792
41
namespace logging
793
42
{
794
43
795
44
class SeatReport : public input::SeatReport
796
45
{
797
46
public:
798
47
    SeatReport(std::shared_ptr<mir::logging::Logger> const& log);
799
48
800
49
    virtual void seat_add_device(uint64_t id) override;
801
50
    virtual void seat_remove_device(uint64_t id) override;
802
51
    virtual void seat_dispatch_event(MirEvent const& event) override;
803
52
    virtual void seat_get_rectangle_for(uint64_t id, geometry::Rectangle const& out_rect) override;
804
53
    virtual void seat_set_key_state(uint64_t id, std::vector<uint32_t> const& scan_codes) override;
805
54
    virtual void seat_set_pointer_state(uint64_t id, unsigned buttons) override;
806
55
    virtual void seat_set_cursor_position(float cursor_x, float cursor_y) override;
807
56
    virtual void seat_set_confinement_region_called(geometry::Rectangles const& regions) override;
808
57
    virtual void seat_reset_confinement_regions() override;
809
58
810
59
private:
811
60
    std::shared_ptr<mir::logging::Logger> const log;
812
61
};
813
62
814
63
}
815
64
}
816
65
}
817
66
818
67
#endif /* MIR_REPORT_LOGGING_SEAT_REPORT_H_ */
819
0
68
820
=== modified file 'src/server/report/logging_report_factory.h'
821
--- src/server/report/logging_report_factory.h	2016-01-29 08:18:22 +0000
822
+++ src/server/report/logging_report_factory.h	2016-08-01 21:28:24 +0000
823
@@ -47,6 +47,7 @@
824
47
    std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
47
    std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
825
48
    std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
48
    std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
826
49
    std::shared_ptr<input::InputReport> create_input_report() override;
49
    std::shared_ptr<input::InputReport> create_input_report() override;
827
50
    std::shared_ptr<input::SeatReport> create_seat_report() override;
828
50
    std::shared_ptr<mir::SharedLibraryProberReport> create_shared_library_prober_report() override;
51
    std::shared_ptr<mir::SharedLibraryProberReport> create_shared_library_prober_report() override;
829
51
    std::shared_ptr<shell::ShellReport> create_shell_report() override;
52
    std::shared_ptr<shell::ShellReport> create_shell_report() override;
830
52
53
831
53
54
832
=== modified file 'src/server/report/lttng/lttng_report_factory.cpp'
833
--- src/server/report/lttng/lttng_report_factory.cpp	2016-01-29 08:18:22 +0000
834
+++ src/server/report/lttng/lttng_report_factory.cpp	2016-08-01 21:28:24 +0000
835
@@ -62,6 +62,11 @@
836
62
    return std::make_shared<lttng::InputReport>();
62
    return std::make_shared<lttng::InputReport>();
837
63
}
63
}
838
64
64
839
65
std::shared_ptr<mir::input::SeatReport> mir::report::LttngReportFactory::create_seat_report()
840
66
{
841
67
    BOOST_THROW_EXCEPTION(std::logic_error("Not implemented"));
842
68
}
843
69
844
65
std::shared_ptr<mir::SharedLibraryProberReport> mir::report::LttngReportFactory::create_shared_library_prober_report()
70
std::shared_ptr<mir::SharedLibraryProberReport> mir::report::LttngReportFactory::create_shared_library_prober_report()
845
66
{
71
{
846
67
    return std::make_shared<lttng::SharedLibraryProberReport>();
72
    return std::make_shared<lttng::SharedLibraryProberReport>();
847
68
73
848
=== modified file 'src/server/report/lttng_report_factory.h'
849
--- src/server/report/lttng_report_factory.h	2016-01-29 08:18:22 +0000
850
+++ src/server/report/lttng_report_factory.h	2016-08-01 21:28:24 +0000
851
@@ -35,6 +35,7 @@
852
35
    std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
35
    std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
853
36
    std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
36
    std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
854
37
    std::shared_ptr<input::InputReport> create_input_report() override;
37
    std::shared_ptr<input::InputReport> create_input_report() override;
855
38
    std::shared_ptr<input::SeatReport> create_seat_report() override;
856
38
    std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override;
39
    std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override;
857
39
    std::shared_ptr<shell::ShellReport> create_shell_report() override;
40
    std::shared_ptr<shell::ShellReport> create_shell_report() override;
858
40
};
41
};
859
41
42
860
=== modified file 'src/server/report/null/CMakeLists.txt'
861
--- src/server/report/null/CMakeLists.txt	2016-01-29 08:18:22 +0000
862
+++ src/server/report/null/CMakeLists.txt	2016-08-01 21:28:24 +0000
863
@@ -8,6 +8,7 @@
864
8
    message_processor_report.cpp
8
    message_processor_report.cpp
865
9
    null_report_factory.cpp
9
    null_report_factory.cpp
866
10
    scene_report.cpp
10
    scene_report.cpp
867
11
    seat_report.cpp
868
11
    session_mediator_report.cpp
12
    session_mediator_report.cpp
869
12
    shell_report.cpp
13
    shell_report.cpp
870
13
    shell_report.h
14
    shell_report.h
871
14
15
872
=== modified file 'src/server/report/null/null_report_factory.cpp'
873
--- src/server/report/null/null_report_factory.cpp	2016-01-29 08:18:22 +0000
874
+++ src/server/report/null/null_report_factory.cpp	2016-08-01 21:28:24 +0000
875
@@ -24,6 +24,7 @@
876
24
#include "session_mediator_report.h"
24
#include "session_mediator_report.h"
877
25
#include "display_report.h"
25
#include "display_report.h"
878
26
#include "input_report.h"
26
#include "input_report.h"
879
27
#include "seat_report.h"
880
27
#include "shell_report.h"
28
#include "shell_report.h"
881
28
#include "scene_report.h"
29
#include "scene_report.h"
882
29
#include "mir/logging/null_shared_library_prober_report.h"
30
#include "mir/logging/null_shared_library_prober_report.h"
883
@@ -63,6 +64,11 @@
884
63
    return std::make_shared<null::InputReport>();
64
    return std::make_shared<null::InputReport>();
885
64
}
65
}
886
65
66
887
67
std::shared_ptr<mir::input::SeatReport> mir::report::NullReportFactory::create_seat_report()
888
68
{
889
69
    return std::make_shared<null::SeatReport>();
890
70
}
891
71
892
66
std::shared_ptr<mir::SharedLibraryProberReport> mir::report::NullReportFactory::create_shared_library_prober_report()
72
std::shared_ptr<mir::SharedLibraryProberReport> mir::report::NullReportFactory::create_shared_library_prober_report()
893
67
{
73
{
894
68
    return std::make_shared<logging::NullSharedLibraryProberReport>();
74
    return std::make_shared<logging::NullSharedLibraryProberReport>();
895
@@ -107,3 +113,8 @@
896
107
{
113
{
897
108
    return NullReportFactory{}.create_input_report();
114
    return NullReportFactory{}.create_input_report();
898
109
}
115
}
899
116
900
117
std::shared_ptr<mir::input::SeatReport> mir::report::null_seat_report()
901
118
{
902
119
    return NullReportFactory{}.create_seat_report();
903
120
}
904
110
121
905
=== added file 'src/server/report/null/seat_report.cpp'
906
--- src/server/report/null/seat_report.cpp	1970-01-01 00:00:00 +0000
907
+++ src/server/report/null/seat_report.cpp	2016-08-01 21:28:24 +0000
908
@@ -0,0 +1,58 @@
909
1
/*
910
2
 * Copyright © 2016 Canonical Ltd.
911
3
 *
912
4
 * This program is free software: you can redistribute it and/or modify it
913
5
 * under the terms of the GNU General Public License version 3,
914
6
 * as published by the Free Software Foundation.
915
7
 *
916
8
 * This program is distributed in the hope that it will be useful,
917
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
918
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
919
11
 * GNU General Public License for more details.
920
12
 *
921
13
 * You should have received a copy of the GNU General Public License
922
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
923
15
 *
924
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
925
17
 */
926
18
927
19
#include "seat_report.h"
928
20
929
21
namespace mrn  = mir::report::null;
930
22
namespace geom = mir::geometry;
931
23
932
24
void mrn::SeatReport::seat_add_device(uint64_t /*id*/)
933
25
{
934
26
}
935
27
936
28
void mrn::SeatReport::seat_remove_device(uint64_t /*id*/)
937
29
{
938
30
}
939
31
940
32
void mrn::SeatReport::seat_dispatch_event(MirEvent const& /*event*/)
941
33
{
942
34
}
943
35
944
36
void mrn::SeatReport::seat_get_rectangle_for(uint64_t /*id*/, geometry::Rectangle const& /*out_rect*/)
945
37
{
946
38
}
947
39
948
40
void mrn::SeatReport::seat_set_key_state(uint64_t /*id*/, std::vector<uint32_t> const& /*scan_codes*/)
949
41
{
950
42
}
951
43
952
44
void mrn::SeatReport::seat_set_pointer_state(uint64_t /*id*/, unsigned /*buttons*/)
953
45
{
954
46
}
955
47
956
48
void mrn::SeatReport::seat_set_cursor_position(float /*cursor_x*/, float /*cursor_y*/)
957
49
{
958
50
}
959
51
960
52
void mrn::SeatReport::seat_set_confinement_region_called(geom::Rectangles const& /*regions*/)
961
53
{
962
54
}
963
55
964
56
void mrn::SeatReport::seat_reset_confinement_regions()
965
57
{
966
58
}
967
0
59
968
=== added file 'src/server/report/null/seat_report.h'
969
--- src/server/report/null/seat_report.h	1970-01-01 00:00:00 +0000
970
+++ src/server/report/null/seat_report.h	2016-08-01 21:28:24 +0000
971
@@ -0,0 +1,50 @@
972
1
/*
973
2
 * Copyright © 2016 Canonical Ltd.
974
3
 *
975
4
 * This program is free software: you can redistribute it and/or modify it
976
5
 * under the terms of the GNU General Public License version 3,
977
6
 * as published by the Free Software Foundation.
978
7
 *
979
8
 * This program is distributed in the hope that it will be useful,
980
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
981
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
982
11
 * GNU General Public License for more details.
983
12
 *
984
13
 * You should have received a copy of the GNU General Public License
985
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
986
15
 *
987
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
988
17
 */
989
18
990
19
991
20
#ifndef MIR_REPORT_NULL_SEAT_REPORT_H_
992
21
#define MIR_REPORT_NULL_SEAT_REPORT_H_
993
22
994
23
#include "mir/input/seat_report.h"
995
24
996
25
namespace mir
997
26
{
998
27
namespace report
999
28
{
1000
29
namespace null
1001
30
{
1002
31
1003
32
class SeatReport : public input::SeatReport
1004
33
{
1005
34
public:
1006
35
    virtual void seat_add_device(uint64_t id) override;
1007
36
    virtual void seat_remove_device(uint64_t id) override;
1008
37
    virtual void seat_dispatch_event(MirEvent const& event) override;
1009
38
    virtual void seat_get_rectangle_for(uint64_t id, geometry::Rectangle const& out_rect) override;
1010
39
    virtual void seat_set_key_state(uint64_t id, std::vector<uint32_t> const& scan_codes) override;
1011
40
    virtual void seat_set_pointer_state(uint64_t id, unsigned buttons) override;
1012
41
    virtual void seat_set_cursor_position(float cursor_x, float cursor_y) override;
1013
42
    virtual void seat_set_confinement_region_called(geometry::Rectangles const& regions) override;
1014
43
    virtual void seat_reset_confinement_regions() override;
1015
44
};
1016
45
1017
46
}
1018
47
}
1019
48
}
1020
49
1021
50
#endif /* MIR_REPORT_NULL_SEAT_REPORT_H_ */
1022
0
51
1023
=== modified file 'src/server/report/null_report_factory.h'
1024
--- src/server/report/null_report_factory.h	2016-01-29 08:18:22 +0000
1025
+++ src/server/report/null_report_factory.h	2016-08-01 21:28:24 +0000
1026
@@ -35,6 +35,7 @@
1027
35
    std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
35
    std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
1028
36
    std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
36
    std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
1029
37
    std::shared_ptr<input::InputReport> create_input_report() override;
37
    std::shared_ptr<input::InputReport> create_input_report() override;
1030
38
    std::shared_ptr<input::SeatReport> create_seat_report() override;
1031
38
    std::shared_ptr<mir::SharedLibraryProberReport> create_shared_library_prober_report() override;
39
    std::shared_ptr<mir::SharedLibraryProberReport> create_shared_library_prober_report() override;
1032
39
    std::shared_ptr<shell::ShellReport> create_shell_report() override;
40
    std::shared_ptr<shell::ShellReport> create_shell_report() override;
1033
40
};
41
};
1034
@@ -46,6 +47,7 @@
1035
46
std::shared_ptr<frontend::SessionMediatorReport> null_session_mediator_report();
47
std::shared_ptr<frontend::SessionMediatorReport> null_session_mediator_report();
1036
47
std::shared_ptr<frontend::MessageProcessorReport> null_message_processor_report();
48
std::shared_ptr<frontend::MessageProcessorReport> null_message_processor_report();
1037
48
std::shared_ptr<input::InputReport> null_input_report();
49
std::shared_ptr<input::InputReport> null_input_report();
1038
50
std::shared_ptr<input::SeatReport> null_seat_report();
1039
49
std::shared_ptr<mir::SharedLibraryProberReport> null_shared_library_prober_report();
51
std::shared_ptr<mir::SharedLibraryProberReport> null_shared_library_prober_report();
1040
50
52
1041
51
}
53
}
1042
52
54
1043
=== modified file 'src/server/report/report_factory.h'
1044
--- src/server/report/report_factory.h	2016-01-29 08:18:22 +0000
1045
+++ src/server/report/report_factory.h	2016-08-01 21:28:24 +0000
1046
@@ -41,6 +41,7 @@
1047
41
namespace input
41
namespace input
1048
42
{
42
{
1049
43
class InputReport;
43
class InputReport;
1050
44
class SeatReport;
1051
44
}
45
}
1052
45
namespace scene
46
namespace scene
1053
46
{
47
{
1054
@@ -61,6 +62,7 @@
1055
61
    virtual std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() = 0;
62
    virtual std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() = 0;
1056
62
    virtual std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() = 0;
63
    virtual std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() = 0;
1057
63
    virtual std::shared_ptr<input::InputReport> create_input_report() = 0;
64
    virtual std::shared_ptr<input::InputReport> create_input_report() = 0;
1058
65
    virtual std::shared_ptr<input::SeatReport> create_seat_report() = 0;
1059
64
    virtual std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() = 0;
66
    virtual std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() = 0;
1060
65
    virtual std::shared_ptr<shell::ShellReport> create_shell_report() = 0;
67
    virtual std::shared_ptr<shell::ShellReport> create_shell_report() = 0;
1061
66
68
1062
67
69
1063
=== modified file 'src/server/scene/basic_surface.cpp'
1064
--- src/server/scene/basic_surface.cpp	2016-07-26 03:56:14 +0000
1065
+++ src/server/scene/basic_surface.cpp	2016-08-01 21:28:24 +0000
1066
@@ -131,12 +131,6 @@
1067
131
        { observer->cursor_image_removed(); });
131
        { observer->cursor_image_removed(); });
1068
132
}
132
}
1069
133
133
1070
134
void ms::SurfaceObservers::confinement_region_updated(geom::Rectangle const& rect)
1071
135
{
1072
136
    for_each([rect](std::shared_ptr<SurfaceObserver> const& observer)
1073
137
        { observer->confinement_region_updated(rect); });
1074
138
}
1075
139
1076
140
struct ms::CursorStreamImageAdapter
134
struct ms::CursorStreamImageAdapter
1077
141
{
135
{
1078
142
    CursorStreamImageAdapter(ms::BasicSurface &surface)
136
    CursorStreamImageAdapter(ms::BasicSurface &surface)
1079
@@ -288,11 +282,6 @@
1080
288
        surface_rect.top_left = top_left;
282
        surface_rect.top_left = top_left;
1081
289
    }
283
    }
1082
290
    observers.moved_to(top_left);
284
    observers.moved_to(top_left);
1083
291
1084
292
    if (confine_pointer_state_ == mir_pointer_confined_to_surface)
1085
293
    {
1086
294
        observers.confinement_region_updated(surface_rect);
1087
295
    }
1088
296
}
285
}
1089
297
286
1090
298
float ms::BasicSurface::alpha() const
287
float ms::BasicSurface::alpha() const
1091
@@ -375,11 +364,6 @@
1092
375
        surface_rect.size = new_size;
364
        surface_rect.size = new_size;
1093
376
    }
365
    }
1094
377
    observers.resized_to(new_size);
366
    observers.resized_to(new_size);
1095
378
1096
379
    if (confine_pointer_state_ == mir_pointer_confined_to_surface)
1097
380
    {
1098
381
        observers.confinement_region_updated(surface_rect);
1099
382
    }
1100
383
}
367
}
1101
384
368
1102
385
geom::Point ms::BasicSurface::top_left() const
369
geom::Point ms::BasicSurface::top_left() const
1103
@@ -911,11 +895,6 @@
1104
911
            });
895
            });
1105
912
    }
896
    }
1106
913
    observers.moved_to(surface_rect.top_left);
897
    observers.moved_to(surface_rect.top_left);
1107
914
1108
915
    if (confine_pointer_state_ == mir_pointer_confined_to_surface)
1109
916
    {
1110
917
        observers.confinement_region_updated(surface_rect);
1111
918
    }
1112
919
}
898
}
1113
920
899
1114
921
mg::RenderableList ms::BasicSurface::generate_renderables(mc::CompositorID id) const
900
mg::RenderableList ms::BasicSurface::generate_renderables(mc::CompositorID id) const
1115
922
901
1116
=== modified file 'src/server/scene/legacy_surface_change_notification.cpp'
1117
--- src/server/scene/legacy_surface_change_notification.cpp	2016-07-26 03:56:14 +0000
1118
+++ src/server/scene/legacy_surface_change_notification.cpp	2016-08-01 21:28:24 +0000
1119
@@ -100,7 +100,3 @@
1120
100
{
100
{
1121
101
    notify_scene_change();
101
    notify_scene_change();
1122
102
}
102
}
1123
103
1124
104
void ms::LegacySurfaceChangeNotification::confinement_region_updated(geometry::Rectangle const&)
1125
105
{
1126
106
}
1127
107
103
1128
=== modified file 'src/server/scene/legacy_surface_change_notification.h'
1129
--- src/server/scene/legacy_surface_change_notification.h	2016-07-26 03:56:14 +0000
1130
+++ src/server/scene/legacy_surface_change_notification.h	2016-08-01 21:28:24 +0000
1131
@@ -49,7 +49,6 @@
1132
49
                        std::string const& variant, std::string const& options) override;
49
                        std::string const& variant, std::string const& options) override;
1133
50
    void renamed(char const*) override;
50
    void renamed(char const*) override;
1134
51
    void cursor_image_removed() override;
51
    void cursor_image_removed() override;
1135
52
    void confinement_region_updated(geometry::Rectangle const& rect) override;
1136
53
52
1137
54
private:
53
private:
1138
55
    std::function<void()> const notify_scene_change;
54
    std::function<void()> const notify_scene_change;
1139
56
55
1140
=== modified file 'src/server/scene/null_surface_observer.cpp'
1141
--- src/server/scene/null_surface_observer.cpp	2016-07-26 03:56:14 +0000
1142
+++ src/server/scene/null_surface_observer.cpp	2016-08-01 21:28:24 +0000
1143
@@ -39,4 +39,3 @@
1144
39
}
39
}
1145
40
void ms::NullSurfaceObserver::renamed(char const*) {}
40
void ms::NullSurfaceObserver::renamed(char const*) {}
1146
41
void ms::NullSurfaceObserver::cursor_image_removed() {}
41
void ms::NullSurfaceObserver::cursor_image_removed() {}
1147
42
void ms::NullSurfaceObserver::confinement_region_updated(geometry::Rectangle const& /*rect*/) {}
1148
43
42
1149
=== modified file 'src/server/server.cpp'
1150
--- src/server/server.cpp	2016-07-20 04:54:07 +0000
1151
+++ src/server/server.cpp	2016-08-01 21:28:24 +0000
1152
@@ -99,6 +99,7 @@
1153
99
    MACRO(session_authorizer)\
99
    MACRO(session_authorizer)\
1154
100
    MACRO(session_listener)\
100
    MACRO(session_listener)\
1155
101
    MACRO(session_mediator_report)\
101
    MACRO(session_mediator_report)\
1156
102
    MACRO(seat_report)\
1157
102
    MACRO(shell)\
103
    MACRO(shell)\
1158
103
    MACRO(application_not_responding_detector)\
104
    MACRO(application_not_responding_detector)\
1159
104
    MACRO(cookie_authority)\
105
    MACRO(cookie_authority)\
1160
105
106
1161
=== modified file 'src/server/shell/abstract_shell.cpp'
1162
--- src/server/shell/abstract_shell.cpp	2016-08-01 07:44:10 +0000
1163
+++ src/server/shell/abstract_shell.cpp	2016-08-01 21:28:24 +0000
1164
@@ -41,17 +41,28 @@
1165
41
41
1166
42
struct UpdateConfinementOnSurfaceChanges : ms::NullSurfaceObserver
42
struct UpdateConfinementOnSurfaceChanges : ms::NullSurfaceObserver
1167
43
{
43
{
1179
44
    UpdateConfinementOnSurfaceChanges(std::shared_ptr<mi::Seat> seat) :
44
    UpdateConfinementOnSurfaceChanges(msh::AbstractShell* shell) :
1180
45
        seat(seat)
45
        shell(shell)
1181
46
    {
46
    {
1182
47
    }
47
    }
1183
48
48
1184
49
    void confinement_region_updated(geom::Rectangle const& rect)
49
    void resized_to(geom::Size const& /*size*/) override
1185
50
    {
50
    {
1186
51
        seat->set_confinement_regions({rect});
51
        update_confinement_region();
1187
52
    }
52
    }
1188
53
53
1189
54
    std::shared_ptr<mi::Seat> seat;
54
    void moved_to(geom::Point const& /*top_left*/) override
1190
55
    {
1191
56
        update_confinement_region();
1192
57
    }
1193
58
1194
59
private:
1195
60
    void update_confinement_region()
1196
61
    {
1197
62
        shell->update_focused_surface_confined_region();
1198
63
    }
1199
64
1200
65
    msh::AbstractShell* shell;
1201
55
};
66
};
1202
56
}
67
}
1203
57
68
1204
@@ -70,7 +81,7 @@
1205
70
    window_manager(wm_builder(this)),
81
    window_manager(wm_builder(this)),
1206
71
    seat(seat),
82
    seat(seat),
1207
72
    report(report),
83
    report(report),
1209
73
    focus_surface_observer(std::make_shared<UpdateConfinementOnSurfaceChanges>(seat))
84
    focus_surface_observer(std::make_shared<UpdateConfinementOnSurfaceChanges>(this))
1210
74
{
85
{
1211
75
}
86
}
1212
76
87
1213
@@ -78,6 +89,16 @@
1214
78
{
89
{
1215
79
}
90
}
1216
80
91
1217
92
void msh::AbstractShell::update_focused_surface_confined_region()
1218
93
{
1219
94
    auto const current_focus = focus_surface.lock();
1220
95
1221
96
    if (current_focus && current_focus->confine_pointer_state() == mir_pointer_confined_to_surface)
1222
97
    {
1223
98
        seat->set_confinement_regions({current_focus->input_bounds()});
1224
99
    }
1225
100
}
1226
101
1227
81
std::shared_ptr<ms::Session> msh::AbstractShell::open_session(
102
std::shared_ptr<ms::Session> msh::AbstractShell::open_session(
1228
82
    pid_t client_pid,
103
    pid_t client_pid,
1229
83
    std::string const& name,
104
    std::string const& name,
1230
@@ -357,3 +378,4 @@
1231
357
    surface_stack->raise(surfaces);
378
    surface_stack->raise(surfaces);
1232
358
    report->surfaces_raised(surfaces);
379
    report->surfaces_raised(surfaces);
1233
359
}
380
}
1234
381
1235
360
382
1236
=== modified file 'src/server/symbols.map'
1237
--- src/server/symbols.map	2016-07-28 03:39:52 +0000
1238
+++ src/server/symbols.map	2016-08-01 21:28:24 +0000
1239
@@ -839,6 +839,6 @@
1240
839
MIR_SERVER_0.25 {
839
MIR_SERVER_0.25 {
1241
840
 global:
840
 global:
1242
841
  extern "C++" {
841
  extern "C++" {
1244
842
    mir::scene::NullSurfaceObserver::confinement_region_updated*;
842
    mir::Server::override_the_seat_report*;
1245
843
  };
843
  };
1246
844
} MIR_SERVER_0.24;
844
} MIR_SERVER_0.24;
1247
845
845
1248
=== modified file 'tests/acceptance-tests/test_confined_pointer.cpp'
1249
--- tests/acceptance-tests/test_confined_pointer.cpp	2016-07-26 03:56:14 +0000
1250
+++ tests/acceptance-tests/test_confined_pointer.cpp	2016-08-01 21:28:24 +0000
1251
@@ -16,15 +16,19 @@
1252
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
1253
17
 */
17
 */
1254
18
18
1255
19
#include "mir/scene/null_surface_observer.h"
1256
20
#include "mir/input/input_device_info.h"
1257
21
#include "mir/geometry/rectangles.h"
1258
22
1259
19
#include "mir/test/event_matchers.h"
23
#include "mir/test/event_matchers.h"
1261
20
#include "mir/input/input_device_info.h"
24
#include "mir/test/fake_shared.h"
1262
25
#include "mir/test/signal.h"
1263
26
#include "mir/test/doubles/mock_seat_report.h"
1264
21
#include "mir_test_framework/fake_input_device.h"
27
#include "mir_test_framework/fake_input_device.h"
1265
28
#include "mir_test_framework/headless_in_process_server.h"
1266
29
#include "mir_test_framework/placement_applying_shell.h"
1267
22
#include "mir_test_framework/stub_server_platform_factory.h"
30
#include "mir_test_framework/stub_server_platform_factory.h"
1268
23
31
1269
24
#include "mir/test/signal.h"
1270
25
#include "mir_test_framework/placement_applying_shell.h"
1271
26
#include "mir_test_framework/headless_in_process_server.h"
1272
27
1273
28
#include "mir_toolkit/mir_client_library.h"
32
#include "mir_toolkit/mir_client_library.h"
1274
29
33
1275
30
#include <gtest/gtest.h>
34
#include <gtest/gtest.h>
1276
@@ -32,19 +36,26 @@
1277
32
36
1278
33
#include <boost/throw_exception.hpp>
37
#include <boost/throw_exception.hpp>
1279
34
38
1281
35
39
namespace mtd = mir::test::doubles;
1282
36
namespace mt = mir::test;
40
namespace mt = mir::test;
1283
37
namespace mi = mir::input;
41
namespace mi = mir::input;
1284
42
namespace ms = mir::scene;
1285
38
namespace mis = mir::input::synthesis;
43
namespace mis = mir::input::synthesis;
1286
39
namespace mtf = mir_test_framework;
44
namespace mtf = mir_test_framework;
1287
40
namespace geom = mir::geometry;
45
namespace geom = mir::geometry;
1288
41
46
1289
42
using namespace std::chrono_literals;
47
using namespace std::chrono_literals;
1290
48
using namespace testing;
1291
43
49
1292
44
namespace
50
namespace
1293
45
{
51
{
1294
46
int const surface_width  = 100;
52
int const surface_width  = 100;
1295
47
int const surface_height = 100;
53
int const surface_height = 100;
1296
54
1297
55
struct MockSurfaceObserver : public ms::NullSurfaceObserver
1298
56
{
1299
57
    MOCK_METHOD1(resized_to, void(geom::Size const&));
1300
58
};
1301
48
}
59
}
1302
49
60
1303
50
void null_event_handler(MirSurface*, MirEvent const*, void*)
61
void null_event_handler(MirSurface*, MirEvent const*, void*)
1304
@@ -96,12 +107,6 @@
1305
96
107
1306
97
        mir_surface_apply_spec(surface, spec);
108
        mir_surface_apply_spec(surface, spec);
1307
98
        mir_surface_spec_release(spec);
109
        mir_surface_spec_release(spec);
1308
99
1309
100
        received_resize.wait_for(1s);
1310
101
        if (!received_resize.raised())
1311
102
        {
1312
103
            BOOST_THROW_EXCEPTION(std::runtime_error("Timeout waiting for surface to become resized"));
1313
104
        }
1314
105
    }
110
    }
1315
106
111
1316
107
    void handle_surface_event(MirSurfaceEvent const* event)
112
    void handle_surface_event(MirSurfaceEvent const* event)
1317
@@ -133,9 +138,6 @@
1318
133
        case mir_event_type_input:
138
        case mir_event_type_input:
1319
134
            client->handle_input(ev);
139
            client->handle_input(ev);
1320
135
            break;
140
            break;
1321
136
        case mir_event_type_resize:
1322
137
            client->received_resize.raise();
1323
138
            break;
1324
139
        default:
141
        default:
1325
140
            break;
142
            break;
1326
141
        }
143
        }
1327
@@ -154,7 +156,6 @@
1328
154
    MirConnection* connection;
156
    MirConnection* connection;
1329
155
    mir::test::Signal ready_to_accept_events;
157
    mir::test::Signal ready_to_accept_events;
1330
156
    mir::test::Signal all_events_received;
158
    mir::test::Signal all_events_received;
1331
157
    mir::test::Signal received_resize;
1332
158
    bool exposed = false;
159
    bool exposed = false;
1333
159
    bool focused = false;
160
    bool focused = false;
1334
160
};
161
};
1335
@@ -168,21 +169,40 @@
1336
168
        server.wrap_shell(
169
        server.wrap_shell(
1337
169
            [this](std::shared_ptr<mir::shell::Shell> const& wrapped)
170
            [this](std::shared_ptr<mir::shell::Shell> const& wrapped)
1338
170
            {
171
            {
1339
171
                //return wrapped;
1340
172
                shell = std::make_shared<mtf::PlacementApplyingShell>(wrapped, input_regions, positions);
172
                shell = std::make_shared<mtf::PlacementApplyingShell>(wrapped, input_regions, positions);
1341
173
                return shell;
173
                return shell;
1342
174
            });
174
            });
1343
175
175
1344
176
        server.override_the_seat_report([this]
1345
177
            {
1346
178
                mock_seat_report = std::make_shared<NiceMock<mtd::MockSeatReport>>();
1347
179
                return mock_seat_report;
1348
180
            });
1349
181
1350
176
        HeadlessInProcessServer::SetUp();
182
        HeadlessInProcessServer::SetUp();
1351
177
183
1352
178
        positions[first] = geom::Rectangle{{0,0}, {surface_width, surface_height}};
184
        positions[first] = geom::Rectangle{{0,0}, {surface_width, surface_height}};
1353
179
    }
185
    }
1354
180
186
1355
187
    std::shared_ptr<ms::Surface> latest_shell_surface() const
1356
188
    {
1357
189
        auto const result = shell->latest_surface.lock();
1358
190
//      ASSERT_THAT(result, NotNull()); //<= doesn't compile!?
1359
191
        EXPECT_THAT(result, NotNull());
1360
192
        return result;
1361
193
    }
1362
194
1363
195
    void change_observed() { resized_signaled.raise(); }
1364
196
1365
181
    std::string const mouse_name = "mouse";
197
    std::string const mouse_name = "mouse";
1366
182
    std::string const mouse_unique_id = "mouse-uid";
198
    std::string const mouse_unique_id = "mouse-uid";
1367
183
    std::unique_ptr<mtf::FakeInputDevice> fake_mouse{
199
    std::unique_ptr<mtf::FakeInputDevice> fake_mouse{
1368
184
        mtf::add_fake_input_device(mi::InputDeviceInfo{mouse_name, mouse_unique_id, mi::DeviceCapability::pointer})};
200
        mtf::add_fake_input_device(mi::InputDeviceInfo{mouse_name, mouse_unique_id, mi::DeviceCapability::pointer})};
1369
185
201
1370
202
    NiceMock<MockSurfaceObserver> surface_observer;
1371
203
    mir::test::Signal resized_signaled;
1372
204
1373
205
    std::shared_ptr<mtd::MockSeatReport> mock_seat_report;
1374
186
    std::shared_ptr<mtf::PlacementApplyingShell> shell;
206
    std::shared_ptr<mtf::PlacementApplyingShell> shell;
1375
187
    geom::Rectangle screen_geometry{{0,0}, {800,600}};
207
    geom::Rectangle screen_geometry{{0,0}, {800,600}};
1376
188
    mtf::ClientInputRegions input_regions;
208
    mtf::ClientInputRegions input_regions;
1377
@@ -193,8 +213,6 @@
1378
193
213
1379
194
TEST_F(PointerConfinement, test_we_hit_pointer_confined_boundary)
214
TEST_F(PointerConfinement, test_we_hit_pointer_confined_boundary)
1380
195
{
215
{
1381
196
    using namespace ::testing;
1382
197
1383
198
    positions[first] = geom::Rectangle{{0,0}, {surface_width, surface_height}};
216
    positions[first] = geom::Rectangle{{0,0}, {surface_width, surface_height}};
1384
199
    Client client(new_connection(), first);
217
    Client client(new_connection(), first);
1385
200
218
1386
@@ -216,8 +234,6 @@
1387
216
234
1388
217
TEST_F(PointerConfinement, test_we_generate_relative_after_boundary)
235
TEST_F(PointerConfinement, test_we_generate_relative_after_boundary)
1389
218
{
236
{
1390
219
    using namespace ::testing;
1391
220
1392
221
    positions[first] = geom::Rectangle{{0,0}, {surface_width, surface_height}};
237
    positions[first] = geom::Rectangle{{0,0}, {surface_width, surface_height}};
1393
222
    Client client(new_connection(), first);
238
    Client client(new_connection(), first);
1394
223
239
1395
@@ -235,12 +251,20 @@
1396
235
251
1397
236
TEST_F(PointerConfinement, test_we_update_our_confined_region_on_a_resize)
252
TEST_F(PointerConfinement, test_we_update_our_confined_region_on_a_resize)
1398
237
{
253
{
1399
238
    using namespace ::testing;
1400
239
1401
240
    positions[first] = geom::Rectangle{{0,0}, {surface_width, surface_height}};
254
    positions[first] = geom::Rectangle{{0,0}, {surface_width, surface_height}};
1402
241
    Client client(new_connection(), first);
255
    Client client(new_connection(), first);
1403
242
256
1404
257
    auto fake = mt::fake_shared(surface_observer);
1405
258
    latest_shell_surface()->add_observer(fake);
1406
259
1407
260
    geom::Size new_size = {surface_width + 100, surface_height};
1408
261
    EXPECT_CALL(surface_observer, resized_to(new_size)).Times(1);
1409
262
1410
263
    EXPECT_CALL(*mock_seat_report, seat_set_confinement_region_called(_)).
1411
264
            WillRepeatedly(InvokeWithoutArgs([&] { change_observed(); }));
1412
265
1413
243
    client.resize(surface_width + 100, surface_height);
266
    client.resize(surface_width + 100, surface_height);
1414
267
    resized_signaled.wait_for(1s);
1415
244
268
1416
245
    InSequence seq;
269
    InSequence seq;
1417
246
    EXPECT_CALL(client, handle_input(mt::PointerEnterEvent()));
270
    EXPECT_CALL(client, handle_input(mt::PointerEnterEvent()));
1418
247
271
1419
=== modified file 'tests/integration-tests/input/test_single_seat_setup.cpp'
1420
--- tests/integration-tests/input/test_single_seat_setup.cpp	2016-07-07 09:59:19 +0000
1421
+++ tests/integration-tests/input/test_single_seat_setup.cpp	2016-08-01 21:28:24 +0000
1422
@@ -26,6 +26,7 @@
1423
26
#include "mir/test/doubles/mock_touch_visualizer.h"
26
#include "mir/test/doubles/mock_touch_visualizer.h"
1424
27
#include "mir/test/doubles/mock_cursor_listener.h"
27
#include "mir/test/doubles/mock_cursor_listener.h"
1425
28
#include "mir/test/doubles/mock_event_sink.h"
28
#include "mir/test/doubles/mock_event_sink.h"
1426
29
#include "mir/test/doubles/mock_seat_report.h"
1427
29
#include "mir/test/doubles/triggered_main_loop.h"
30
#include "mir/test/doubles/triggered_main_loop.h"
1428
30
#include "mir/test/event_matchers.h"
31
#include "mir/test/event_matchers.h"
1429
31
#include "mir/test/doubles/advanceable_clock.h"
32
#include "mir/test/doubles/advanceable_clock.h"
1430
@@ -80,12 +81,13 @@
1431
80
    std::shared_ptr<mir::cookie::Authority> cookie_authority = mir::cookie::Authority::create();
81
    std::shared_ptr<mir::cookie::Authority> cookie_authority = mir::cookie::Authority::create();
1432
81
    NiceMock<mtd::MockCursorListener> mock_cursor_listener;
82
    NiceMock<mtd::MockCursorListener> mock_cursor_listener;
1433
82
    NiceMock<mtd::MockTouchVisualizer> mock_visualizer;
83
    NiceMock<mtd::MockTouchVisualizer> mock_visualizer;
1434
84
    NiceMock<mtd::MockSeatReport> mock_seat_report;
1435
83
    mi::receiver::XKBMapper key_mapper;
85
    mi::receiver::XKBMapper key_mapper;
1436
84
    mir::dispatch::MultiplexingDispatchable multiplexer;
86
    mir::dispatch::MultiplexingDispatchable multiplexer;
1437
85
    mtd::AdvanceableClock clock;
87
    mtd::AdvanceableClock clock;
1438
86
    mi::BasicSeat seat{
88
    mi::BasicSeat seat{
1439
87
        mt::fake_shared(mock_dispatcher),mt::fake_shared(mock_visualizer), mt::fake_shared(mock_cursor_listener),
89
        mt::fake_shared(mock_dispatcher),mt::fake_shared(mock_visualizer), mt::fake_shared(mock_cursor_listener),
1441
88
        mt::fake_shared(mock_region), mt::fake_shared(key_mapper), mt::fake_shared(clock)};
90
        mt::fake_shared(mock_region), mt::fake_shared(key_mapper), mt::fake_shared(clock), mt::fake_shared(mock_seat_report)};
1442
89
    mi::DefaultInputDeviceHub hub{
91
    mi::DefaultInputDeviceHub hub{
1443
90
        mt::fake_shared(mock_sink), mt::fake_shared(seat), mt::fake_shared(multiplexer), mt::fake_shared(observer_loop),
92
        mt::fake_shared(mock_sink), mt::fake_shared(seat), mt::fake_shared(multiplexer), mt::fake_shared(observer_loop),
1444
91
        cookie_authority, mt::fake_shared(key_mapper)};
93
        cookie_authority, mt::fake_shared(key_mapper)};
1445
92
94
1446
=== modified file 'tests/mir_test_framework/placement_applying_shell.cpp'
1447
--- tests/mir_test_framework/placement_applying_shell.cpp	2016-05-03 06:55:25 +0000
1448
+++ tests/mir_test_framework/placement_applying_shell.cpp	2016-08-01 21:28:24 +0000
1449
@@ -41,6 +41,7 @@
1450
41
41
1451
42
    auto const id = wrapped->create_surface(session, creation_parameters, sink);
42
    auto const id = wrapped->create_surface(session, creation_parameters, sink);
1452
43
    auto const surface = session->surface(id);
43
    auto const surface = session->surface(id);
1453
44
    latest_surface = surface;
1454
44
45
1455
45
    auto position= client_positions.find(params.name);
46
    auto position= client_positions.find(params.name);
1456
46
    if (position != client_positions.end())
47
    if (position != client_positions.end())
1457
47
48
1458
=== modified file 'tests/unit-tests/input/test_seat_input_device_tracker.cpp'
1459
--- tests/unit-tests/input/test_seat_input_device_tracker.cpp	2016-07-01 20:32:34 +0000
1460
+++ tests/unit-tests/input/test_seat_input_device_tracker.cpp	2016-08-01 21:28:24 +0000
1461
@@ -26,6 +26,7 @@
1462
26
#include "mir/test/doubles/mock_cursor_listener.h"
26
#include "mir/test/doubles/mock_cursor_listener.h"
1463
27
#include "mir/test/doubles/mock_touch_visualizer.h"
27
#include "mir/test/doubles/mock_touch_visualizer.h"
1464
28
#include "mir/test/doubles/mock_input_seat.h"
28
#include "mir/test/doubles/mock_input_seat.h"
1465
29
#include "mir/test/doubles/mock_seat_report.h"
1466
29
#include "mir/test/doubles/advanceable_clock.h"
30
#include "mir/test/doubles/advanceable_clock.h"
1467
30
#include "mir/test/event_matchers.h"
31
#include "mir/test/event_matchers.h"
1468
31
#include "mir/test/fake_shared.h"
32
#include "mir/test/fake_shared.h"
1469
@@ -56,6 +57,7 @@
1470
56
    Nice<mtd::MockCursorListener> mock_cursor_listener;
57
    Nice<mtd::MockCursorListener> mock_cursor_listener;
1471
57
    Nice<mtd::MockTouchVisualizer> mock_visualizer;
58
    Nice<mtd::MockTouchVisualizer> mock_visualizer;
1472
58
    Nice<mtd::MockInputSeat> mock_seat;
59
    Nice<mtd::MockInputSeat> mock_seat;
1473
60
    Nice<mtd::MockSeatReport> mock_seat_report;
1474
59
    MirInputDeviceId some_device{8712};
61
    MirInputDeviceId some_device{8712};
1475
60
    MirInputDeviceId another_device{1246};
62
    MirInputDeviceId another_device{1246};
1476
61
    MirInputDeviceId third_device{86};
63
    MirInputDeviceId third_device{86};
1477
@@ -68,7 +70,8 @@
1478
68
    mi::receiver::XKBMapper mapper;
70
    mi::receiver::XKBMapper mapper;
1479
69
    mi::SeatInputDeviceTracker tracker{
71
    mi::SeatInputDeviceTracker tracker{
1480
70
        mt::fake_shared(mock_dispatcher), mt::fake_shared(mock_visualizer), mt::fake_shared(mock_cursor_listener),
72
        mt::fake_shared(mock_dispatcher), mt::fake_shared(mock_visualizer), mt::fake_shared(mock_cursor_listener),
1482
71
        mt::fake_shared(mock_region),     mt::fake_shared(mapper),          mt::fake_shared(clock)};
73
        mt::fake_shared(mock_region),     mt::fake_shared(mapper),          mt::fake_shared(clock),
1483
74
        mt::fake_shared(mock_seat_report)};
1484
72
75
1485
73
    std::chrono::nanoseconds arbitrary_timestamp;
76
    std::chrono::nanoseconds arbitrary_timestamp;
1486
74
};
77
};
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-08-02
Alan Griffiths		2016-07-26	Approve on 2016-08-02
Andreas Pokorny (community)			Approve on 2016-08-01
Review via email: mp+301231@code.launchpad.net