1
=== modified file 'include/server/mir/compositor/scene.h'
2
--- include/server/mir/compositor/scene.h	2015-02-22 07:46:25 +0000
3
+++ include/server/mir/compositor/scene.h	2016-08-24 02:15:46 +0000
4
@@ -50,7 +50,7 @@
5
50
     *                     a new (different) sequence to that user each time. For
50
     *                     a new (different) sequence to that user each time. For
6
51
     *                     consistency, all callers need to determine their id
51
     *                     consistency, all callers need to determine their id
7
52
     *                     in the same way (e.g. always use "this" pointer).
52
     *                     in the same way (e.g. always use "this" pointer).
9
53
     * \returns a sequence of mc::SceneElements for the compositor id. The
53
     * \returns a sequence of SceneElements for the compositor id. The
10
54
     *          sequence is in stacking order from back to front.
54
     *          sequence is in stacking order from back to front.
11
55
     */
55
     */
12
56
    virtual SceneElementSequence scene_elements_for(CompositorID id) = 0;
56
    virtual SceneElementSequence scene_elements_for(CompositorID id) = 0;
13
57
57
14
=== modified file 'include/server/mir/scene/surface.h'
15
--- include/server/mir/scene/surface.h	2016-06-27 20:44:49 +0000
16
+++ include/server/mir/scene/surface.h	2016-08-24 02:15:46 +0000
17
@@ -84,7 +84,7 @@
18
84
     * By default the input region is the whole surface. To unset a custom input region
84
     * By default the input region is the whole surface. To unset a custom input region
19
85
     * and revert to the default set an empty input region, i.e., set_input_region({}).
85
     * and revert to the default set an empty input region, i.e., set_input_region({}).
20
86
     * To disable input set a non-empty region containing an empty rectangle, i.e.,
86
     * To disable input set a non-empty region containing an empty rectangle, i.e.,
22
87
     * set_input_region({geom::Rectangle{}}).
87
     * set_input_region({Rectangle{}}).
23
88
     */
88
     */
24
89
    virtual void set_input_region(std::vector<geometry::Rectangle> const& region) = 0;
89
    virtual void set_input_region(std::vector<geometry::Rectangle> const& region) = 0;
25
90
    virtual void resize(geometry::Size const& size) = 0;
90
    virtual void resize(geometry::Size const& size) = 0;
26
91
91
27
=== modified file 'include/test/mir/test/doubles/mock_display_configuration.h'
28
--- include/test/mir/test/doubles/mock_display_configuration.h	2015-10-30 11:07:02 +0000
29
+++ include/test/mir/test/doubles/mock_display_configuration.h	2016-08-24 02:15:46 +0000
30
@@ -32,19 +32,19 @@
31
32
{
32
{
32
33
    MOCK_CONST_METHOD1(
33
    MOCK_CONST_METHOD1(
33
34
        for_each_card,
34
        for_each_card,
35
35
        void(std::function<void(mg::DisplayConfigurationCard const&)>));
35
        void(std::function<void(graphics::DisplayConfigurationCard const&)>));
36
36
36
37
37
    MOCK_CONST_METHOD1(
37
    MOCK_CONST_METHOD1(
38
38
        for_each_output,
38
        for_each_output,
40
39
        void(std::function<void(mg::DisplayConfigurationOutput const&)>));
39
        void(std::function<void(graphics::DisplayConfigurationOutput const&)>));
41
40
40
42
41
    MOCK_METHOD1(
41
    MOCK_METHOD1(
43
42
        for_each_output,
42
        for_each_output,
45
43
        void(std::function<void(mg::UserDisplayConfigurationOutput&)>));
43
        void(std::function<void(graphics::UserDisplayConfigurationOutput&)>));
46
44
44
47
45
    MOCK_CONST_METHOD0(valid, bool());
45
    MOCK_CONST_METHOD0(valid, bool());
48
46
46
50
47
    std::unique_ptr<mg::DisplayConfiguration> clone() const
47
    std::unique_ptr<graphics::DisplayConfiguration> clone() const
51
48
    {
48
    {
52
49
        throw std::runtime_error("MockDisplayConfiguration::clone is not implemented");
49
        throw std::runtime_error("MockDisplayConfiguration::clone is not implemented");
53
50
    }
50
    }
54
51
51
55
=== modified file 'include/test/mir_test_framework/fake_input_device.h'
56
--- include/test/mir_test_framework/fake_input_device.h	2016-05-03 06:55:25 +0000
57
+++ include/test/mir_test_framework/fake_input_device.h	2016-08-24 02:15:46 +0000
58
@@ -24,7 +24,6 @@
59
24
24
60
25
namespace mir_test_framework
25
namespace mir_test_framework
61
26
{
26
{
62
27
namespace synthesis = mir::input::synthesis;
63
28
27
64
29
class FakeInputDevice
28
class FakeInputDevice
65
30
{
29
{
66
@@ -44,10 +43,10 @@
67
44
43
68
45
    virtual void emit_device_removal() = 0;
44
    virtual void emit_device_removal() = 0;
69
46
    virtual void emit_runtime_error() = 0;
45
    virtual void emit_runtime_error() = 0;
74
47
    virtual void emit_event(synthesis::KeyParameters const& key) = 0;
46
    virtual void emit_event(mir::input::synthesis::KeyParameters const& key) = 0;
75
48
    virtual void emit_event(synthesis::ButtonParameters const& button) = 0;
47
    virtual void emit_event(mir::input::synthesis::ButtonParameters const& button) = 0;
76
49
    virtual void emit_event(synthesis::MotionParameters const& motion) = 0;
48
    virtual void emit_event(mir::input::synthesis::MotionParameters const& motion) = 0;
77
50
    virtual void emit_event(synthesis::TouchParameters const& touch) = 0;
49
    virtual void emit_event(mir::input::synthesis::TouchParameters const& touch) = 0;
78
51
50
79
52
    FakeInputDevice(FakeInputDevice const&) = delete;
51
    FakeInputDevice(FakeInputDevice const&) = delete;
80
53
    FakeInputDevice& operator=(FakeInputDevice const&) = delete;
52
    FakeInputDevice& operator=(FakeInputDevice const&) = delete;
81
54
53
82
=== modified file 'include/test/mir_test_framework/stub_server_platform_factory.h'
83
--- include/test/mir_test_framework/stub_server_platform_factory.h	2016-01-29 08:18:22 +0000
84
+++ include/test/mir_test_framework/stub_server_platform_factory.h	2016-08-24 02:15:46 +0000
85
@@ -27,29 +27,21 @@
86
27
#include <memory>
27
#include <memory>
87
28
#include <string>
28
#include <string>
88
29
29
89
30
namespace geom = mir::geometry;
90
31
91
32
namespace mir
30
namespace mir
92
33
{
31
{
93
34
namespace graphics
94
35
{
95
36
class Platform;
96
37
}
97
38
namespace input
32
namespace input
98
39
{
33
{
99
40
class InputDeviceInfo;
34
class InputDeviceInfo;
100
41
}
35
}
101
42
}
36
}
102
43
37
103
44
namespace mg = mir::graphics;
104
45
105
46
namespace mir_test_framework
38
namespace mir_test_framework
106
47
{
39
{
107
48
class FakeInputDevice;
40
class FakeInputDevice;
108
49
41
110
50
std::shared_ptr<mg::Platform> make_stubbed_server_graphics_platform(std::vector<geom::Rectangle> const& display_rects);
42
std::shared_ptr<mir::graphics::Platform> make_stubbed_server_graphics_platform(std::vector<mir::geometry::Rectangle> const& display_rects);
111
51
43
113
52
void set_next_display_rects(std::unique_ptr<std::vector<geom::Rectangle>>&& display_rects);
44
void set_next_display_rects(std::unique_ptr<std::vector<mir::geometry::Rectangle>>&& display_rects);
114
53
45
115
54
void set_next_preset_display(std::shared_ptr<mir::graphics::Display> const& display);
46
void set_next_preset_display(std::shared_ptr<mir::graphics::Display> const& display);
116
55
47
117
56
48
118
=== modified file 'tests/acceptance-tests/test_nested_input.cpp'
119
--- tests/acceptance-tests/test_nested_input.cpp	2016-07-20 04:54:07 +0000
120
+++ tests/acceptance-tests/test_nested_input.cpp	2016-08-24 02:15:46 +0000
121
@@ -67,7 +67,7 @@
122
67
    }
67
    }
123
68
};
68
};
124
69
69
126
70
std::vector<geom::Rectangle> const display_geometry
70
std::vector<mir::geometry::Rectangle> const display_geometry
127
71
{
71
{
128
72
    {{  0, 0}, { 640,  480}},
72
    {{  0, 0}, { 640,  480}},
129
73
    {{480, 0}, {1920, 1080}}
73
    {{480, 0}, {1920, 1080}}
130
74
74
131
=== modified file 'tests/mir_test_framework/fake_input_device_impl.cpp'
132
--- tests/mir_test_framework/fake_input_device_impl.cpp	2016-05-03 06:55:25 +0000
133
+++ tests/mir_test_framework/fake_input_device_impl.cpp	2016-08-24 02:15:46 +0000
134
@@ -39,6 +39,7 @@
135
39
namespace mie = mi::evdev;
39
namespace mie = mi::evdev;
136
40
namespace md = mir::dispatch;
40
namespace md = mir::dispatch;
137
41
namespace mtf = mir_test_framework;
41
namespace mtf = mir_test_framework;
138
42
namespace synthesis = mir::input::synthesis;
139
42
43
140
43
mtf::FakeInputDeviceImpl::FakeInputDeviceImpl(mi::InputDeviceInfo const& info)
44
mtf::FakeInputDeviceImpl::FakeInputDeviceImpl(mi::InputDeviceInfo const& info)
141
44
    : queue{std::make_shared<md::ActionQueue>()}, device{std::make_shared<InputDevice>(info, queue)}
45
    : queue{std::make_shared<md::ActionQueue>()}, device{std::make_shared<InputDevice>(info, queue)}
142
45
46
143
=== modified file 'tests/mir_test_framework/fake_input_device_impl.h'
144
--- tests/mir_test_framework/fake_input_device_impl.h	2016-05-03 06:55:25 +0000
145
+++ tests/mir_test_framework/fake_input_device_impl.h	2016-08-24 02:15:46 +0000
146
@@ -42,10 +42,10 @@
147
42
    FakeInputDeviceImpl(mir::input::InputDeviceInfo const& info);
42
    FakeInputDeviceImpl(mir::input::InputDeviceInfo const& info);
148
43
    void emit_device_removal() override;
43
    void emit_device_removal() override;
149
44
    void emit_runtime_error() override;
44
    void emit_runtime_error() override;
154
45
    void emit_event(synthesis::KeyParameters const& key_params) override;
45
    void emit_event(mir::input::synthesis::KeyParameters const& key_params) override;
155
46
    void emit_event(synthesis::ButtonParameters const& button) override;
46
    void emit_event(mir::input::synthesis::ButtonParameters const& button) override;
156
47
    void emit_event(synthesis::MotionParameters const& motion) override;
47
    void emit_event(mir::input::synthesis::MotionParameters const& motion) override;
157
48
    void emit_event(synthesis::TouchParameters const& touch) override;
48
    void emit_event(mir::input::synthesis::TouchParameters const& touch) override;
158
49
49
159
50
private:
50
private:
160
51
    class InputDevice : public mir::input::InputDevice
51
    class InputDevice : public mir::input::InputDevice
161
@@ -57,10 +57,10 @@
162
57
        void start(mir::input::InputSink* destination, mir::input::EventBuilder* builder) override;
57
        void start(mir::input::InputSink* destination, mir::input::EventBuilder* builder) override;
163
58
        void stop() override;
58
        void stop() override;
164
59
59
169
60
        void synthesize_events(synthesis::KeyParameters const& key_params);
60
        void synthesize_events(mir::input::synthesis::KeyParameters const& key_params);
170
61
        void synthesize_events(synthesis::ButtonParameters const& button);
61
        void synthesize_events(mir::input::synthesis::ButtonParameters const& button);
171
62
        void synthesize_events(synthesis::MotionParameters const& motion);
62
        void synthesize_events(mir::input::synthesis::MotionParameters const& motion);
172
63
        void synthesize_events(synthesis::TouchParameters const& touch);
63
        void synthesize_events(mir::input::synthesis::TouchParameters const& touch);
173
64
        mir::input::InputDeviceInfo get_device_info() override
64
        mir::input::InputDeviceInfo get_device_info() override
174
65
        {
65
        {
175
66
            return info;
66
            return info;
176
@@ -72,7 +72,7 @@
177
72
        void apply_settings(mir::input::TouchpadSettings const& settings) override;
72
        void apply_settings(mir::input::TouchpadSettings const& settings) override;
178
73
73
179
74
    private:
74
    private:
181
75
        MirPointerAction update_buttons(synthesis::EventAction action, MirPointerButton button);
75
        MirPointerAction update_buttons(mir::input::synthesis::EventAction action, MirPointerButton button);
182
76
        void update_position(int rel_x, int rel_y);
76
        void update_position(int rel_x, int rel_y);
183
77
        void map_touch_coordinates(float& x, float& y);
77
        void map_touch_coordinates(float& x, float& y);
184
78
78
Reviewer	Review Type	Date Requested	Status
Kevin DuBois (community)			Approve on 2016-08-24
Mir CI Bot	continuous-integration		Needs Fixing on 2016-08-24
Chris Halse Rogers			Approve on 2016-08-23
Alan Griffiths		2016-08-22	Approve on 2016-08-22
Review via email: mp+303507@code.launchpad.net