1
=== modified file 'debian/control'
2
--- debian/control	2014-09-10 12:50:53 +0000
3
+++ debian/control	2014-09-18 16:04:44 +0000
4
@@ -60,7 +60,7 @@
5
60
 .
60
 .
6
61
 Contains the shared library needed by server applications for Mir.
61
 Contains the shared library needed by server applications for Mir.
7
62
62
9
63
Package: libmirplatform2
63
Package: libmirplatform3
10
64
Section: libs
64
Section: libs
11
65
Architecture: i386 amd64 armhf arm64
65
Architecture: i386 amd64 armhf arm64
12
66
Multi-Arch: same
66
Multi-Arch: same
13
@@ -123,7 +123,7 @@
14
123
Architecture: i386 amd64 armhf arm64
123
Architecture: i386 amd64 armhf arm64
15
124
Multi-Arch: same
124
Multi-Arch: same
16
125
Pre-Depends: ${misc:Pre-Depends}
125
Pre-Depends: ${misc:Pre-Depends}
18
126
Depends: libmirplatform2 (= ${binary:Version}), 
126
Depends: libmirplatform3 (= ${binary:Version}), 
19
127
         libmircommon-dev,
127
         libmircommon-dev,
20
128
         libboost-program-options-dev,
128
         libboost-program-options-dev,
21
129
         ${misc:Depends},
129
         ${misc:Depends},
22
130
130
23
=== renamed file 'debian/libmirplatform2.install' => 'debian/libmirplatform3.install'
24
--- debian/libmirplatform2.install	2014-09-10 12:50:53 +0000
25
+++ debian/libmirplatform3.install	2014-09-18 16:04:44 +0000
26
@@ -1,1 +1,1 @@
28
1
usr/lib/*/libmirplatform.so.2
1
usr/lib/*/libmirplatform.so.3
29
2
2
30
=== modified file 'include/platform/mir/graphics/platform.h'
31
--- include/platform/mir/graphics/platform.h	2014-09-11 19:07:15 +0000
32
+++ include/platform/mir/graphics/platform.h	2014-09-18 16:04:44 +0000
33
@@ -53,6 +53,7 @@
34
53
class GraphicBufferAllocator;
53
class GraphicBufferAllocator;
35
54
class GLConfig;
54
class GLConfig;
36
55
class GLProgramFactory;
55
class GLProgramFactory;
37
56
class BufferWriter;
38
56
57
39
57
enum class BufferIpcMsgType
58
enum class BufferIpcMsgType
40
58
{
59
{
41
@@ -86,6 +87,8 @@
42
86
87
43
87
    virtual std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
88
    virtual std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
44
88
        std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
89
        std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
45
90
    
46
91
    virtual std::shared_ptr<BufferWriter> make_buffer_writer() = 0;
47
89
92
48
90
    /**
93
    /**
49
91
     * Creates the display subsystem.
94
     * Creates the display subsystem.
50
92
95
51
=== modified file 'include/platform/mir/options/configuration.h'
52
--- include/platform/mir/options/configuration.h	2014-09-10 12:50:53 +0000
53
+++ include/platform/mir/options/configuration.h	2014-09-18 16:04:44 +0000
54
@@ -41,6 +41,7 @@
55
41
extern char const* const input_report_opt;
41
extern char const* const input_report_opt;
56
42
extern char const* const host_socket_opt;
42
extern char const* const host_socket_opt;
57
43
extern char const* const frontend_threads_opt;
43
extern char const* const frontend_threads_opt;
58
44
extern char const* const touchspots_opt;
59
44
extern char const* const fatal_abort_opt;
45
extern char const* const fatal_abort_opt;
60
45
46
61
46
extern char const* const name_opt;
47
extern char const* const name_opt;
62
47
48
63
=== modified file 'include/server/mir/default_server_configuration.h'
64
--- include/server/mir/default_server_configuration.h	2014-09-10 12:50:53 +0000
65
+++ include/server/mir/default_server_configuration.h	2014-09-18 16:04:44 +0000
66
@@ -105,6 +105,7 @@
67
105
class BufferInitializer;
105
class BufferInitializer;
68
106
class DisplayReport;
106
class DisplayReport;
69
107
class GraphicBufferAllocator;
107
class GraphicBufferAllocator;
70
108
class BufferWriter;
71
108
class Cursor;
109
class Cursor;
72
109
class CursorImage;
110
class CursorImage;
73
110
class GLConfig;
111
class GLConfig;
74
@@ -114,7 +115,7 @@
75
114
namespace input
115
namespace input
76
115
{
116
{
77
116
class InputReport;
117
class InputReport;
79
117
class InputTargets;
118
class Scene;
80
118
class InputManager;
119
class InputManager;
81
119
class CompositeEventFilter;
120
class CompositeEventFilter;
82
120
class InputChannelFactory;
121
class InputChannelFactory;
83
@@ -214,6 +215,7 @@
84
214
     * dependencies of compositor on the rest of the Mir
215
     * dependencies of compositor on the rest of the Mir
85
215
     *  @{ */
216
     *  @{ */
86
216
    virtual std::shared_ptr<graphics::GraphicBufferAllocator> the_buffer_allocator();
217
    virtual std::shared_ptr<graphics::GraphicBufferAllocator> the_buffer_allocator();
87
218
    virtual std::shared_ptr<graphics::BufferWriter> the_buffer_writer();
88
217
    virtual std::shared_ptr<compositor::Scene>                  the_scene();
219
    virtual std::shared_ptr<compositor::Scene>                  the_scene();
89
218
    virtual std::shared_ptr<compositor::FrameDroppingPolicyFactory> the_frame_dropping_policy_factory();
220
    virtual std::shared_ptr<compositor::FrameDroppingPolicyFactory> the_frame_dropping_policy_factory();
90
219
    /** @} */
221
    /** @} */
91
@@ -291,7 +293,7 @@
92
291
    virtual std::shared_ptr<input::InputReport> the_input_report();
293
    virtual std::shared_ptr<input::InputReport> the_input_report();
93
292
    virtual std::shared_ptr<input::CompositeEventFilter> the_composite_event_filter();
294
    virtual std::shared_ptr<input::CompositeEventFilter> the_composite_event_filter();
94
293
    virtual std::shared_ptr<shell::InputTargeter> the_input_targeter();
295
    virtual std::shared_ptr<shell::InputTargeter> the_input_targeter();
96
294
    virtual std::shared_ptr<input::InputTargets>  the_input_targets();
296
    virtual std::shared_ptr<input::Scene>  the_input_scene();
97
295
    virtual std::shared_ptr<input::CursorListener> the_cursor_listener();
297
    virtual std::shared_ptr<input::CursorListener> the_cursor_listener();
98
296
    virtual std::shared_ptr<input::TouchVisualizer> the_touch_visualizer();
298
    virtual std::shared_ptr<input::TouchVisualizer> the_touch_visualizer();
99
297
    virtual std::shared_ptr<input::InputRegion>    the_input_region();
299
    virtual std::shared_ptr<input::InputRegion>    the_input_region();
100
@@ -359,6 +361,7 @@
101
359
    CachedPtr<graphics::NativePlatform>    graphics_native_platform;
361
    CachedPtr<graphics::NativePlatform>    graphics_native_platform;
102
360
    CachedPtr<graphics::BufferInitializer> buffer_initializer;
362
    CachedPtr<graphics::BufferInitializer> buffer_initializer;
103
361
    CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
363
    CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
104
364
    CachedPtr<graphics::BufferWriter> buffer_writer;
105
362
    CachedPtr<graphics::Display>      display;
365
    CachedPtr<graphics::Display>      display;
106
363
    CachedPtr<graphics::Cursor>       cursor;
366
    CachedPtr<graphics::Cursor>       cursor;
107
364
    CachedPtr<graphics::CursorImage>  default_cursor_image;
367
    CachedPtr<graphics::CursorImage>  default_cursor_image;
108
365
368
109
=== modified file 'include/server/mir/input/cursor_listener.h'
110
--- include/server/mir/input/cursor_listener.h	2013-04-30 20:44:31 +0000
111
+++ include/server/mir/input/cursor_listener.h	2014-09-18 16:04:44 +0000
112
@@ -35,8 +35,8 @@
113
35
35
114
36
protected:
36
protected:
115
37
    CursorListener() = default;
37
    CursorListener() = default;
118
38
    CursorListener(const CursorListener&) = delete;
38
    CursorListener(CursorListener const&) = delete;
119
39
    CursorListener& operator=(const CursorListener&) = delete;
39
    CursorListener& operator=(CursorListener const&) = delete;
120
40
};
40
};
121
41
41
122
42
}
42
}
123
43
43
124
=== renamed file 'src/include/server/mir/input/touch_visualizer.h' => 'include/server/mir/input/touch_visualizer.h'
125
--- src/include/server/mir/input/touch_visualizer.h	2014-09-10 12:50:53 +0000
126
+++ include/server/mir/input/touch_visualizer.h	2014-09-18 16:04:44 +0000
127
@@ -39,11 +39,15 @@
128
39
    {
39
    {
129
40
        geometry::Point touch_location;
40
        geometry::Point touch_location;
130
41
        
41
        
133
42
        // If pressure is non-zero, it indicates a press at the spot, as
42
        // If pressure is zero, the touch-point can be interpreted as a hover.
132
43
        // opposed to a hover.
134
44
        float pressure;
43
        float pressure;
135
45
    };
44
    };
136
46
    
45
    
137
46
    // Toggle visualization of touches
138
47
    virtual void enable() = 0;
139
48
    virtual void disable() = 0;
140
49
    
141
50
    // Visualize a given set of touches statelessly.
142
47
    virtual void visualize_touches(std::vector<Spot> const& touches) = 0;
51
    virtual void visualize_touches(std::vector<Spot> const& touches) = 0;
143
48
52
144
49
protected:
53
protected:
145
50
54
146
=== modified file 'platform-ABI-sha1sums'
147
--- platform-ABI-sha1sums	2014-09-12 09:03:19 +0000
148
+++ platform-ABI-sha1sums	2014-09-18 16:04:44 +0000
149
@@ -31,9 +31,9 @@
150
31
979d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
31
979d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
151
32
f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
32
f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
152
33
c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
33
c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
154
34
656a7e1ae3b246930431a6174526fbdc2c76649e  include/platform/mir/graphics/platform.h
34
c775727ea15fd8affa5b4dc9cd226d782e436001  include/platform/mir/graphics/platform.h
155
35
15f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
35
15f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
157
36
b0014e8c4f44f831c9d178f995efb172417aaee4  include/platform/mir/options/configuration.h
36
f5746dab3336266cfd410ce4e4d01333df6e5b99  include/platform/mir/options/configuration.h
158
37
47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
37
47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
159
38
b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
38
b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
160
39
3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h
39
3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h
161
40
40
162
=== modified file 'playground/demo-shell/demo_compositor.cpp'
163
--- playground/demo-shell/demo_compositor.cpp	2014-09-10 12:50:53 +0000
164
+++ playground/demo-shell/demo_compositor.cpp	2014-09-18 16:04:44 +0000
165
@@ -66,6 +66,8 @@
166
66
    //the elements should be notified if they are rendered or not
66
    //the elements should be notified if they are rendered or not
167
67
    bool nonrenderlist_elements{false};
67
    bool nonrenderlist_elements{false};
168
68
    mg::RenderableList renderable_list;
68
    mg::RenderableList renderable_list;
169
69
    std::unordered_set<mg::Renderable::ID> decoration_skip_list;
170
70
171
69
    auto elements = scene->scene_elements_for(this);
71
    auto elements = scene->scene_elements_for(this);
172
70
    for(auto const& it : elements)
72
    for(auto const& it : elements)
173
71
    {
73
    {
174
@@ -73,6 +75,9 @@
175
73
        auto const& view_area = display_buffer.view_area();
75
        auto const& view_area = display_buffer.view_area();
176
74
        auto embellished = renderer.would_embellish(*renderable, view_area);
76
        auto embellished = renderer.would_embellish(*renderable, view_area);
177
75
        auto any_part_drawn = (view_area.overlaps(renderable->screen_position()) || embellished);
77
        auto any_part_drawn = (view_area.overlaps(renderable->screen_position()) || embellished);
178
78
        
179
79
        if (!it->is_a_surface())
180
80
            decoration_skip_list.insert(renderable->id());
181
76
        if (renderable->visible() && any_part_drawn)
81
        if (renderable->visible() && any_part_drawn)
182
77
        {
82
        {
183
78
            renderable_list.push_back(renderable);
83
            renderable_list.push_back(renderable);
184
@@ -96,7 +101,7 @@
185
96
        display_buffer.make_current();
101
        display_buffer.make_current();
186
97
102
187
98
        renderer.set_rotation(display_buffer.orientation());
103
        renderer.set_rotation(display_buffer.orientation());
189
99
        renderer.begin();
104
        renderer.begin(std::move(decoration_skip_list));
190
100
        renderer.render(renderable_list);
105
        renderer.render(renderable_list);
191
101
        display_buffer.post_update();
106
        display_buffer.post_update();
192
102
        renderer.end();
107
        renderer.end();
193
103
108
194
=== modified file 'playground/demo-shell/demo_renderer.cpp'
195
--- playground/demo-shell/demo_renderer.cpp	2014-09-10 12:50:53 +0000
196
+++ playground/demo-shell/demo_renderer.cpp	2014-09-18 16:04:44 +0000
197
@@ -171,7 +171,7 @@
198
171
    glDeleteTextures(1, &titlebar_corner_tex);
171
    glDeleteTextures(1, &titlebar_corner_tex);
199
172
}
172
}
200
173
173
202
174
void DemoRenderer::begin() const
174
void DemoRenderer::begin(std::unordered_set<graphics::Renderable::ID> decoration_skip_list_) const
203
175
{
175
{
204
176
    bool const opaque = destination_alpha() == compositor::DestinationAlpha::opaque;
176
    bool const opaque = destination_alpha() == compositor::DestinationAlpha::opaque;
205
177
    if (opaque)
177
    if (opaque)
206
@@ -184,14 +184,19 @@
207
184
184
208
185
    if (opaque)
185
    if (opaque)
209
186
        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
186
        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
210
187
    
211
188
    decoration_skip_list = decoration_skip_list_;
212
187
}
189
}
213
188
190
214
189
void DemoRenderer::tessellate(std::vector<graphics::GLPrimitive>& primitives,
191
void DemoRenderer::tessellate(std::vector<graphics::GLPrimitive>& primitives,
215
190
                              graphics::Renderable const& renderable) const
192
                              graphics::Renderable const& renderable) const
216
191
{
193
{
217
192
    GLRenderer::tessellate(primitives, renderable);
194
    GLRenderer::tessellate(primitives, renderable);
220
193
    tessellate_shadow(primitives, renderable, shadow_radius);
195
    if (decoration_skip_list.find(renderable.id()) == decoration_skip_list.end())
221
194
    tessellate_frame(primitives, renderable, titlebar_height);
196
    {
222
197
        tessellate_shadow(primitives, renderable, shadow_radius);
223
198
        tessellate_frame(primitives, renderable, titlebar_height);
224
199
    }
225
195
}
200
}
226
196
201
227
197
void DemoRenderer::tessellate_shadow(std::vector<graphics::GLPrimitive>& primitives,
202
void DemoRenderer::tessellate_shadow(std::vector<graphics::GLPrimitive>& primitives,
228
198
203
229
=== modified file 'playground/demo-shell/demo_renderer.h'
230
--- playground/demo-shell/demo_renderer.h	2014-09-10 12:50:53 +0000
231
+++ playground/demo-shell/demo_renderer.h	2014-09-18 16:04:44 +0000
232
@@ -21,6 +21,8 @@
233
21
21
234
22
#include "mir/compositor/gl_renderer.h"
22
#include "mir/compositor/gl_renderer.h"
235
23
23
236
24
#include <unordered_set>
237
25
238
24
namespace mir
26
namespace mir
239
25
{
27
{
240
26
namespace examples
28
namespace examples
241
@@ -37,7 +39,9 @@
242
37
        float const shadow_radius);
39
        float const shadow_radius);
243
38
    ~DemoRenderer();
40
    ~DemoRenderer();
244
39
41
246
40
    void begin() const override;
42
    void begin() const override { GLRenderer::begin(); }
247
43
    void begin(std::unordered_set<graphics::Renderable::ID> renderables_not_to_decorate) const;
248
44
    
249
41
    void tessellate(
45
    void tessellate(
250
42
        std::vector<graphics::GLPrimitive>& primitives,
46
        std::vector<graphics::GLPrimitive>& primitives,
251
43
        graphics::Renderable const& renderable) const override;
47
        graphics::Renderable const& renderable) const override;
252
@@ -59,6 +63,8 @@
253
59
    float const corner_radius;
63
    float const corner_radius;
254
60
    GLuint shadow_corner_tex;
64
    GLuint shadow_corner_tex;
255
61
    GLuint titlebar_corner_tex;
65
    GLuint titlebar_corner_tex;
256
66
    
257
67
    mutable std::unordered_set<graphics::Renderable::ID> decoration_skip_list;
258
62
};
68
};
259
63
69
260
64
} // namespace examples
70
} // namespace examples
261
65
71
262
=== modified file 'server-ABI-sha1sums'
263
--- server-ABI-sha1sums	2014-09-12 09:03:19 +0000
264
+++ server-ABI-sha1sums	2014-09-18 16:04:44 +0000
265
@@ -31,14 +31,14 @@
266
31
979d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
31
979d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
267
32
f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
32
f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
268
33
c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
33
c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
270
34
656a7e1ae3b246930431a6174526fbdc2c76649e  include/platform/mir/graphics/platform.h
34
c775727ea15fd8affa5b4dc9cd226d782e436001  include/platform/mir/graphics/platform.h
271
35
15f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
35
15f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
273
36
b0014e8c4f44f831c9d178f995efb172417aaee4  include/platform/mir/options/configuration.h
36
f5746dab3336266cfd410ce4e4d01333df6e5b99  include/platform/mir/options/configuration.h
274
37
47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
37
47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
275
38
b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
38
b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
276
39
3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h
39
3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h
277
40
f4030e400baf8baa9c38e7c6ec6b4a5ad7134aeb  include/server/mir/compositor/compositor.h
40
f4030e400baf8baa9c38e7c6ec6b4a5ad7134aeb  include/server/mir/compositor/compositor.h
279
41
f102d38fd8afd63b636d76005f9b80f3adda0858  include/server/mir/default_server_configuration.h
41
ef0b6f26fb40a72e4a4744e4d9c4bd044142de47  include/server/mir/default_server_configuration.h
280
42
af1ff0714be973ac76d56006a2e5991f68cd1dec  include/server/mir/display_server.h
42
af1ff0714be973ac76d56006a2e5991f68cd1dec  include/server/mir/display_server.h
281
43
65db331f1c0e956eced5c9fc73a2b2122dbc8dc7  include/server/mir/frontend/connection_creator.h
43
65db331f1c0e956eced5c9fc73a2b2122dbc8dc7  include/server/mir/frontend/connection_creator.h
282
44
e6e92642301fc9bb85e1d38087a5dd84e5d30fd7  include/server/mir/frontend/connections.h
44
e6e92642301fc9bb85e1d38087a5dd84e5d30fd7  include/server/mir/frontend/connections.h
283
@@ -55,12 +55,13 @@
284
55
618b43a84cce0ad671ed68fe2ba796fbc7b79e31  include/server/mir/frontend/surface_id.h
55
618b43a84cce0ad671ed68fe2ba796fbc7b79e31  include/server/mir/frontend/surface_id.h
285
56
5aa4c4db5468d9b9fe8e98a64444538aadd6e17b  include/server/mir/frontend/template_protobuf_message_processor.h
56
5aa4c4db5468d9b9fe8e98a64444538aadd6e17b  include/server/mir/frontend/template_protobuf_message_processor.h
286
57
f95c2bddf13d15993ef5d6a0ad7b9106ae550b87  include/server/mir/input/composite_event_filter.h
57
f95c2bddf13d15993ef5d6a0ad7b9106ae550b87  include/server/mir/input/composite_event_filter.h
288
58
c1e96c372d7856d59947f3145d273b1285b569bc  include/server/mir/input/cursor_listener.h
58
cef18b7215fbe00550d18c0aa0f79b641cff494e  include/server/mir/input/cursor_listener.h
289
59
2331fc402686e862809bf24714a8746cdde97cb1  include/server/mir/input/event_filter.h
59
2331fc402686e862809bf24714a8746cdde97cb1  include/server/mir/input/event_filter.h
290
60
78862dda41d56c6b937a1ed197982e5fa37f50df  include/server/mir/input/input_channel.h
60
78862dda41d56c6b937a1ed197982e5fa37f50df  include/server/mir/input/input_channel.h
291
61
6f1d9cf83bbb1256f0b4d1ba1d94d95af98c52f0  include/server/mir/input/input_dispatcher.h
61
6f1d9cf83bbb1256f0b4d1ba1d94d95af98c52f0  include/server/mir/input/input_dispatcher.h
292
62
b2ec497c6bec1b3a67c991f31cc7b7c51050ecbb  include/server/mir/input/input_reception_mode.h
62
b2ec497c6bec1b3a67c991f31cc7b7c51050ecbb  include/server/mir/input/input_reception_mode.h
293
63
15119bf95b4512c8b91df7c20edf56a3c0734957  include/server/mir/input/surface.h
63
15119bf95b4512c8b91df7c20edf56a3c0734957  include/server/mir/input/surface.h
294
64
036f3967757873751fcacaa768ca11a52001c225  include/server/mir/input/touch_visualizer.h
295
64
964069b241f1e8211386bb8735ee0f752b666949  include/server/mir/main_loop.h
65
964069b241f1e8211386bb8735ee0f752b666949  include/server/mir/main_loop.h
296
65
edd5a0a6be0be57ef64c5af89fc5a65dc558648c  include/server/mir/report_exception.h
66
edd5a0a6be0be57ef64c5af89fc5a65dc558648c  include/server/mir/report_exception.h
297
66
8192727cf5fa0b2b5798b2211c2c8a4ad65c9f60  include/server/mir/run_mir.h
67
8192727cf5fa0b2b5798b2211c2c8a4ad65c9f60  include/server/mir/run_mir.h
298
67
68
299
=== added file 'src/include/platform/mir/graphics/buffer_writer.h'
300
--- src/include/platform/mir/graphics/buffer_writer.h	1970-01-01 00:00:00 +0000
301
+++ src/include/platform/mir/graphics/buffer_writer.h	2014-09-18 16:04:44 +0000
302
@@ -0,0 +1,44 @@
303
1
/*
304
2
 * Copyright © 2014 Canonical Ltd.
305
3
 *
306
4
 * This program is free software: you can redistribute it and/or modify it
307
5
 * under the terms of the GNU Lesser General Public License version 3,
308
6
 * as published by the Free Software Foundation.
309
7
 *
310
8
 * This program is distributed in the hope that it will be useful,
311
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
312
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
313
11
 * GNU Lesser General Public License for more details.
314
12
 *
315
13
 * You should have received a copy of the GNU Lesser General Public License
316
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
317
15
 *
318
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
319
17
 */
320
18
321
19
#include <cstddef>
322
20
323
21
namespace mir
324
22
{
325
23
namespace graphics
326
24
{
327
25
class Buffer;
328
26
329
27
/// An interface provided by the graphics platform allowing for writing untiled pixel data into buffers.
330
28
class BufferWriter
331
29
{
332
30
public:
333
31
    virtual ~BufferWriter() = default;
334
32
335
33
    // Expects data to be an unstrided array containing (buffer.width * buffer.height) pixels. Likewise
336
34
    // it is expected that buffer and data match in pixel format.
337
35
    virtual void write(Buffer& buffer, unsigned char const* data, size_t size) = 0;
338
36
339
37
protected:
340
38
    BufferWriter() = default;
341
39
    BufferWriter(BufferWriter const&) = delete;
342
40
    BufferWriter& operator=(BufferWriter const&) = delete;
343
41
};
344
42
345
43
}
346
44
}
347
0
45
348
=== modified file 'src/include/platform/mir/graphics/native_platform.h'
349
--- src/include/platform/mir/graphics/native_platform.h	2014-09-10 12:50:53 +0000
350
+++ src/include/platform/mir/graphics/native_platform.h	2014-09-18 16:04:44 +0000
351
@@ -36,6 +36,7 @@
352
36
class InternalClient;
36
class InternalClient;
353
37
class BufferIPCPacker;
37
class BufferIPCPacker;
354
38
class Buffer;
38
class Buffer;
355
39
class BufferWriter;
356
39
class DisplayReport;
40
class DisplayReport;
357
40
class NestedContext;
41
class NestedContext;
358
41
42
359
@@ -58,6 +59,8 @@
360
58
        Buffer const* buffer,
59
        Buffer const* buffer,
361
59
        BufferIpcMsgType msg_type) const = 0;
60
        BufferIpcMsgType msg_type) const = 0;
362
60
61
363
62
    virtual std::shared_ptr<BufferWriter> make_buffer_writer() = 0;
364
63
365
61
    virtual ~NativePlatform() = default;
64
    virtual ~NativePlatform() = default;
366
62
    NativePlatform(NativePlatform const&) = delete;
65
    NativePlatform(NativePlatform const&) = delete;
367
63
    NativePlatform& operator=(NativePlatform const&) = delete;
66
    NativePlatform& operator=(NativePlatform const&) = delete;
368
64
67
369
=== modified file 'src/include/server/mir/compositor/scene_element.h'
370
--- src/include/server/mir/compositor/scene_element.h	2014-09-10 12:50:53 +0000
371
+++ src/include/server/mir/compositor/scene_element.h	2014-09-18 16:04:44 +0000
372
@@ -39,6 +39,10 @@
373
39
    virtual std::shared_ptr<graphics::Renderable> renderable() const = 0;
39
    virtual std::shared_ptr<graphics::Renderable> renderable() const = 0;
374
40
    virtual void rendered_in(CompositorID cid) = 0;
40
    virtual void rendered_in(CompositorID cid) = 0;
375
41
    virtual void occluded_in(CompositorID cid) = 0;
41
    virtual void occluded_in(CompositorID cid) = 0;
376
42
    
377
43
    // Query whether the SceneElement represents a window-surface, which at the discretion of the compositor
378
44
    // may be eligible for window decoration.
379
45
    virtual bool is_a_surface() const = 0;
380
42
46
381
43
protected:
47
protected:
382
44
    SceneElement() = default;
48
    SceneElement() = default;
383
45
49
384
=== renamed file 'src/include/server/mir/input/input_targets.h' => 'src/include/server/mir/input/scene.h'
385
--- src/include/server/mir/input/input_targets.h	2014-09-10 12:50:53 +0000
386
+++ src/include/server/mir/input/scene.h	2014-09-18 16:04:44 +0000
387
@@ -17,8 +17,8 @@
388
17
 *              Daniel d'Andradra <daniel.dandrada@canonical.com>
17
 *              Daniel d'Andradra <daniel.dandrada@canonical.com>
389
18
 */
18
 */
390
19
19
393
20
#ifndef MIR_INPUT_INPUT_TARGETS_H_
20
#ifndef MIR_INPUT_INPUT_SCENE_H_
394
21
#define MIR_INPUT_INPUT_TARGETS_H_
21
#define MIR_INPUT_INPUT_SCENE_H_
395
22
22
396
23
#include "mir/input/input_channel_factory.h"
23
#include "mir/input/input_channel_factory.h"
397
24
24
398
@@ -30,28 +30,43 @@
399
30
{
30
{
400
31
class Observer;
31
class Observer;
401
32
}
32
}
402
33
namespace graphics
403
34
{
404
35
class Renderable;
405
36
}
406
33
37
407
34
namespace input
38
namespace input
408
35
{
39
{
409
36
class Surface;
40
class Surface;
410
37
41
412
38
class InputTargets
42
class Scene
413
39
{
43
{
414
40
public:
44
public:
416
41
    virtual ~InputTargets() = default;
45
    virtual ~Scene() = default;
417
42
46
418
43
    virtual void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& callback) = 0;
47
    virtual void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& callback) = 0;
419
44
48
420
45
    virtual void add_observer(std::shared_ptr<scene::Observer> const& observer) = 0;
49
    virtual void add_observer(std::shared_ptr<scene::Observer> const& observer) = 0;
421
46
    virtual void remove_observer(std::weak_ptr<scene::Observer> const& observer) = 0;
50
    virtual void remove_observer(std::weak_ptr<scene::Observer> const& observer) = 0;
422
47
51
423
52
    // An interface which the input stack can use to add certain non interactive input visualizations
424
53
    // in to the scene (i.e. cursors, touchspots). Overlay renderables will be rendered above all surfaces.
425
54
    // Within the set of overlay renderables, rendering order is undefined.
426
55
    virtual void add_input_visualization(std::shared_ptr<graphics::Renderable> const& overlay) = 0;
427
56
    virtual void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& overlay) = 0;
428
57
    
429
58
    // As input visualizations added through the overlay system will not use the standard SurfaceObserver
430
59
    // mechanism, we require this method to trigger recomposition.
431
60
    // TODO: How can something like SurfaceObserver be adapted to work with non surface renderables?
432
61
    virtual void emit_scene_changed() = 0;
433
62
434
48
protected:
63
protected:
438
49
    InputTargets() = default;
64
    Scene() = default;
439
50
    InputTargets(InputTargets const&) = delete;
65
    Scene(Scene const&) = delete;
440
51
    InputTargets& operator=(InputTargets const&) = delete;
66
    Scene& operator=(Scene const&) = delete;
441
52
};
67
};
442
53
68
443
54
}
69
}
444
55
}
70
}
445
56
71
447
57
#endif // MIR_INPUT_INPUT_TARGETS
72
#endif // MIR_INPUT_INPUT_SCENE
448
58
73
449
=== modified file 'src/include/server/mir/scene/legacy_scene_change_notification.h'
450
--- src/include/server/mir/scene/legacy_scene_change_notification.h	2014-09-10 12:50:53 +0000
451
+++ src/include/server/mir/scene/legacy_scene_change_notification.h	2014-09-18 16:04:44 +0000
452
@@ -45,6 +45,8 @@
453
45
    void surface_added(Surface* surface) override;
45
    void surface_added(Surface* surface) override;
454
46
    void surface_removed(Surface* surface) override;
46
    void surface_removed(Surface* surface) override;
455
47
    void surfaces_reordered() override;
47
    void surfaces_reordered() override;
456
48
    
457
49
    void scene_changed() override;
458
48
50
459
49
    void surface_exists(Surface* surface) override;
51
    void surface_exists(Surface* surface) override;
460
50
    void end_observation() override;
52
    void end_observation() override;
461
51
53
462
=== modified file 'src/include/server/mir/scene/observer.h'
463
--- src/include/server/mir/scene/observer.h	2014-09-10 12:50:53 +0000
464
+++ src/include/server/mir/scene/observer.h	2014-09-18 16:04:44 +0000
465
@@ -36,6 +36,10 @@
466
36
    virtual void surface_added(Surface* surface) = 0;
36
    virtual void surface_added(Surface* surface) = 0;
467
37
    virtual void surface_removed(Surface* surface) = 0;
37
    virtual void surface_removed(Surface* surface) = 0;
468
38
    virtual void surfaces_reordered() = 0;
38
    virtual void surfaces_reordered() = 0;
469
39
    
470
40
    // Used to indicate the scene has changed in some way beyond the present surfaces
471
41
    // and will require full recomposition.
472
42
    virtual void scene_changed() = 0;
473
39
43
474
40
    // Called at observer registration to notify of already existing surfaces.
44
    // Called at observer registration to notify of already existing surfaces.
475
41
    virtual void surface_exists(Surface* surface) = 0;
45
    virtual void surface_exists(Surface* surface) = 0;
476
42
46
477
=== modified file 'src/platform/CMakeLists.txt'
478
--- src/platform/CMakeLists.txt	2014-09-10 13:27:58 +0000
479
+++ src/platform/CMakeLists.txt	2014-09-18 16:04:44 +0000
480
@@ -3,7 +3,7 @@
481
3
  ${PROJECT_SOURCE_DIR}/src/include/platform
3
  ${PROJECT_SOURCE_DIR}/src/include/platform
482
4
)
4
)
483
5
5
485
6
set(MIRPLATFORM_ABI 2)
6
set(MIRPLATFORM_ABI 3)
486
7
7
487
8
set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
8
set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
488
9
9
489
10
10
490
=== modified file 'src/platform/graphics/android/CMakeLists.txt'
491
--- src/platform/graphics/android/CMakeLists.txt	2014-09-10 12:50:53 +0000
492
+++ src/platform/graphics/android/CMakeLists.txt	2014-09-18 16:04:44 +0000
493
@@ -35,6 +35,7 @@
494
35
  device_quirks.cpp
35
  device_quirks.cpp
495
36
  real_hwc_wrapper.cpp
36
  real_hwc_wrapper.cpp
496
37
  hwc_fallback_gl_renderer.cpp
37
  hwc_fallback_gl_renderer.cpp
497
38
  android_buffer_writer.cpp
498
38
)
39
)
499
39
add_library(mirplatformgraphicsandroid SHARED
40
add_library(mirplatformgraphicsandroid SHARED
500
40
  $<TARGET_OBJECTS:mirplatformgraphicsandroidobjects>
41
  $<TARGET_OBJECTS:mirplatformgraphicsandroidobjects>
501
41
42
502
=== added file 'src/platform/graphics/android/android_buffer_writer.cpp'
503
--- src/platform/graphics/android/android_buffer_writer.cpp	1970-01-01 00:00:00 +0000
504
+++ src/platform/graphics/android/android_buffer_writer.cpp	2014-09-18 16:04:44 +0000
505
@@ -0,0 +1,70 @@
506
1
/*
507
2
 * Copyright © 2014 Canonical Ltd.
508
3
 *
509
4
 * This program is free software: you can redistribute it and/or modify it
510
5
 * under the terms of the GNU Lesser General Public License version 3,
511
6
 * as published by the Free Software Foundation.
512
7
 *
513
8
 * This program is distributed in the hope that it will be useful,
514
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
515
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
516
11
 * GNU Lesser General Public License for more details.
517
12
 *
518
13
 * You should have received a copy of the GNU Lesser General Public License
519
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
520
15
 *
521
16
 * Authored by:
522
17
 *   Robert Carr <robert.carr@canonical.com>
523
18
 */
524
19
525
20
#include "android_buffer_writer.h"
526
21
#include "buffer.h"
527
22
528
23
#include "mir/graphics/android/android_native_buffer.h"
529
24
530
25
#include <hardware/hardware.h>
531
26
532
27
#include <boost/throw_exception.hpp>
533
28
#include <stdexcept>
534
29
535
30
#include <string.h>
536
31
537
32
namespace mg = mir::graphics;
538
33
namespace mga = mg::android;
539
34
540
35
mga::BufferWriter::BufferWriter()
541
36
{
542
37
    auto err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (hw_module_t const **)(&hw_module));
543
38
    if (err < 0)
544
39
        BOOST_THROW_EXCEPTION(std::runtime_error("Could not open hardware module"));
545
40
}
546
41
547
42
void mga::BufferWriter::write(mg::Buffer& buffer, unsigned char const* data, size_t size)
548
43
{
549
44
    auto buffer_size = buffer.size();
550
45
    auto bpp = MIR_BYTES_PER_PIXEL(buffer.pixel_format());
551
46
    if (bpp * buffer_size.width.as_uint32_t() * buffer_size.height.as_uint32_t() != size)
552
47
        BOOST_THROW_EXCEPTION(std::logic_error("Size of pixels is not equal to size of buffer"));
553
48
554
49
    auto const& handle = buffer.native_buffer_handle();
555
50
    
556
51
    char* vaddr;
557
52
    int usage = GRALLOC_USAGE_SW_WRITE_OFTEN;
558
53
    int width = buffer.size().width.as_uint32_t();
559
54
    int height = buffer.size().height.as_uint32_t();
560
55
    int top = 0;
561
56
    int left = 0;
562
57
    if ( hw_module->lock(hw_module, handle->handle(),
563
58
        usage, top, left, width, height, reinterpret_cast<void**>(&vaddr)) )
564
59
        BOOST_THROW_EXCEPTION(std::runtime_error("error securing buffer for client cpu use"));
565
60
566
61
    // Copy line by line in case of stride != width*bpp
567
62
    for (int i = 0; i < height; i++)
568
63
    {
569
64
        int line_offset_in_buffer = buffer.stride().as_uint32_t()*i;
570
65
        int line_offset_in_source = bpp*width*i;
571
66
        memcpy(vaddr + line_offset_in_buffer, data + line_offset_in_source, width * bpp);
572
67
    }
573
68
    
574
69
    hw_module->unlock(hw_module, handle->handle());
575
70
}
576
0
71
577
=== added file 'src/platform/graphics/android/android_buffer_writer.h'
578
--- src/platform/graphics/android/android_buffer_writer.h	1970-01-01 00:00:00 +0000
579
+++ src/platform/graphics/android/android_buffer_writer.h	2014-09-18 16:04:44 +0000
580
@@ -0,0 +1,50 @@
581
1
/*
582
2
 * Copyright © 2014 Canonical Ltd.
583
3
 *
584
4
 * This program is free software: you can redistribute it and/or modify it
585
5
 * under the terms of the GNU Lesser General Public License version 3,
586
6
 * as published by the Free Software Foundation.
587
7
 *
588
8
 * This program is distributed in the hope that it will be useful,
589
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
590
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
591
11
 * GNU Lesser General Public License for more details.
592
12
 *
593
13
 * You should have received a copy of the GNU Lesser General Public License
594
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
595
15
 *
596
16
 * Authored by:
597
17
 *   Robert Carr <robert.carr@canonical.com>
598
18
 */
599
19
600
20
#ifndef MIR_PLATFORM_ANDROID_ANDROID_BUFFER_WRITER_H_
601
21
#define MIR_PLATFORM_ANDROID_ANDROID_BUFFER_WRITER_H_
602
22
603
23
#include "mir/graphics/buffer_writer.h"
604
24
605
25
#include <hardware/gralloc.h>
606
26
607
27
#include <memory>
608
28
609
29
namespace mir
610
30
{
611
31
namespace graphics
612
32
{
613
33
namespace android
614
34
{
615
35
616
36
class BufferWriter : public graphics::BufferWriter
617
37
{
618
38
public:
619
39
     BufferWriter();
620
40
621
41
     void write(graphics::Buffer& buffer, unsigned char const* pixels, size_t size) override;
622
42
private:
623
43
     gralloc_module_t const* hw_module;
624
44
};
625
45
626
46
}
627
47
}
628
48
}
629
49
630
50
#endif /* MIR_PLATFORM_ANDROID_ANDROID_BUFFER_WRITER_H_ */
631
0
51
632
=== modified file 'src/platform/graphics/android/android_display.cpp'
633
--- src/platform/graphics/android/android_display.cpp	2014-09-10 12:50:53 +0000
634
+++ src/platform/graphics/android/android_display.cpp	2014-09-18 16:04:44 +0000
635
@@ -103,7 +103,7 @@
636
103
103
637
104
auto mga::AndroidDisplay::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /* initial_image */) -> std::shared_ptr<Cursor>
104
auto mga::AndroidDisplay::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /* initial_image */) -> std::shared_ptr<Cursor>
638
105
{
105
{
640
106
    return std::shared_ptr<Cursor>();
106
    return nullptr;
641
107
}
107
}
642
108
108
643
109
std::unique_ptr<mg::GLContext> mga::AndroidDisplay::create_gl_context()
109
std::unique_ptr<mg::GLContext> mga::AndroidDisplay::create_gl_context()
644
110
110
645
=== modified file 'src/platform/graphics/android/android_platform.cpp'
646
--- src/platform/graphics/android/android_platform.cpp	2014-09-15 18:58:24 +0000
647
+++ src/platform/graphics/android/android_platform.cpp	2014-09-18 16:04:44 +0000
648
@@ -24,6 +24,7 @@
649
24
#include "android_display.h"
24
#include "android_display.h"
650
25
#include "internal_client.h"
25
#include "internal_client.h"
651
26
#include "output_builder.h"
26
#include "output_builder.h"
652
27
#include "android_buffer_writer.h"
653
27
#include "hwc_loggers.h"
28
#include "hwc_loggers.h"
654
28
#include "mir/graphics/platform_ipc_package.h"
29
#include "mir/graphics/platform_ipc_package.h"
655
29
#include "mir/graphics/android/native_buffer.h"
30
#include "mir/graphics/android/native_buffer.h"
656
@@ -153,6 +154,11 @@
657
153
    return std::make_shared<mga::InternalClient>();
154
    return std::make_shared<mga::InternalClient>();
658
154
}
155
}
659
155
156
660
157
std::shared_ptr<mg::BufferWriter> mga::AndroidPlatform::make_buffer_writer()
661
158
{
662
159
    return std::make_shared<mga::BufferWriter>();
663
160
}
664
161
665
156
extern "C" std::shared_ptr<mg::Platform> mg::create_platform(
162
extern "C" std::shared_ptr<mg::Platform> mg::create_platform(
666
157
    std::shared_ptr<mo::Option> const& options,
163
    std::shared_ptr<mo::Option> const& options,
667
158
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
164
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
668
159
165
669
=== modified file 'src/platform/graphics/android/android_platform.h'
670
--- src/platform/graphics/android/android_platform.h	2014-09-10 12:50:53 +0000
671
+++ src/platform/graphics/android/android_platform.h	2014-09-18 16:04:44 +0000
672
@@ -49,6 +49,7 @@
673
49
        std::shared_ptr<graphics::GLConfig> const& /*gl_config*/);
49
        std::shared_ptr<graphics::GLConfig> const& /*gl_config*/);
674
50
    std::shared_ptr<PlatformIPCPackage> get_ipc_package();
50
    std::shared_ptr<PlatformIPCPackage> get_ipc_package();
675
51
    std::shared_ptr<InternalClient> create_internal_client();
51
    std::shared_ptr<InternalClient> create_internal_client();
676
52
    std::shared_ptr<graphics::BufferWriter> make_buffer_writer() override;
677
52
    void fill_buffer_package(
53
    void fill_buffer_package(
678
53
        BufferIPCPacker* packer, graphics::Buffer const* buffer, BufferIpcMsgType msg_type) const;
54
        BufferIPCPacker* packer, graphics::Buffer const* buffer, BufferIpcMsgType msg_type) const;
679
54
    EGLNativeDisplayType egl_native_display() const;
55
    EGLNativeDisplayType egl_native_display() const;
680
55
56
681
=== modified file 'src/platform/graphics/mesa/CMakeLists.txt'
682
--- src/platform/graphics/mesa/CMakeLists.txt	2014-09-10 12:50:53 +0000
683
+++ src/platform/graphics/mesa/CMakeLists.txt	2014-09-18 16:04:44 +0000
684
@@ -33,6 +33,7 @@
685
33
  anonymous_shm_file.cpp
33
  anonymous_shm_file.cpp
686
34
  shm_buffer.cpp
34
  shm_buffer.cpp
687
35
  bypass.cpp
35
  bypass.cpp
688
36
  buffer_writer.cpp
689
36
)
37
)
690
37
38
691
38
add_library(mirplatformgraphicsmesa SHARED
39
add_library(mirplatformgraphicsmesa SHARED
692
39
40
693
=== modified file 'src/platform/graphics/mesa/buffer_allocator.cpp'
694
--- src/platform/graphics/mesa/buffer_allocator.cpp	2014-09-10 12:50:53 +0000
695
+++ src/platform/graphics/mesa/buffer_allocator.cpp	2014-09-18 16:04:44 +0000
696
@@ -39,7 +39,7 @@
697
39
#include <cassert>
39
#include <cassert>
698
40
40
699
41
namespace mg  = mir::graphics;
41
namespace mg  = mir::graphics;
701
42
namespace mgm = mir::graphics::mesa;
42
namespace mgm = mg::mesa;
702
43
namespace geom = mir::geometry;
43
namespace geom = mir::geometry;
703
44
44
704
45
namespace
45
namespace
705
46
46
706
=== added file 'src/platform/graphics/mesa/buffer_writer.cpp'
707
--- src/platform/graphics/mesa/buffer_writer.cpp	1970-01-01 00:00:00 +0000
708
+++ src/platform/graphics/mesa/buffer_writer.cpp	2014-09-18 16:04:44 +0000
709
@@ -0,0 +1,40 @@
710
1
/*
711
2
 * Copyright © 2014 Canonical Ltd.
712
3
 *
713
4
 * This program is free software: you can redistribute it and/or modify it
714
5
 * under the terms of the GNU Lesser General Public License version 3,
715
6
 * as published by the Free Software Foundation.
716
7
 *
717
8
 * This program is distributed in the hope that it will be useful,
718
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
719
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
720
11
 * GNU Lesser General Public License for more details.
721
12
 *
722
13
 * You should have received a copy of the GNU Lesser General Public License
723
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
724
15
 *
725
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
726
17
 */
727
18
728
19
#include "buffer_writer.h"
729
20
730
21
#include "shm_buffer.h"
731
22
732
23
#include <boost/throw_exception.hpp>
733
24
#include <stdexcept>
734
25
735
26
namespace mg = mir::graphics;
736
27
namespace mgm = mir::graphics::mesa;
737
28
738
29
mgm::BufferWriter::BufferWriter()
739
30
{
740
31
}
741
32
742
33
void mgm::BufferWriter::write(mg::Buffer& buffer, unsigned char const* data, size_t size)
743
34
{
744
35
    auto shm_buffer = dynamic_cast<mgm::ShmBuffer*>(&buffer);
745
36
    if (!shm_buffer)
746
37
        BOOST_THROW_EXCEPTION(std::logic_error("Direct CPU write is only supported to software allocated buffers on mesa platform"));
747
38
    
748
39
    shm_buffer->write(data, size);
749
40
}
750
0
41
751
=== added file 'src/platform/graphics/mesa/buffer_writer.h'
752
--- src/platform/graphics/mesa/buffer_writer.h	1970-01-01 00:00:00 +0000
753
+++ src/platform/graphics/mesa/buffer_writer.h	2014-09-18 16:04:44 +0000
754
@@ -0,0 +1,43 @@
755
1
/*
756
2
 * Copyright © 2014 Canonical Ltd.
757
3
 *
758
4
 * This program is free software: you can redistribute it and/or modify it
759
5
 * under the terms of the GNU Lesser General Public License version 3,
760
6
 * as published by the Free Software Foundation.
761
7
 *
762
8
 * This program is distributed in the hope that it will be useful,
763
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
764
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
765
11
 * GNU Lesser General Public License for more details.
766
12
 *
767
13
 * You should have received a copy of the GNU Lesser General Public License
768
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
769
15
 *
770
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
771
17
 */
772
18
773
19
#ifndef MIR_GRAPHICS_MESA_BUFFER_WRITER_H_
774
20
#define MIR_GRAPHICS_MESA_BUFFER_WRITER_H_
775
21
776
22
#include "mir/graphics/buffer_writer.h"
777
23
778
24
namespace mir
779
25
{
780
26
namespace graphics
781
27
{
782
28
class Buffer;
783
29
784
30
namespace mesa
785
31
{
786
32
class BufferWriter : public graphics::BufferWriter
787
33
{
788
34
public:
789
35
    BufferWriter();
790
36
    
791
37
    void write(graphics::Buffer& buffer, unsigned char const* data, size_t size) override;
792
38
};
793
39
}
794
40
}
795
41
}
796
42
797
43
#endif // MIR_GRAPHICS_MESA_BUFFER_WRITER_H_
798
0
44
799
=== modified file 'src/platform/graphics/mesa/native_platform.cpp'
800
--- src/platform/graphics/mesa/native_platform.cpp	2014-09-10 12:50:53 +0000
801
+++ src/platform/graphics/mesa/native_platform.cpp	2014-09-18 16:04:44 +0000
802
@@ -21,6 +21,7 @@
803
21
#include "native_platform.h"
21
#include "native_platform.h"
804
22
22
805
23
#include "buffer_allocator.h"
23
#include "buffer_allocator.h"
806
24
#include "buffer_writer.h"
807
24
#include "mir/graphics/buffer_ipc_packer.h"
25
#include "mir/graphics/buffer_ipc_packer.h"
808
25
#include "mir/graphics/platform_ipc_package.h"
26
#include "mir/graphics/platform_ipc_package.h"
809
26
#include "mir/graphics/nested_context.h"
27
#include "mir/graphics/nested_context.h"
810
@@ -157,3 +158,7 @@
811
157
    native_display.reset();
158
    native_display.reset();
812
158
}
159
}
813
159
160
814
161
std::shared_ptr<mg::BufferWriter> mgm::NativePlatform::make_buffer_writer()
815
162
{
816
163
    return std::make_shared<mgm::BufferWriter>();
817
164
}
818
160
165
819
=== modified file 'src/platform/graphics/mesa/native_platform.h'
820
--- src/platform/graphics/mesa/native_platform.h	2014-09-10 12:50:53 +0000
821
+++ src/platform/graphics/mesa/native_platform.h	2014-09-18 16:04:44 +0000
822
@@ -44,6 +44,7 @@
823
44
    std::shared_ptr<InternalClient> create_internal_client() override;
44
    std::shared_ptr<InternalClient> create_internal_client() override;
824
45
    void fill_buffer_package(
45
    void fill_buffer_package(
825
46
        BufferIPCPacker* packer, Buffer const* buffer, BufferIpcMsgType msg_type) const override;
46
        BufferIPCPacker* packer, Buffer const* buffer, BufferIpcMsgType msg_type) const override;
826
47
    std::shared_ptr<graphics::BufferWriter> make_buffer_writer() override;
827
47
    
48
    
828
48
    static std::shared_ptr<InternalNativeDisplay> internal_native_display();
49
    static std::shared_ptr<InternalNativeDisplay> internal_native_display();
829
49
    static bool internal_native_display_in_use();
50
    static bool internal_native_display_in_use();
830
50
51
831
=== modified file 'src/platform/graphics/mesa/platform.cpp'
832
--- src/platform/graphics/mesa/platform.cpp	2014-09-10 12:50:53 +0000
833
+++ src/platform/graphics/mesa/platform.cpp	2014-09-18 16:04:44 +0000
834
@@ -23,6 +23,7 @@
835
23
#include "internal_client.h"
23
#include "internal_client.h"
836
24
#include "internal_native_display.h"
24
#include "internal_native_display.h"
837
25
#include "linux_virtual_terminal.h"
25
#include "linux_virtual_terminal.h"
838
26
#include "buffer_writer.h"
839
26
#include "mir/graphics/platform_ipc_package.h"
27
#include "mir/graphics/platform_ipc_package.h"
840
27
#include "mir/graphics/buffer_ipc_packer.h"
28
#include "mir/graphics/buffer_ipc_packer.h"
841
28
#include "mir/options/option.h"
29
#include "mir/options/option.h"
842
@@ -216,6 +217,11 @@
843
216
    return std::make_shared<mgm::InternalClient>(internal_native_display);
217
    return std::make_shared<mgm::InternalClient>(internal_native_display);
844
217
}
218
}
845
218
219
846
220
std::shared_ptr<mg::BufferWriter> mgm::Platform::make_buffer_writer()
847
221
{
848
222
    return std::make_shared<mgm::BufferWriter>();
849
223
}
850
224
851
219
EGLNativeDisplayType mgm::Platform::egl_native_display() const
225
EGLNativeDisplayType mgm::Platform::egl_native_display() const
852
220
{
226
{
853
221
    return gbm.device;
227
    return gbm.device;
854
222
228
855
=== modified file 'src/platform/graphics/mesa/platform.h'
856
--- src/platform/graphics/mesa/platform.h	2014-09-10 12:50:53 +0000
857
+++ src/platform/graphics/mesa/platform.h	2014-09-18 16:04:44 +0000
858
@@ -54,6 +54,7 @@
859
54
    /* From Platform */
54
    /* From Platform */
860
55
    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator(
55
    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator(
861
56
            const std::shared_ptr<BufferInitializer>& buffer_initializer);
56
            const std::shared_ptr<BufferInitializer>& buffer_initializer);
862
57
    std::shared_ptr<graphics::BufferWriter> make_buffer_writer();
863
57
    std::shared_ptr<graphics::Display> create_display(
58
    std::shared_ptr<graphics::Display> create_display(
864
58
        std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
59
        std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
865
59
        std::shared_ptr<GLProgramFactory> const& program_factory,
60
        std::shared_ptr<GLProgramFactory> const& program_factory,
866
60
61
867
=== modified file 'src/platform/graphics/mesa/shm_buffer.cpp'
868
--- src/platform/graphics/mesa/shm_buffer.cpp	2014-09-10 12:50:53 +0000
869
+++ src/platform/graphics/mesa/shm_buffer.cpp	2014-09-18 16:04:44 +0000
870
@@ -23,6 +23,12 @@
871
23
#include <GLES2/gl2.h>
23
#include <GLES2/gl2.h>
872
24
#include <GLES2/gl2ext.h>
24
#include <GLES2/gl2ext.h>
873
25
25
874
26
#include <boost/throw_exception.hpp>
875
27
876
28
#include <stdexcept>
877
29
878
30
#include <string.h>
879
31
880
26
namespace mgm = mir::graphics::mesa;
32
namespace mgm = mir::graphics::mesa;
881
27
namespace geom = mir::geometry;
33
namespace geom = mir::geometry;
882
28
34
883
@@ -85,3 +91,10 @@
884
85
{
91
{
885
86
    return false;
92
    return false;
886
87
}
93
}
887
94
888
95
void mgm::ShmBuffer::write(unsigned char const* data, size_t data_size)
889
96
{
890
97
    if (data_size != stride_.as_uint32_t()*size().height.as_uint32_t())
891
98
        BOOST_THROW_EXCEPTION(std::logic_error("Size is not equal to number of pixels in buffer"));
892
99
    memcpy(pixels, data, data_size);
893
100
}
894
88
101
895
=== modified file 'src/platform/graphics/mesa/shm_buffer.h'
896
--- src/platform/graphics/mesa/shm_buffer.h	2014-09-10 12:50:53 +0000
897
+++ src/platform/graphics/mesa/shm_buffer.h	2014-09-18 16:04:44 +0000
898
@@ -49,6 +49,8 @@
899
49
    void gl_bind_to_texture() override;
49
    void gl_bind_to_texture() override;
900
50
    bool can_bypass() const;
50
    bool can_bypass() const;
901
51
51
902
52
    void write(unsigned char const* data, size_t size);
903
53
904
52
private:
54
private:
905
53
    ShmBuffer(ShmBuffer const&) = delete;
55
    ShmBuffer(ShmBuffer const&) = delete;
906
54
    ShmBuffer& operator=(ShmBuffer const&) = delete;
56
    ShmBuffer& operator=(ShmBuffer const&) = delete;
907
55
57
908
=== modified file 'src/platform/options/default_configuration.cpp'
909
--- src/platform/options/default_configuration.cpp	2014-09-10 12:50:53 +0000
910
+++ src/platform/options/default_configuration.cpp	2014-09-18 16:04:44 +0000
911
@@ -43,9 +43,9 @@
912
43
char const* const mo::frontend_threads_opt        = "ipc-thread-pool";
43
char const* const mo::frontend_threads_opt        = "ipc-thread-pool";
913
44
char const* const mo::name_opt                    = "name";
44
char const* const mo::name_opt                    = "name";
914
45
char const* const mo::offscreen_opt               = "offscreen";
45
char const* const mo::offscreen_opt               = "offscreen";
915
46
char const* const mo::touchspots_opt               = "enable-touchspots";
916
46
char const* const mo::fatal_abort_opt             = "on-fatal-error-abort";
47
char const* const mo::fatal_abort_opt             = "on-fatal-error-abort";
917
47
48
918
48
919
49
char const* const mo::glog                 = "glog";
49
char const* const mo::glog                 = "glog";
920
50
char const* const mo::glog_stderrthreshold = "glog-stderrthreshold";
50
char const* const mo::glog_stderrthreshold = "glog-stderrthreshold";
921
51
char const* const mo::glog_minloglevel     = "glog-minloglevel";
51
char const* const mo::glog_minloglevel     = "glog-minloglevel";
922
@@ -161,6 +161,8 @@
923
161
            "When nested, the name Mir uses when registering with the host.")
161
            "When nested, the name Mir uses when registering with the host.")
924
162
        (offscreen_opt,
162
        (offscreen_opt,
925
163
            "Render to offscreen buffers instead of the real outputs.")
163
            "Render to offscreen buffers instead of the real outputs.")
926
164
        (touchspots_opt,
927
165
            "Display visualization of touchspots (e.g. for screencasting).")
928
164
        (fatal_abort_opt, "On \"fatal error\" conditions [e.g. drivers behaving "
166
        (fatal_abort_opt, "On \"fatal error\" conditions [e.g. drivers behaving "
929
165
            "in unexpected ways] abort (to get a core dump)");
167
            "in unexpected ways] abort (to get a core dump)");
930
166
168
931
167
169
932
=== modified file 'src/platform/symbols.map'
933
--- src/platform/symbols.map	2014-09-10 12:50:53 +0000
934
+++ src/platform/symbols.map	2014-09-18 16:04:44 +0000
935
@@ -1,4 +1,4 @@
937
1
MIRPLATFORM_2 {
1
MIRPLATFORM_3 {
938
2
 global:
2
 global:
939
3
  extern "C++" {
3
  extern "C++" {
940
4
# The following symbols come from running a script over the generated docs. Vis:
4
# The following symbols come from running a script over the generated docs. Vis:
941
@@ -252,6 +252,7 @@
942
252
    mir::options::scene_report_opt*;
252
    mir::options::scene_report_opt*;
943
253
    mir::options::server_socket_opt*;
253
    mir::options::server_socket_opt*;
944
254
    mir::options::session_mediator_report_opt*;
254
    mir::options::session_mediator_report_opt*;
945
255
    mir::options::touchspots_opt*;
946
255
    typeinfo?for?mir::AbnormalExit;
256
    typeinfo?for?mir::AbnormalExit;
947
256
    typeinfo?for?mir::EmergencyCleanupRegistry;
257
    typeinfo?for?mir::EmergencyCleanupRegistry;
948
257
    typeinfo?for?mir::FatalErrorStrategy;
258
    typeinfo?for?mir::FatalErrorStrategy;
949
258
259
950
=== modified file 'src/server/graphics/default_configuration.cpp'
951
--- src/server/graphics/default_configuration.cpp	2014-09-10 12:50:53 +0000
952
+++ src/server/graphics/default_configuration.cpp	2014-09-18 16:04:44 +0000
953
@@ -106,6 +106,16 @@
954
106
        });
106
        });
955
107
}
107
}
956
108
108
957
109
std::shared_ptr<mg::BufferWriter>
958
110
mir::DefaultServerConfiguration::the_buffer_writer()
959
111
{
960
112
    return buffer_writer(
961
113
        [&]()
962
114
        {
963
115
            return the_graphics_platform()->make_buffer_writer();
964
116
        });
965
117
}
966
118
967
109
std::shared_ptr<mg::Display>
119
std::shared_ptr<mg::Display>
968
110
mir::DefaultServerConfiguration::the_display()
120
mir::DefaultServerConfiguration::the_display()
969
111
{
121
{
970
112
122
971
=== modified file 'src/server/graphics/nested/nested_platform.cpp'
972
--- src/server/graphics/nested/nested_platform.cpp	2014-09-10 12:50:53 +0000
973
+++ src/server/graphics/nested/nested_platform.cpp	2014-09-18 16:04:44 +0000
974
@@ -80,6 +80,11 @@
975
80
    return native_platform->create_buffer_allocator(buffer_initializer);
80
    return native_platform->create_buffer_allocator(buffer_initializer);
976
81
}
81
}
977
82
82
978
83
std::shared_ptr<mg::BufferWriter> mgn::NestedPlatform::make_buffer_writer()
979
84
{
980
85
    return native_platform->make_buffer_writer();
981
86
}
982
87
983
83
std::shared_ptr<mg::Display> mgn::NestedPlatform::create_display(
88
std::shared_ptr<mg::Display> mgn::NestedPlatform::create_display(
984
84
    std::shared_ptr<mg::DisplayConfigurationPolicy> const& conf_policy,
89
    std::shared_ptr<mg::DisplayConfigurationPolicy> const& conf_policy,
985
85
    std::shared_ptr<mg::GLProgramFactory> const&,
90
    std::shared_ptr<mg::GLProgramFactory> const&,
986
86
91
987
=== modified file 'src/server/graphics/nested/nested_platform.h'
988
--- src/server/graphics/nested/nested_platform.h	2014-09-10 12:50:53 +0000
989
+++ src/server/graphics/nested/nested_platform.h	2014-09-18 16:04:44 +0000
990
@@ -49,6 +49,7 @@
991
49
            std::shared_ptr<GLConfig> const& gl_config);
49
            std::shared_ptr<GLConfig> const& gl_config);
992
50
    std::shared_ptr<PlatformIPCPackage> get_ipc_package() override;
50
    std::shared_ptr<PlatformIPCPackage> get_ipc_package() override;
993
51
    std::shared_ptr<InternalClient> create_internal_client() override;
51
    std::shared_ptr<InternalClient> create_internal_client() override;
994
52
    std::shared_ptr<BufferWriter> make_buffer_writer() override;
995
52
    void fill_buffer_package(
53
    void fill_buffer_package(
996
53
        BufferIPCPacker* packer, Buffer const* Buffer, BufferIpcMsgType msg_type) const override;
54
        BufferIPCPacker* packer, Buffer const* Buffer, BufferIpcMsgType msg_type) const override;
997
54
    EGLNativeDisplayType egl_native_display() const;
55
    EGLNativeDisplayType egl_native_display() const;
998
55
56
999
=== modified file 'src/server/input/CMakeLists.txt'
1000
--- src/server/input/CMakeLists.txt	2014-09-10 12:50:53 +0000
1001
+++ src/server/input/CMakeLists.txt	2014-09-18 16:04:44 +0000
1002
@@ -16,6 +16,7 @@
1003
16
  default_configuration.cpp
16
  default_configuration.cpp
1004
17
  xcursor_loader.cpp
17
  xcursor_loader.cpp
1005
18
  builtin_cursor_images.cpp
18
  builtin_cursor_images.cpp
1006
19
  touchspot_controller.cpp
1007
19
)
20
)
1008
20
21
1009
21
add_subdirectory(android)
22
add_subdirectory(android)
1010
22
23
1011
=== modified file 'src/server/input/android/android_input_registrar.cpp'
1012
--- src/server/input/android/android_input_registrar.cpp	2014-09-10 12:50:53 +0000
1013
+++ src/server/input/android/android_input_registrar.cpp	2014-09-18 16:04:44 +0000
1014
@@ -123,3 +123,7 @@
1015
123
{
123
{
1016
124
    remove(surface);
124
    remove(surface);
1017
125
}
125
}
1018
126
1019
127
void mia::InputRegistrar::SceneObserver::scene_changed()
1020
128
{
1021
129
}
1022
126
130
1023
=== modified file 'src/server/input/android/android_input_registrar.h'
1024
--- src/server/input/android/android_input_registrar.h	2014-09-10 12:50:53 +0000
1025
+++ src/server/input/android/android_input_registrar.h	2014-09-18 16:04:44 +0000
1026
@@ -73,6 +73,7 @@
1027
73
        void surface_added(scene::Surface* surface) override;
73
        void surface_added(scene::Surface* surface) override;
1028
74
        void surface_removed(scene::Surface* surface) override;
74
        void surface_removed(scene::Surface* surface) override;
1029
75
        void surface_exists(scene::Surface* surface) override;
75
        void surface_exists(scene::Surface* surface) override;
1030
76
        void scene_changed() override;
1031
76
77
1032
77
        SurfaceCallback add, remove;
78
        SurfaceCallback add, remove;
1033
78
    };
79
    };
1034
79
80
1035
=== modified file 'src/server/input/android/android_input_target_enumerator.cpp'
1036
--- src/server/input/android/android_input_target_enumerator.cpp	2014-09-10 12:50:53 +0000
1037
+++ src/server/input/android/android_input_target_enumerator.cpp	2014-09-18 16:04:44 +0000
1038
@@ -20,7 +20,7 @@
1039
20
20
1040
21
#include "android_window_handle_repository.h"
21
#include "android_window_handle_repository.h"
1041
22
22
1043
23
#include "mir/input/input_targets.h"
23
#include "mir/input/scene.h"
1044
24
#include "mir/input/surface.h"
24
#include "mir/input/surface.h"
1045
25
25
1046
26
#include <InputWindow.h>
26
#include <InputWindow.h>
1047
@@ -28,9 +28,9 @@
1048
28
namespace mi = mir::input;
28
namespace mi = mir::input;
1049
29
namespace mia = mi::android;
29
namespace mia = mi::android;
1050
30
30
1052
31
mia::InputTargetEnumerator::InputTargetEnumerator(std::shared_ptr<mi::InputTargets> const& targets,
31
mia::InputTargetEnumerator::InputTargetEnumerator(std::shared_ptr<mi::Scene> const& scene,
1053
32
                                                  std::shared_ptr<mia::WindowHandleRepository> const& repository)
32
                                                  std::shared_ptr<mia::WindowHandleRepository> const& repository)
1055
33
    : targets(targets),
33
    : scene(scene),
1056
34
      repository(repository)
34
      repository(repository)
1057
35
{
35
{
1058
36
}
36
}
1059
@@ -41,7 +41,7 @@
1060
41
41
1061
42
void mia::InputTargetEnumerator::for_each(std::function<void(droidinput::sp<droidinput::InputWindowHandle> const&)> const& callback)
42
void mia::InputTargetEnumerator::for_each(std::function<void(droidinput::sp<droidinput::InputWindowHandle> const&)> const& callback)
1062
43
{
43
{
1064
44
    targets->for_each(
44
    scene->for_each(
1065
45
        [&callback, this](std::shared_ptr<mi::Surface> const& target)
45
        [&callback, this](std::shared_ptr<mi::Surface> const& target)
1066
46
        {
46
        {
1067
47
            auto handle = repository->handle_for_channel(target->input_channel());
47
            auto handle = repository->handle_for_channel(target->input_channel());
1068
48
48
1069
=== modified file 'src/server/input/android/android_input_target_enumerator.h'
1070
--- src/server/input/android/android_input_target_enumerator.h	2014-09-10 12:50:53 +0000
1071
+++ src/server/input/android/android_input_target_enumerator.h	2014-09-18 16:04:44 +0000
1072
@@ -41,7 +41,7 @@
1073
41
}
41
}
1074
42
namespace input
42
namespace input
1075
43
{
43
{
1077
44
class InputTargets;
44
class Scene;
1078
45
namespace android
45
namespace android
1079
46
{
46
{
1080
47
class WindowHandleRepository;
47
class WindowHandleRepository;
1081
@@ -49,14 +49,14 @@
1082
49
class InputTargetEnumerator : public droidinput::InputEnumerator
49
class InputTargetEnumerator : public droidinput::InputEnumerator
1083
50
{
50
{
1084
51
public:
51
public:
1086
52
    explicit InputTargetEnumerator(std::shared_ptr<input::InputTargets> const& targets,
52
    explicit InputTargetEnumerator(std::shared_ptr<input::Scene> const& scene,
1087
53
                                   std::shared_ptr<WindowHandleRepository> const& repository);
53
                                   std::shared_ptr<WindowHandleRepository> const& repository);
1088
54
    virtual ~InputTargetEnumerator() noexcept(true);
54
    virtual ~InputTargetEnumerator() noexcept(true);
1089
55
55
1090
56
    void for_each(std::function<void(droidinput::sp<droidinput::InputWindowHandle> const&)> const& callback);
56
    void for_each(std::function<void(droidinput::sp<droidinput::InputWindowHandle> const&)> const& callback);
1091
57
57
1092
58
private:
58
private:
1094
59
    std::shared_ptr<input::InputTargets> const targets;
59
    std::shared_ptr<input::Scene> const scene;
1095
60
    std::shared_ptr<input::android::WindowHandleRepository> const repository;
60
    std::shared_ptr<input::android::WindowHandleRepository> const repository;
1096
61
};
61
};
1097
62
62
1098
63
63
1099
=== modified file 'src/server/input/android/input_sender.cpp'
1100
--- src/server/input/android/input_sender.cpp	2014-09-10 12:50:53 +0000
1101
+++ src/server/input/android/input_sender.cpp	2014-09-18 16:04:44 +0000
1102
@@ -83,8 +83,12 @@
1103
83
    surface_added(surface);
83
    surface_added(surface);
1104
84
}
84
}
1105
85
85
1108
86
86
void mia::InputSender::SceneObserver::scene_changed()
1109
87
void mia::InputSender::SceneObserver::remove_transfer_for(mir::input::Surface * surface)
87
{
1110
88
}
1111
89
1112
90
1113
91
void mia::InputSender::SceneObserver::remove_transfer_for(mi::Surface * surface)
1114
88
{
92
{
1115
89
    std::shared_ptr<InputChannel> closed_channel = surface->input_channel();
93
    std::shared_ptr<InputChannel> closed_channel = surface->input_channel();
1116
90
94
1117
@@ -96,7 +100,7 @@
1118
96
}
100
}
1119
97
101
1120
98
mia::InputSender::InputSenderState::InputSenderState(std::shared_ptr<mir::MainLoop> const& main_loop,
102
mia::InputSender::InputSenderState::InputSenderState(std::shared_ptr<mir::MainLoop> const& main_loop,
1122
99
                                                     std::shared_ptr<mir::input::InputSendObserver> const& observer,
103
                                                     std::shared_ptr<mi::InputSendObserver> const& observer,
1123
100
                                                     std::shared_ptr<InputReport> const& report)
104
                                                     std::shared_ptr<InputReport> const& report)
1124
101
    : main_loop{main_loop}, report{report}, observer{observer}, seq{}
105
    : main_loop{main_loop}, report{report}, observer{observer}, seq{}
1125
102
{
106
{
1126
@@ -131,7 +135,7 @@
1127
131
    transfer->send(std::move(entry));
135
    transfer->send(std::move(entry));
1128
132
}
136
}
1129
133
137
1131
134
void mia::InputSender::InputSenderState::add_transfer(int fd, mir::input::Surface * surface)
138
void mia::InputSender::InputSenderState::add_transfer(int fd, mi::Surface * surface)
1132
135
{
139
{
1133
136
    std::lock_guard<std::mutex> lock(sender_mutex);
140
    std::lock_guard<std::mutex> lock(sender_mutex);
1134
137
    std::shared_ptr<ActiveTransfer> transfer{get_transfer(fd)};
141
    std::shared_ptr<ActiveTransfer> transfer{get_transfer(fd)};
1135
@@ -163,7 +167,7 @@
1136
163
    return seq;
167
    return seq;
1137
164
}
168
}
1138
165
169
1140
166
mia::InputSender::ActiveTransfer::ActiveTransfer(InputSenderState & state, int server_fd, mir::input::Surface* surface) :
170
mia::InputSender::ActiveTransfer::ActiveTransfer(InputSenderState & state, int server_fd, mi::Surface* surface) :
1141
167
    state(state),
171
    state(state),
1142
168
    publisher{droidinput::sp<droidinput::InputChannel>(
172
    publisher{droidinput::sp<droidinput::InputChannel>(
1143
169
            new droidinput::InputChannel(droidinput::String8(surface->name()), server_fd))},
173
            new droidinput::InputChannel(droidinput::String8(surface->name()), server_fd))},
1144
170
174
1145
=== modified file 'src/server/input/android/input_sender.h'
1146
--- src/server/input/android/input_sender.h	2014-09-10 12:50:53 +0000
1147
+++ src/server/input/android/input_sender.h	2014-09-18 16:04:44 +0000
1148
@@ -76,6 +76,7 @@
1149
76
        void surface_added(scene::Surface* surface) override;
76
        void surface_added(scene::Surface* surface) override;
1150
77
        void surface_removed(scene::Surface* surface) override;
77
        void surface_removed(scene::Surface* surface) override;
1151
78
        void surface_exists(scene::Surface* surface) override;
78
        void surface_exists(scene::Surface* surface) override;
1152
79
        void scene_changed() override;
1153
79
80
1154
80
        void remove_transfer_for(input::Surface* surface);
81
        void remove_transfer_for(input::Surface* surface);
1155
81
        InputSenderState & state;
82
        InputSenderState & state;
1156
82
83
1157
=== modified file 'src/server/input/cursor_controller.cpp'
1158
--- src/server/input/cursor_controller.cpp	2014-06-23 02:57:39 +0000
1159
+++ src/server/input/cursor_controller.cpp	2014-09-18 16:04:44 +0000
1160
@@ -18,7 +18,7 @@
1161
18
18
1162
19
#include "cursor_controller.h"
19
#include "cursor_controller.h"
1163
20
20
1165
21
#include "mir/input/input_targets.h"
21
#include "mir/input/scene.h"
1166
22
#include "mir/input/surface.h"
22
#include "mir/input/surface.h"
1167
23
#include "mir/graphics/cursor.h"
23
#include "mir/graphics/cursor.h"
1168
24
#include "mir/scene/observer.h"
24
#include "mir/scene/observer.h"
1169
@@ -130,6 +130,11 @@
1170
130
    {
130
    {
1171
131
        cursor_controller->update_cursor_image();
131
        cursor_controller->update_cursor_image();
1172
132
    }
132
    }
1173
133
1174
134
    void scene_changed()
1175
135
    {
1176
136
        cursor_controller->update_cursor_image();
1177
137
    }
1178
133
    
138
    
1179
134
    void surface_exists(ms::Surface *surface)
139
    void surface_exists(ms::Surface *surface)
1180
135
    {
140
    {
1181
@@ -157,7 +162,7 @@
1182
157
};
162
};
1183
158
163
1184
159
std::shared_ptr<mi::Surface> topmost_surface_containing_point(
164
std::shared_ptr<mi::Surface> topmost_surface_containing_point(
1186
160
    std::shared_ptr<mi::InputTargets> const& targets, geom::Point const& point)
165
    std::shared_ptr<mi::Scene> const& targets, geom::Point const& point)
1187
161
{
166
{
1188
162
    std::shared_ptr<mi::Surface> top_surface_at_point;
167
    std::shared_ptr<mi::Surface> top_surface_at_point;
1189
163
    targets->for_each([&top_surface_at_point, &point]
168
    targets->for_each([&top_surface_at_point, &point]
1190
@@ -171,7 +176,7 @@
1191
171
176
1192
172
}
177
}
1193
173
178
1195
174
mi::CursorController::CursorController(std::shared_ptr<mi::InputTargets> const& input_targets,
179
mi::CursorController::CursorController(std::shared_ptr<mi::Scene> const& input_targets,
1196
175
    std::shared_ptr<mg::Cursor> const& cursor,
180
    std::shared_ptr<mg::Cursor> const& cursor,
1197
176
    std::shared_ptr<mg::CursorImage> const& default_cursor_image) :
181
    std::shared_ptr<mg::CursorImage> const& default_cursor_image) :
1198
177
        input_targets(input_targets),
182
        input_targets(input_targets),
1199
178
183
1200
=== modified file 'src/server/input/cursor_controller.h'
1201
--- src/server/input/cursor_controller.h	2014-06-11 17:42:49 +0000
1202
+++ src/server/input/cursor_controller.h	2014-09-18 16:04:44 +0000
1203
@@ -39,12 +39,12 @@
1204
39
39
1205
40
namespace input
40
namespace input
1206
41
{
41
{
1208
42
class InputTargets;
42
class Scene;
1209
43
43
1210
44
class CursorController : public CursorListener
44
class CursorController : public CursorListener
1211
45
{
45
{
1212
46
public:
46
public:
1214
47
    CursorController(std::shared_ptr<InputTargets> const& input_targets,
47
    CursorController(std::shared_ptr<Scene> const& input_targets,
1215
48
        std::shared_ptr<graphics::Cursor> const& cursor,
48
        std::shared_ptr<graphics::Cursor> const& cursor,
1216
49
        std::shared_ptr<graphics::CursorImage> const& default_cursor_image);
49
        std::shared_ptr<graphics::CursorImage> const& default_cursor_image);
1217
50
    virtual ~CursorController();
50
    virtual ~CursorController();
1218
@@ -56,7 +56,7 @@
1219
56
    void update_cursor_image();
56
    void update_cursor_image();
1220
57
57
1221
58
private:
58
private:
1223
59
    std::shared_ptr<InputTargets> const input_targets;
59
    std::shared_ptr<Scene> const input_targets;
1224
60
    std::shared_ptr<graphics::Cursor> const cursor;
60
    std::shared_ptr<graphics::Cursor> const cursor;
1225
61
    std::shared_ptr<graphics::CursorImage> const default_cursor_image;
61
    std::shared_ptr<graphics::CursorImage> const default_cursor_image;
1226
62
62
1227
63
63
1228
=== modified file 'src/server/input/default_configuration.cpp'
1229
--- src/server/input/default_configuration.cpp	2014-09-10 12:50:53 +0000
1230
+++ src/server/input/default_configuration.cpp	2014-09-18 16:04:44 +0000
1231
@@ -30,6 +30,7 @@
1232
30
#include "event_filter_chain.h"
30
#include "event_filter_chain.h"
1233
31
#include "null_input_configuration.h"
31
#include "null_input_configuration.h"
1234
32
#include "cursor_controller.h"
32
#include "cursor_controller.h"
1235
33
#include "touchspot_controller.h"
1236
33
#include "null_input_dispatcher.h"
34
#include "null_input_dispatcher.h"
1237
34
#include "null_input_targeter.h"
35
#include "null_input_targeter.h"
1238
35
#include "xcursor_loader.h"
36
#include "xcursor_loader.h"
1239
@@ -114,7 +115,7 @@
1240
114
            auto dispatcher = std::make_shared<droidinput::InputDispatcher>(
115
            auto dispatcher = std::make_shared<droidinput::InputDispatcher>(
1241
115
                the_dispatcher_policy(),
116
                the_dispatcher_policy(),
1242
116
                the_input_report(),
117
                the_input_report(),
1244
117
                std::make_shared<mia::InputTargetEnumerator>(the_input_targets(), registrar));
118
                std::make_shared<mia::InputTargetEnumerator>(the_input_scene(), registrar));
1245
118
            registrar->set_dispatcher(dispatcher);
119
            registrar->set_dispatcher(dispatcher);
1246
119
            return dispatcher;
120
            return dispatcher;
1247
120
        });
121
        });
1248
@@ -234,7 +235,7 @@
1249
234
    return cursor_listener(
235
    return cursor_listener(
1250
235
        [this]() -> std::shared_ptr<mi::CursorListener>
236
        [this]() -> std::shared_ptr<mi::CursorListener>
1251
236
        {
237
        {
1253
237
            return std::make_shared<mi::CursorController>(the_input_targets(), 
238
            return std::make_shared<mi::CursorController>(the_input_scene(), 
1254
238
                the_cursor(), the_default_cursor_image());
239
                the_cursor(), the_default_cursor_image());
1255
239
        });
240
        });
1256
240
241
1257
@@ -243,16 +244,21 @@
1258
243
std::shared_ptr<mi::TouchVisualizer>
244
std::shared_ptr<mi::TouchVisualizer>
1259
244
mir::DefaultServerConfiguration::the_touch_visualizer()
245
mir::DefaultServerConfiguration::the_touch_visualizer()
1260
245
{
246
{
1261
246
    struct NullTouchVisualizer : public mi::TouchVisualizer
1262
247
    {
1263
248
        void visualize_touches(std::vector<Spot> const& /* touches */) override
1264
249
        {
1265
250
        }
1266
251
    };
1267
252
    return touch_visualizer(
247
    return touch_visualizer(
1269
253
        [this]()
248
        [this]() -> std::shared_ptr<mi::TouchVisualizer>
1270
254
        {
249
        {
1272
255
            return std::make_shared<NullTouchVisualizer>();
250
            auto visualizer = std::make_shared<mi::TouchspotController>(the_buffer_allocator(), the_buffer_writer(),
1273
251
                the_input_scene());
1274
252
1275
253
            // The visualizer is disabled by default and can be enabled statically via
1276
254
            // the MIR_SERVER_ENABLE_TOUCHSPOTS option. In the USC/unity8/autopilot case
1277
255
            // it will be toggled at runtime via com.canonical.Unity.Screen DBus interface
1278
256
            if (the_options()->is_set(options::touchspots_opt))
1279
257
            {
1280
258
                visualizer->enable();
1281
259
            }
1282
260
            
1283
261
            return visualizer;
1284
256
        });
262
        });
1285
257
}
263
}
1286
258
264
1287
259
265
1288
=== added file 'src/server/input/touchspot_controller.cpp'
1289
--- src/server/input/touchspot_controller.cpp	1970-01-01 00:00:00 +0000
1290
+++ src/server/input/touchspot_controller.cpp	2014-09-18 16:04:44 +0000
1291
@@ -0,0 +1,166 @@
1292
1
/*
1293
2
 * Copyright © 2014 Canonical Ltd.
1294
3
 *
1295
4
 * This program is free software: you can redistribute it and/or modify it
1296
5
 * under the terms of the GNU General Public License version 3,
1297
6
 * as published by the Free Software Foundation.
1298
7
 *
1299
8
 * This program is distributed in the hope that it will be useful,
1300
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1301
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1302
11
 * GNU General Public License for more details.
1303
12
 *
1304
13
 * You should have received a copy of the GNU General Public License
1305
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1306
15
 *
1307
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
1308
17
 */
1309
18
1310
19
#include "touchspot_controller.h"
1311
20
#include "touchspot_image.c"
1312
21
1313
22
#include "mir/graphics/graphic_buffer_allocator.h"
1314
23
#include "mir/graphics/buffer_properties.h"
1315
24
#include "mir/graphics/buffer.h"
1316
25
#include "mir/graphics/buffer_writer.h"
1317
26
#include "mir/graphics/renderable.h"
1318
27
#include "mir/geometry/dimensions.h"
1319
28
#include "mir/input/scene.h"
1320
29
1321
30
namespace mi = mir::input;
1322
31
namespace mg = mir::graphics;
1323
32
namespace geom = mir::geometry;
1324
33
1325
34
namespace
1326
35
{
1327
36
geom::Size const touchspot_size = {touchspot_image.width, touchspot_image.height};
1328
37
MirPixelFormat const touchspot_pixel_format = mir_pixel_format_argb_8888;
1329
38
}
1330
39
1331
40
class mi::TouchspotRenderable : public mg::Renderable
1332
41
{
1333
42
public:
1334
43
    TouchspotRenderable(std::shared_ptr<mg::Buffer> const& buffer)
1335
44
        : buffer_(buffer),
1336
45
          position({0, 0})
1337
46
    {
1338
47
    }
1339
48
1340
49
// mg::Renderable
1341
50
    mg::Renderable::ID id() const override
1342
51
    {
1343
52
        return this;
1344
53
    }
1345
54
    
1346
55
    std::shared_ptr<mg::Buffer> buffer() const override
1347
56
    {
1348
57
        return buffer_;
1349
58
    }
1350
59
    
1351
60
    bool alpha_enabled() const override
1352
61
    {
1353
62
        return false;
1354
63
    }
1355
64
1356
65
    geom::Rectangle screen_position() const
1357
66
    {
1358
67
        return {position, buffer_->size()};
1359
68
    }
1360
69
    
1361
70
    float alpha() const
1362
71
    {
1363
72
        return 1.0;
1364
73
    }
1365
74
    
1366
75
    glm::mat4 transformation() const
1367
76
    {
1368
77
        return glm::mat4();
1369
78
    }
1370
79
1371
80
    bool visible() const
1372
81
    {
1373
82
        return true;
1374
83
    }
1375
84
    
1376
85
    bool shaped() const
1377
86
    {
1378
87
        return true;
1379
88
    }
1380
89
1381
90
    int buffers_ready_for_compositor() const
1382
91
    {
1383
92
        return 1;
1384
93
    }
1385
94
    
1386
95
// TouchspotRenderable    
1387
96
    void move_center_to(geom::Point pos)
1388
97
    {
1389
98
        std::lock_guard<std::mutex> lg(guard);
1390
99
        position = {pos.x.as_int() - touchspot_image.width/2, pos.y.as_int() - touchspot_image.height/2};
1391
100
    }
1392
101
1393
102
    
1394
103
private:
1395
104
    std::shared_ptr<mg::Buffer> const buffer_;
1396
105
    
1397
106
    std::mutex guard;
1398
107
    geom::Point position;
1399
108
};
1400
109
1401
110
1402
111
mi::TouchspotController::TouchspotController(std::shared_ptr<mg::GraphicBufferAllocator> const& allocator,
1403
112
    std::shared_ptr<mg::BufferWriter> const& buffer_writer,
1404
113
    std::shared_ptr<mi::Scene> const& scene)
1405
114
    : touchspot_buffer(allocator->alloc_buffer({touchspot_size, touchspot_pixel_format, mg::BufferUsage::software})),
1406
115
      scene(scene),
1407
116
      enabled(false),
1408
117
      renderables_in_use(0)
1409
118
{
1410
119
    unsigned int const pixels_size = touchspot_size.width.as_uint32_t()*touchspot_size.height.as_uint32_t() *
1411
120
        MIR_BYTES_PER_PIXEL(touchspot_pixel_format);
1412
121
    
1413
122
    buffer_writer->write(*touchspot_buffer, touchspot_image.pixel_data, pixels_size);
1414
123
}
1415
124
1416
125
void mi::TouchspotController::visualize_touches(std::vector<Spot> const& touches)
1417
126
{
1418
127
    {
1419
128
    std::lock_guard<std::mutex> lg(guard);
1420
129
    
1421
130
    unsigned int const num_touches = enabled ? touches.size() : 0;
1422
131
1423
132
    while (touchspot_renderables.size() < num_touches)
1424
133
        touchspot_renderables.push_back(std::make_shared<TouchspotRenderable>(touchspot_buffer));
1425
134
    
1426
135
    for (unsigned int i = 0; i < num_touches; i++)
1427
136
    {
1428
137
        auto const& renderable = touchspot_renderables[i];
1429
138
        
1430
139
        renderable->move_center_to(touches[i].touch_location);
1431
140
        if (i >= renderables_in_use)
1432
141
            scene->add_input_visualization(renderable);
1433
142
    }
1434
143
    
1435
144
    for (unsigned int i = num_touches; i < renderables_in_use; i++)
1436
145
        scene->remove_input_visualization(touchspot_renderables[i]);
1437
146
    
1438
147
    renderables_in_use = num_touches;
1439
148
    } // release mutex
1440
149
1441
150
    // TODO (hackish): We may have just moved renderables which with the current
1442
151
    // architecture of surface observers will not trigger a propagation to the
1443
152
    // compositor damage callback we need this "emit_scene_changed".
1444
153
    scene->emit_scene_changed();
1445
154
}
1446
155
1447
156
void mi::TouchspotController::enable()
1448
157
{
1449
158
    std::lock_guard<std::mutex> lg(guard);
1450
159
    enabled = true;
1451
160
}
1452
161
1453
162
void mi::TouchspotController::disable()
1454
163
{
1455
164
    std::lock_guard<std::mutex> lg(guard);
1456
165
    enabled = false;
1457
166
}
1458
0
167
1459
=== added file 'src/server/input/touchspot_controller.h'
1460
--- src/server/input/touchspot_controller.h	1970-01-01 00:00:00 +0000
1461
+++ src/server/input/touchspot_controller.h	2014-09-18 16:04:44 +0000
1462
@@ -0,0 +1,77 @@
1463
1
/*
1464
2
 * Copyright © 2014 Canonical Ltd.
1465
3
 *
1466
4
 * This program is free software: you can redistribute it and/or modify it
1467
5
 * under the terms of the GNU General Public License version 3,
1468
6
 * as published by the Free Software Foundation.
1469
7
 *
1470
8
 * This program is distributed in the hope that it will be useful,
1471
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1472
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1473
11
 * GNU General Public License for more details.
1474
12
 *
1475
13
 * You should have received a copy of the GNU General Public License
1476
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1477
15
 *
1478
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
1479
17
 */
1480
18
1481
19
#ifndef MIR_INPUT_TOUCHSPOT_CONTROLLER_H_
1482
20
#define MIR_INPUT_TOUCHSPOT_CONTROLLER_H_
1483
21
1484
22
#include "mir/input/touch_visualizer.h"
1485
23
1486
24
#include <memory>
1487
25
#include <mutex>
1488
26
1489
27
namespace mir
1490
28
{
1491
29
namespace graphics
1492
30
{
1493
31
class GraphicBufferAllocator;
1494
32
class Buffer;
1495
33
class BufferWriter;
1496
34
class Renderable;
1497
35
}
1498
36
namespace input
1499
37
{
1500
38
class Scene;
1501
39
class TouchspotRenderable;
1502
40
1503
41
/// Receives touchspot events out of the input stack and manages appearance
1504
42
/// of touchspot renderables for visualization. Touchspot visualization is 
1505
43
/// disabled by default and must be enabled through a call to ::enable.
1506
44
class TouchspotController : public TouchVisualizer
1507
45
{
1508
46
public:
1509
47
    TouchspotController(std::shared_ptr<graphics::GraphicBufferAllocator> const& allocator,
1510
48
        std::shared_ptr<graphics::BufferWriter> const& writer,
1511
49
        std::shared_ptr<input::Scene> const& scene);
1512
50
1513
51
    virtual ~TouchspotController() = default;
1514
52
    
1515
53
    void enable() override;
1516
54
    void disable() override;
1517
55
1518
56
    void visualize_touches(std::vector<Spot> const& touches) override;
1519
57
1520
58
protected:
1521
59
    TouchspotController(TouchspotController const&) = delete;
1522
60
    TouchspotController& operator=(TouchspotController const&) = delete;
1523
61
1524
62
private:
1525
63
    std::shared_ptr<graphics::Buffer> touchspot_buffer;
1526
64
    std::shared_ptr<Scene> scene;
1527
65
    
1528
66
    std::mutex guard;
1529
67
1530
68
    bool enabled;
1531
69
1532
70
    unsigned int renderables_in_use;
1533
71
    std::vector<std::shared_ptr<TouchspotRenderable>> touchspot_renderables;
1534
72
};
1535
73
1536
74
}
1537
75
}
1538
76
1539
77
#endif // MIR_INPUT_TOUCHSPOT_CONTROLLER_H_
1540
0
78
1541
=== added file 'src/server/input/touchspot_image.c'
1542
--- src/server/input/touchspot_image.c	1970-01-01 00:00:00 +0000
1543
+++ src/server/input/touchspot_image.c	2014-09-18 16:04:44 +0000
1544
@@ -0,0 +1,1034 @@
1545
1
/* GIMP RGBA C-Source image dump (spot.c) */
1546
2
1547
3
static const struct {
1548
4
  unsigned int 	 width;
1549
5
  unsigned int 	 height;
1550
6
  unsigned int 	 bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */ 
1551
7
  unsigned char	 pixel_data[64 * 64 * 4 + 1];
1552
8
} touchspot_image = {
1553
9
  64, 64, 4,
1554
10
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1555
11
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1556
12
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1557
13
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1558
14
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1559
15
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1560
16
0,0,0,5,0,0,0,65,0,0,0,104,0,0,0,129,
1561
17
0,0,0,154,0,0,0,179,0,0,0,204,0,0,0,230,
1562
18
0,0,0,230,0,0,0,204,0,0,0,179,0,0,0,154,
1563
19
0,0,0,129,0,0,0,104,0,0,0,65,0,0,0,5,
1564
20
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1565
21
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1566
22
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1567
23
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1568
24
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1569
25
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1570
26
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1571
27
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1572
28
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1573
29
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1574
30
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1575
31
0,0,0,0,0,0,0,15,0,0,0,88,0,0,0,166,
1576
32
0,0,0,240,0,0,0,255,0,0,0,255,0,0,0,255,
1577
33
0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
1578
34
0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
1579
35
0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,240,
1580
36
0,0,0,166,0,0,0,88,0,0,0,15,0,0,0,0,
1581
37
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1582
38
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1583
39
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1584
40
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1585
41
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1586
42
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1587
43
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1588
44
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1589
45
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1590
46
0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,95,
1591
47
0,0,0,187,0,0,0,250,0,0,0,255,0,0,0,255,
1592
48
0,0,0,255,0,15,28,255,0,45,82,255,0,60,108,255,
1593
49
0,75,135,255,0,89,161,255,0,104,188,255,0,119,215,255,
1594
50
0,119,215,255,0,104,188,255,0,89,161,255,0,75,135,255,
1595
51
0,60,108,255,0,45,82,255,0,15,28,255,0,0,0,255,
1596
52
0,0,0,255,0,0,0,255,0,0,0,250,0,0,0,187,
1597
53
0,0,0,95,0,0,0,3,0,0,0,0,0,0,0,0,
1598
54
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1599
55
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1600
56
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1601
57
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1602
58
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1603
59
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1604
60
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1605
61
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1606
62
0,0,0,0,0,0,0,83,0,0,0,215,0,0,0,255,
1607
63
0,0,0,255,0,0,0,255,0,27,49,255,0,70,126,255,
1608
64
0,112,203,255,0,139,251,255,0,139,251,255,0,139,251,255,
1609
65
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1610
66
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1611
67
0,139,251,255,0,139,251,255,0,139,251,255,0,112,203,255,
1612
68
0,70,126,255,0,27,49,255,0,0,0,255,0,0,0,255,
1613
69
0,0,0,255,0,0,0,215,0,0,0,83,0,0,0,0,
1614
70
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1615
71
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1616
72
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1617
73
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1618
74
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1619
75
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1620
76
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1621
77
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,69,
1622
78
0,0,0,203,0,0,0,255,0,0,0,255,0,12,22,255,
1623
79
0,77,139,255,0,124,223,255,0,139,251,255,0,139,251,255,
1624
80
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1625
81
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1626
82
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1627
83
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1628
84
0,139,251,255,0,139,251,255,0,124,223,255,0,77,139,255,
1629
85
0,13,23,255,0,0,0,255,0,0,0,255,0,0,0,203,
1630
86
0,0,0,69,0,0,0,0,0,0,0,0,0,0,0,0,
1631
87
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1632
88
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1633
89
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1634
90
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1635
91
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1636
92
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1637
93
0,0,0,0,0,0,0,24,0,0,0,187,0,0,0,255,
1638
94
0,0,0,255,0,8,14,255,0,71,128,255,0,133,240,255,
1639
95
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1640
96
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1641
97
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1642
98
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1643
99
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1644
100
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1645
101
0,133,240,255,0,72,130,255,0,8,15,255,0,0,0,255,
1646
102
0,0,0,255,0,0,0,187,0,0,0,24,0,0,0,0,
1647
103
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1648
104
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1649
105
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1650
106
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1651
107
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1652
108
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1653
109
0,0,0,53,0,0,0,228,0,0,0,255,0,4,7,255,
1654
110
0,62,112,255,0,129,232,255,0,139,251,255,0,139,251,255,
1655
111
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1656
112
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1657
113
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1658
114
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1659
115
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1660
116
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1661
117
0,139,251,255,0,139,251,255,0,129,233,255,0,63,114,255,
1662
118
0,4,8,255,0,0,0,255,0,0,0,228,0,0,0,53,
1663
119
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1664
120
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1665
121
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1666
122
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1667
123
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1668
124
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,
1669
125
0,0,0,247,0,0,0,255,0,28,51,255,0,122,220,255,
1670
126
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1671
127
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1672
128
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1673
129
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1674
130
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1675
131
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1676
132
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1677
133
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1678
134
0,123,221,255,0,28,50,255,0,0,0,255,0,0,0,247,
1679
135
0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,
1680
136
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1681
137
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1682
138
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1683
139
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1684
140
0,0,0,0,0,0,0,3,0,0,0,140,0,0,0,255,
1685
141
0,0,0,255,0,49,89,255,0,134,242,255,0,139,251,255,
1686
142
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1687
143
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1688
144
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1689
145
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1690
146
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1691
147
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1692
148
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1693
149
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1694
150
0,139,251,255,0,134,242,255,0,47,86,255,0,0,0,255,
1695
151
0,0,0,255,0,0,0,140,0,0,0,3,0,0,0,0,
1696
152
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1697
153
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1698
154
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1699
155
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1700
156
0,0,0,5,0,0,0,181,0,0,0,255,0,1,2,255,
1701
157
0,74,133,255,0,139,251,255,0,139,251,255,0,139,251,255,
1702
158
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1703
159
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1704
160
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1705
161
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1706
162
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1707
163
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1708
164
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1709
165
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1710
166
0,139,251,255,0,139,251,255,0,139,251,255,0,71,129,255,
1711
167
0,1,1,255,0,0,0,255,0,0,0,178,0,0,0,3,
1712
168
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1713
169
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1714
170
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1715
171
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1716
172
0,0,0,151,0,0,0,255,0,7,14,255,0,98,177,255,
1717
173
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1718
174
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1719
175
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1720
176
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1721
177
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1722
178
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1723
179
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1724
180
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1725
181
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1726
182
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1727
183
0,95,172,255,0,6,12,255,0,0,0,255,0,0,0,143,
1728
184
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1729
185
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1730
186
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1731
187
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,103,
1732
188
0,0,0,255,0,2,4,255,0,105,189,255,0,139,251,255,
1733
189
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1734
190
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1735
191
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1736
192
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1737
193
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1738
194
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1739
195
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1740
196
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1741
197
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1742
198
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1743
199
0,139,251,255,0,101,182,255,0,2,3,255,0,0,0,255,
1744
200
0,0,0,95,0,0,0,0,0,0,0,0,0,0,0,0,
1745
201
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1746
202
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1747
203
0,0,0,0,0,0,0,0,0,0,0,61,0,0,0,250,
1748
204
0,0,0,255,0,81,147,255,0,139,251,255,0,139,251,255,
1749
205
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1750
206
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1751
207
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1752
208
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1753
209
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1754
210
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1755
211
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1756
212
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1757
213
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1758
214
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1759
215
0,139,251,255,0,139,251,255,0,76,138,255,0,0,0,255,
1760
216
0,0,0,248,0,0,0,55,0,0,0,0,0,0,0,0,
1761
217
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1762
218
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1763
219
0,0,0,0,0,0,0,30,0,0,0,234,0,0,0,255,
1764
220
0,56,100,255,0,139,251,255,0,139,251,255,0,139,251,255,
1765
221
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1766
222
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1767
223
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1768
224
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1769
225
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1770
226
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1771
227
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1772
228
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1773
229
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1774
230
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1775
231
0,139,251,255,0,139,251,255,0,139,251,255,0,51,92,255,
1776
232
0,0,0,255,0,0,0,230,0,0,0,26,0,0,0,0,
1777
233
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1778
234
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1779
235
0,0,0,0,0,0,0,195,0,0,0,255,0,33,59,255,
1780
236
0,136,246,255,0,139,251,255,0,139,251,255,0,139,251,255,
1781
237
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1782
238
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1783
239
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1784
240
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1785
241
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1786
242
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1787
243
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1788
244
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1789
245
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1790
246
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1791
247
0,139,251,255,0,139,251,255,0,139,251,255,0,135,243,255,
1792
248
0,29,52,255,0,0,0,255,0,0,0,193,0,0,0,0,
1793
249
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1794
250
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1795
251
0,0,0,79,0,0,0,255,0,8,14,255,0,126,228,255,
1796
252
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1797
253
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1798
254
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1799
255
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1800
256
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1801
257
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1802
258
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1803
259
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1804
260
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1805
261
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1806
262
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1807
263
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1808
264
0,124,224,255,0,8,15,255,0,0,0,255,0,0,0,77,
1809
265
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1810
266
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,
1811
267
0,0,0,213,0,0,0,255,0,71,129,255,0,139,251,255,
1812
268
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1813
269
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1814
270
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1815
271
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1816
272
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1817
273
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1818
274
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1819
275
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1820
276
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1821
277
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1822
278
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1823
279
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1824
280
0,139,251,255,0,72,130,255,0,0,0,255,0,0,0,211,
1825
281
0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
1826
282
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,98,
1827
283
0,0,0,255,0,14,25,255,0,134,241,255,0,139,251,255,
1828
284
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1829
285
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1830
286
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1831
287
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1832
288
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1833
289
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1834
290
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1835
291
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1836
292
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1837
293
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1838
294
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1839
295
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1840
296
0,139,251,255,0,133,240,255,0,13,24,255,0,0,0,255,
1841
297
0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,
1842
298
0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,227,
1843
299
0,0,0,255,0,83,150,255,0,139,251,255,0,139,251,255,
1844
300
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1845
301
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1846
302
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1847
303
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1848
304
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1849
305
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1850
306
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1851
307
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1852
308
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1853
309
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1854
310
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1855
311
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1856
312
0,139,251,255,0,139,251,255,0,81,147,255,0,0,0,255,
1857
313
0,0,0,223,0,0,0,6,0,0,0,0,0,0,0,0,
1858
314
0,0,0,0,0,0,0,0,0,0,0,115,0,0,0,255,
1859
315
0,21,37,255,0,137,247,255,0,139,251,255,0,139,251,255,
1860
316
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1861
317
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1862
318
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1863
319
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1864
320
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1865
321
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1866
322
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1867
323
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1868
324
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1869
325
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1870
326
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1871
327
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1872
328
0,139,251,255,0,139,251,255,0,136,246,255,0,19,34,255,
1873
329
0,0,0,255,0,0,0,110,0,0,0,0,0,0,0,0,
1874
330
0,0,0,0,0,0,0,0,0,0,0,209,0,0,0,255,
1875
331
0,88,159,255,0,139,251,255,0,139,251,255,0,139,251,255,
1876
332
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1877
333
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1878
334
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1879
335
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1880
336
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1881
337
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1882
338
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1883
339
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1884
340
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1885
341
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1886
342
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1887
343
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1888
344
0,139,251,255,0,139,251,255,0,139,251,255,0,88,158,255,
1889
345
0,0,0,255,0,0,0,209,0,0,0,0,0,0,0,0,
1890
346
0,0,0,0,0,0,0,32,0,0,0,255,0,3,6,255,
1891
347
0,131,237,255,0,139,251,255,0,139,251,255,0,139,251,255,
1892
348
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1893
349
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1894
350
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1895
351
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1896
352
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1897
353
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1898
354
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1899
355
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1900
356
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1901
357
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1902
358
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1903
359
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1904
360
0,139,251,255,0,139,251,255,0,139,251,255,0,132,239,255,
1905
361
0,4,7,255,0,0,0,255,0,0,0,32,0,0,0,0,
1906
362
0,0,0,0,0,0,0,111,0,0,0,255,0,38,69,255,
1907
363
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1908
364
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1909
365
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1910
366
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1911
367
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1912
368
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1913
369
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1914
370
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1915
371
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1916
372
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1917
373
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1918
374
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1919
375
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1920
376
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1921
377
0,39,71,255,0,0,0,255,0,0,0,111,0,0,0,0,
1922
378
0,0,0,0,0,0,0,189,0,0,0,255,0,81,147,255,
1923
379
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1924
380
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1925
381
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1926
382
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1927
383
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1928
384
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1929
385
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1930
386
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1931
387
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1932
388
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1933
389
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1934
390
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1935
391
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1936
392
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1937
393
0,82,149,255,0,0,0,255,0,0,0,189,0,0,0,0,
1938
394
0,0,0,17,0,0,0,251,0,1,1,255,0,124,224,255,
1939
395
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1940
396
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1941
397
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1942
398
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1943
399
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1944
400
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1945
401
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1946
402
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1947
403
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1948
404
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1949
405
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1950
406
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1951
407
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1952
408
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1953
409
0,124,224,255,0,1,1,255,0,0,0,251,0,0,0,17,
1954
410
0,0,0,89,0,0,0,255,0,28,51,255,0,139,251,255,
1955
411
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1956
412
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1957
413
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1958
414
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1959
415
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1960
416
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1961
417
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1962
418
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1963
419
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1964
420
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1965
421
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1966
422
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1967
423
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1968
424
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1969
425
0,139,251,255,0,28,50,255,0,0,0,255,0,0,0,89,
1970
426
0,0,0,128,0,0,0,255,0,63,114,255,0,139,251,255,
1971
427
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1972
428
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1973
429
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1974
430
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1975
431
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1976
432
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1977
433
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1978
434
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1979
435
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1980
436
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1981
437
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1982
438
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1983
439
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1984
440
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1985
441
0,139,251,255,0,58,104,255,0,0,0,255,0,0,0,128,
1986
442
0,0,0,155,0,0,0,255,0,77,140,255,0,139,251,255,
1987
443
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1988
444
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1989
445
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1990
446
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1991
447
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1992
448
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1993
449
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1994
450
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1995
451
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1996
452
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1997
453
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1998
454
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
1999
455
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2000
456
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2001
457
0,139,251,255,0,73,132,255,0,0,0,255,0,0,0,155,
2002
458
0,0,0,181,0,0,0,255,0,91,164,255,0,139,251,255,
2003
459
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2004
460
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2005
461
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2006
462
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2007
463
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2008
464
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2009
465
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2010
466
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2011
467
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2012
468
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2013
469
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2014
470
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2015
471
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2016
472
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2017
473
0,139,251,255,0,88,158,255,0,0,0,255,0,0,0,181,
2018
474
0,0,0,208,0,0,0,255,0,105,190,255,0,139,251,255,
2019
475
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2020
476
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2021
477
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2022
478
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2023
479
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2024
480
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2025
481
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2026
482
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2027
483
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2028
484
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2029
485
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2030
486
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2031
487
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2032
488
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2033
489
0,139,251,255,0,102,185,255,0,0,0,255,0,0,0,208,
2034
490
0,0,0,234,0,0,0,255,0,119,215,255,0,139,251,255,
2035
491
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2036
492
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2037
493
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2038
494
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2039
495
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2040
496
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2041
497
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2042
498
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2043
499
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2044
500
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2045
501
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2046
502
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2047
503
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2048
504
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2049
505
0,139,251,255,0,117,212,255,0,0,0,255,0,0,0,234,
2050
506
0,0,0,254,0,0,0,255,0,132,239,255,0,139,251,255,
2051
507
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2052
508
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2053
509
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2054
510
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2055
511
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2056
512
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2057
513
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2058
514
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2059
515
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2060
516
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2061
517
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2062
518
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2063
519
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2064
520
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2065
521
0,139,251,255,0,132,238,255,0,0,0,255,0,0,0,254,
2066
522
0,0,0,254,0,0,0,255,0,132,239,255,0,139,251,255,
2067
523
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2068
524
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2069
525
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2070
526
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2071
527
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2072
528
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2073
529
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2074
530
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2075
531
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2076
532
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2077
533
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2078
534
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2079
535
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2080
536
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2081
537
0,139,251,255,0,132,238,255,0,0,0,255,0,0,0,254,
2082
538
0,0,0,234,0,0,0,255,0,119,215,255,0,139,251,255,
2083
539
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2084
540
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2085
541
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2086
542
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2087
543
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2088
544
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2089
545
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2090
546
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2091
547
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2092
548
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2093
549
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2094
550
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2095
551
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2096
552
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2097
553
0,139,251,255,0,117,212,255,0,0,0,255,0,0,0,234,
2098
554
0,0,0,208,0,0,0,255,0,105,190,255,0,139,251,255,
2099
555
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2100
556
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2101
557
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2102
558
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2103
559
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2104
560
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2105
561
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2106
562
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2107
563
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2108
564
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2109
565
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2110
566
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2111
567
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2112
568
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2113
569
0,139,251,255,0,102,185,255,0,0,0,255,0,0,0,208,
2114
570
0,0,0,181,0,0,0,255,0,91,164,255,0,139,251,255,
2115
571
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2116
572
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2117
573
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2118
574
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2119
575
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2120
576
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2121
577
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2122
578
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2123
579
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2124
580
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2125
581
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2126
582
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2127
583
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2128
584
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2129
585
0,139,251,255,0,88,158,255,0,0,0,255,0,0,0,181,
2130
586
0,0,0,155,0,0,0,255,0,77,140,255,0,139,251,255,
2131
587
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2132
588
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2133
589
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2134
590
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2135
591
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2136
592
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2137
593
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2138
594
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2139
595
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2140
596
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2141
597
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2142
598
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2143
599
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2144
600
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2145
601
0,139,251,255,0,73,132,255,0,0,0,255,0,0,0,155,
2146
602
0,0,0,128,0,0,0,255,0,63,114,255,0,139,251,255,
2147
603
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2148
604
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2149
605
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2150
606
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2151
607
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2152
608
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2153
609
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2154
610
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2155
611
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2156
612
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2157
613
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2158
614
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2159
615
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2160
616
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2161
617
0,139,251,255,0,58,104,255,0,0,0,255,0,0,0,128,
2162
618
0,0,0,89,0,0,0,255,0,28,51,255,0,139,251,255,
2163
619
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2164
620
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2165
621
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2166
622
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2167
623
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2168
624
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2169
625
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2170
626
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2171
627
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2172
628
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2173
629
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2174
630
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2175
631
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2176
632
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2177
633
0,139,251,255,0,28,50,255,0,0,0,255,0,0,0,89,
2178
634
0,0,0,17,0,0,0,251,0,1,1,255,0,124,224,255,
2179
635
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2180
636
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2181
637
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2182
638
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2183
639
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2184
640
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2185
641
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2186
642
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2187
643
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2188
644
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2189
645
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2190
646
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2191
647
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2192
648
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2193
649
0,124,224,255,0,1,1,255,0,0,0,251,0,0,0,17,
2194
650
0,0,0,0,0,0,0,189,0,0,0,255,0,81,147,255,
2195
651
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2196
652
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2197
653
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2198
654
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2199
655
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2200
656
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2201
657
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2202
658
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2203
659
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2204
660
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2205
661
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2206
662
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2207
663
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2208
664
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2209
665
0,82,149,255,0,0,0,255,0,0,0,189,0,0,0,0,
2210
666
0,0,0,0,0,0,0,111,0,0,0,255,0,38,69,255,
2211
667
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2212
668
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2213
669
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2214
670
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2215
671
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2216
672
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2217
673
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2218
674
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2219
675
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2220
676
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2221
677
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2222
678
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2223
679
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2224
680
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2225
681
0,39,71,255,0,0,0,255,0,0,0,111,0,0,0,0,
2226
682
0,0,0,0,0,0,0,32,0,0,0,255,0,3,6,255,
2227
683
0,131,237,255,0,139,251,255,0,139,251,255,0,139,251,255,
2228
684
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2229
685
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2230
686
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2231
687
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2232
688
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2233
689
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2234
690
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2235
691
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2236
692
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2237
693
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2238
694
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2239
695
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2240
696
0,139,251,255,0,139,251,255,0,139,251,255,0,132,239,255,
2241
697
0,4,7,255,0,0,0,255,0,0,0,32,0,0,0,0,
2242
698
0,0,0,0,0,0,0,0,0,0,0,209,0,0,0,255,
2243
699
0,88,159,255,0,139,251,255,0,139,251,255,0,139,251,255,
2244
700
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2245
701
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2246
702
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2247
703
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2248
704
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2249
705
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2250
706
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2251
707
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2252
708
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2253
709
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2254
710
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2255
711
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2256
712
0,139,251,255,0,139,251,255,0,139,251,255,0,88,158,255,
2257
713
0,0,0,255,0,0,0,209,0,0,0,0,0,0,0,0,
2258
714
0,0,0,0,0,0,0,0,0,0,0,115,0,0,0,255,
2259
715
0,21,37,255,0,137,247,255,0,139,251,255,0,139,251,255,
2260
716
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2261
717
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2262
718
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2263
719
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2264
720
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2265
721
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2266
722
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2267
723
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2268
724
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2269
725
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2270
726
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2271
727
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2272
728
0,139,251,255,0,139,251,255,0,136,246,255,0,19,34,255,
2273
729
0,0,0,255,0,0,0,110,0,0,0,0,0,0,0,0,
2274
730
0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,227,
2275
731
0,0,0,255,0,83,150,255,0,139,251,255,0,139,251,255,
2276
732
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2277
733
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2278
734
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2279
735
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2280
736
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2281
737
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2282
738
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2283
739
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2284
740
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2285
741
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2286
742
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2287
743
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2288
744
0,139,251,255,0,139,251,255,0,81,147,255,0,0,0,255,
2289
745
0,0,0,223,0,0,0,6,0,0,0,0,0,0,0,0,
2290
746
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,98,
2291
747
0,0,0,255,0,14,25,255,0,134,241,255,0,139,251,255,
2292
748
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2293
749
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2294
750
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2295
751
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2296
752
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2297
753
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2298
754
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2299
755
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2300
756
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2301
757
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2302
758
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2303
759
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2304
760
0,139,251,255,0,133,240,255,0,13,24,255,0,0,0,255,
2305
761
0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,
2306
762
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,
2307
763
0,0,0,213,0,0,0,255,0,71,129,255,0,139,251,255,
2308
764
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2309
765
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2310
766
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2311
767
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2312
768
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2313
769
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2314
770
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2315
771
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2316
772
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2317
773
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2318
774
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2319
775
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2320
776
0,139,251,255,0,72,130,255,0,0,0,255,0,0,0,211,
2321
777
0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
2322
778
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2323
779
0,0,0,79,0,0,0,255,0,8,14,255,0,126,228,255,
2324
780
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2325
781
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2326
782
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2327
783
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2328
784
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2329
785
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2330
786
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2331
787
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2332
788
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2333
789
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2334
790
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2335
791
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2336
792
0,124,224,255,0,8,15,255,0,0,0,255,0,0,0,77,
2337
793
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2338
794
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2339
795
0,0,0,0,0,0,0,195,0,0,0,255,0,33,59,255,
2340
796
0,136,246,255,0,139,251,255,0,139,251,255,0,139,251,255,
2341
797
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2342
798
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2343
799
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2344
800
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2345
801
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2346
802
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2347
803
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2348
804
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2349
805
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2350
806
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2351
807
0,139,251,255,0,139,251,255,0,139,251,255,0,135,243,255,
2352
808
0,29,52,255,0,0,0,255,0,0,0,193,0,0,0,0,
2353
809
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2354
810
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2355
811
0,0,0,0,0,0,0,30,0,0,0,234,0,0,0,255,
2356
812
0,56,100,255,0,139,251,255,0,139,251,255,0,139,251,255,
2357
813
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2358
814
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2359
815
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2360
816
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2361
817
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2362
818
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2363
819
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2364
820
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2365
821
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2366
822
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2367
823
0,139,251,255,0,139,251,255,0,139,251,255,0,51,92,255,
2368
824
0,0,0,255,0,0,0,230,0,0,0,26,0,0,0,0,
2369
825
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2370
826
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2371
827
0,0,0,0,0,0,0,0,0,0,0,61,0,0,0,250,
2372
828
0,0,0,255,0,81,147,255,0,139,251,255,0,139,251,255,
2373
829
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2374
830
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2375
831
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2376
832
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2377
833
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2378
834
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2379
835
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2380
836
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2381
837
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2382
838
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2383
839
0,139,251,255,0,139,251,255,0,76,138,255,0,0,0,255,
2384
840
0,0,0,248,0,0,0,55,0,0,0,0,0,0,0,0,
2385
841
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2386
842
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2387
843
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,103,
2388
844
0,0,0,255,0,2,4,255,0,105,189,255,0,139,251,255,
2389
845
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2390
846
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2391
847
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2392
848
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2393
849
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2394
850
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2395
851
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2396
852
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2397
853
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2398
854
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2399
855
0,139,251,255,0,101,182,255,0,2,3,255,0,0,0,255,
2400
856
0,0,0,95,0,0,0,0,0,0,0,0,0,0,0,0,
2401
857
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2402
858
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2403
859
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2404
860
0,0,0,151,0,0,0,255,0,7,14,255,0,98,177,255,
2405
861
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2406
862
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2407
863
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2408
864
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2409
865
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2410
866
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2411
867
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2412
868
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2413
869
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2414
870
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2415
871
0,95,172,255,0,6,12,255,0,0,0,255,0,0,0,143,
2416
872
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2417
873
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2418
874
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2419
875
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2420
876
0,0,0,5,0,0,0,181,0,0,0,255,0,1,2,255,
2421
877
0,74,133,255,0,139,251,255,0,139,251,255,0,139,251,255,
2422
878
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2423
879
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2424
880
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2425
881
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2426
882
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2427
883
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2428
884
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2429
885
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2430
886
0,139,251,255,0,139,251,255,0,139,251,255,0,71,129,255,
2431
887
0,1,1,255,0,0,0,255,0,0,0,178,0,0,0,3,
2432
888
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2433
889
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2434
890
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2435
891
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2436
892
0,0,0,0,0,0,0,3,0,0,0,140,0,0,0,255,
2437
893
0,0,0,255,0,49,89,255,0,134,242,255,0,139,251,255,
2438
894
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2439
895
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2440
896
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2441
897
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2442
898
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2443
899
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2444
900
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2445
901
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2446
902
0,139,251,255,0,134,242,255,0,47,86,255,0,0,0,255,
2447
903
0,0,0,255,0,0,0,140,0,0,0,3,0,0,0,0,
2448
904
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2449
905
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2450
906
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2451
907
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2452
908
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,
2453
909
0,0,0,247,0,0,0,255,0,28,51,255,0,122,220,255,
2454
910
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2455
911
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2456
912
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2457
913
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2458
914
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2459
915
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2460
916
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2461
917
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2462
918
0,123,221,255,0,28,50,255,0,0,0,255,0,0,0,247,
2463
919
0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,
2464
920
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2465
921
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2466
922
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2467
923
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2468
924
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2469
925
0,0,0,53,0,0,0,228,0,0,0,255,0,4,7,255,
2470
926
0,62,112,255,0,129,232,255,0,139,251,255,0,139,251,255,
2471
927
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2472
928
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2473
929
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2474
930
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2475
931
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2476
932
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2477
933
0,139,251,255,0,139,251,255,0,129,233,255,0,63,114,255,
2478
934
0,4,8,255,0,0,0,255,0,0,0,228,0,0,0,53,
2479
935
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2480
936
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2481
937
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2482
938
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2483
939
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2484
940
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2485
941
0,0,0,0,0,0,0,24,0,0,0,187,0,0,0,255,
2486
942
0,0,0,255,0,8,14,255,0,71,128,255,0,133,240,255,
2487
943
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2488
944
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2489
945
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2490
946
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2491
947
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2492
948
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2493
949
0,133,240,255,0,72,130,255,0,8,15,255,0,0,0,255,
2494
950
0,0,0,255,0,0,0,187,0,0,0,24,0,0,0,0,
2495
951
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2496
952
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2497
953
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2498
954
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2499
955
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2500
956
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2501
957
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,69,
2502
958
0,0,0,203,0,0,0,255,0,0,0,255,0,12,22,255,
2503
959
0,77,139,255,0,124,223,255,0,139,251,255,0,139,251,255,
2504
960
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2505
961
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2506
962
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2507
963
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2508
964
0,139,251,255,0,139,251,255,0,124,223,255,0,77,139,255,
2509
965
0,13,23,255,0,0,0,255,0,0,0,255,0,0,0,203,
2510
966
0,0,0,69,0,0,0,0,0,0,0,0,0,0,0,0,
2511
967
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2512
968
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2513
969
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2514
970
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2515
971
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2516
972
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2517
973
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2518
974
0,0,0,0,0,0,0,83,0,0,0,215,0,0,0,255,
2519
975
0,0,0,255,0,0,0,255,0,27,49,255,0,70,126,255,
2520
976
0,112,203,255,0,139,251,255,0,139,251,255,0,139,251,255,
2521
977
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2522
978
0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
2523
979
0,139,251,255,0,139,251,255,0,139,251,255,0,112,203,255,
2524
980
0,70,126,255,0,27,49,255,0,0,0,255,0,0,0,255,
2525
981
0,0,0,255,0,0,0,215,0,0,0,83,0,0,0,0,
2526
982
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2527
983
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2528
984
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2529
985
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2530
986
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2531
987
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2532
988
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2533
989
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2534
990
0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,95,
2535
991
0,0,0,187,0,0,0,250,0,0,0,255,0,0,0,255,
2536
992
0,0,0,255,0,15,28,255,0,45,82,255,0,60,108,255,
2537
993
0,75,135,255,0,89,161,255,0,104,188,255,0,119,215,255,
2538
994
0,119,215,255,0,104,188,255,0,89,161,255,0,75,135,255,
2539
995
0,60,108,255,0,45,82,255,0,15,28,255,0,0,0,255,
2540
996
0,0,0,255,0,0,0,255,0,0,0,250,0,0,0,187,
2541
997
0,0,0,95,0,0,0,3,0,0,0,0,0,0,0,0,
2542
998
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2543
999
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2544
1000
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2545
1001
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2546
1002
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2547
1003
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2548
1004
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2549
1005
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2550
1006
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2551
1007
0,0,0,0,0,0,0,15,0,0,0,88,0,0,0,166,
2552
1008
0,0,0,240,0,0,0,255,0,0,0,255,0,0,0,255,
2553
1009
0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
2554
1010
0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
2555
1011
0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,240,
2556
1012
0,0,0,166,0,0,0,88,0,0,0,15,0,0,0,0,
2557
1013
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2558
1014
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2559
1015
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2560
1016
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2561
1017
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2562
1018
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2563
1019
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2564
1020
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2565
1021
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2566
1022
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2567
1023
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2568
1024
0,0,0,5,0,0,0,65,0,0,0,104,0,0,0,129,
2569
1025
0,0,0,154,0,0,0,179,0,0,0,204,0,0,0,230,
2570
1026
0,0,0,230,0,0,0,204,0,0,0,179,0,0,0,154,
2571
1027
0,0,0,129,0,0,0,104,0,0,0,65,0,0,0,5,
2572
1028
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2573
1029
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2574
1030
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2575
1031
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2576
1032
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2577
1033
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
2578
1034
};
2579
0
1035
2580
=== modified file 'src/server/scene/basic_surface.cpp'
2581
--- src/server/scene/basic_surface.cpp	2014-09-10 12:50:53 +0000
2582
+++ src/server/scene/basic_surface.cpp	2014-09-18 16:04:44 +0000
2583
@@ -667,7 +667,6 @@
2584
667
 
667
 
2585
668
    mg::Renderable::ID id() const override
668
    mg::Renderable::ID id() const override
2586
669
    { return id_; }
669
    { return id_; }
2587
670
2588
671
private:
670
private:
2589
672
    std::shared_ptr<mc::BufferStream> const underlying_buffer_stream;
671
    std::shared_ptr<mc::BufferStream> const underlying_buffer_stream;
2590
673
    std::shared_ptr<mg::Buffer> mutable compositor_buffer;
672
    std::shared_ptr<mg::Buffer> mutable compositor_buffer;
2591
674
673
2592
=== modified file 'src/server/scene/default_configuration.cpp'
2593
--- src/server/scene/default_configuration.cpp	2014-09-10 12:50:53 +0000
2594
+++ src/server/scene/default_configuration.cpp	2014-09-18 16:04:44 +0000
2595
@@ -20,7 +20,7 @@
2596
20
20
2597
21
#include "mir/graphics/display.h"
21
#include "mir/graphics/display.h"
2598
22
#include "mir/graphics/gl_context.h"
22
#include "mir/graphics/gl_context.h"
2600
23
#include "mir/input/input_targets.h"
23
#include "mir/input/scene.h"
2601
24
#include "mir/abnormal_exit.h"
24
#include "mir/abnormal_exit.h"
2602
25
#include "mir/scene/session.h"
25
#include "mir/scene/session.h"
2603
26
26
2604
@@ -57,7 +57,7 @@
2605
57
                         { return std::make_shared<ms::SurfaceStack>(the_scene_report()); });
57
                         { return std::make_shared<ms::SurfaceStack>(the_scene_report()); });
2606
58
}
58
}
2607
59
59
2609
60
std::shared_ptr<mi::InputTargets> mir::DefaultServerConfiguration::the_input_targets()
60
std::shared_ptr<mi::Scene> mir::DefaultServerConfiguration::the_input_scene()
2610
61
{
61
{
2611
62
    return surface_stack([this]()
62
    return surface_stack([this]()
2612
63
                         { return std::make_shared<ms::SurfaceStack>(the_scene_report()); });
63
                         { return std::make_shared<ms::SurfaceStack>(the_scene_report()); });
2613
64
64
2614
=== modified file 'src/server/scene/legacy_scene_change_notification.cpp'
2615
--- src/server/scene/legacy_scene_change_notification.cpp	2014-09-10 12:50:53 +0000
2616
+++ src/server/scene/legacy_scene_change_notification.cpp	2014-09-18 16:04:44 +0000
2617
@@ -82,6 +82,11 @@
2618
82
    scene_notify_change();
82
    scene_notify_change();
2619
83
}
83
}
2620
84
84
2621
85
void ms::LegacySceneChangeNotification::scene_changed()
2622
86
{
2623
87
    scene_notify_change();
2624
88
}
2625
89
2626
85
void ms::LegacySceneChangeNotification::end_observation()
90
void ms::LegacySceneChangeNotification::end_observation()
2627
86
{
91
{
2628
87
    std::unique_lock<decltype(surface_observers_guard)> lg(surface_observers_guard);
92
    std::unique_lock<decltype(surface_observers_guard)> lg(surface_observers_guard);
2629
88
93
2630
=== modified file 'src/server/scene/surface_stack.cpp'
2631
--- src/server/scene/surface_stack.cpp	2014-09-10 12:50:53 +0000
2632
+++ src/server/scene/surface_stack.cpp	2014-09-18 16:04:44 +0000
2633
@@ -68,11 +68,47 @@
2634
68
        tracker->occluded_in(cid);
68
        tracker->occluded_in(cid);
2635
69
    }
69
    }
2636
70
70
2637
71
    bool is_a_surface() const override
2638
72
    {
2639
73
        return true;
2640
74
    }
2641
75
2642
71
private:
76
private:
2643
72
    std::shared_ptr<mg::Renderable> const renderable_;
77
    std::shared_ptr<mg::Renderable> const renderable_;
2644
73
    std::shared_ptr<ms::RenderingTracker> const tracker;
78
    std::shared_ptr<ms::RenderingTracker> const tracker;
2645
74
};
79
};
2646
75
80
2647
81
class OverlaySceneElement : public mc::SceneElement
2648
82
{
2649
83
public:
2650
84
    OverlaySceneElement(
2651
85
        std::shared_ptr<mg::Renderable> renderable)
2652
86
        : renderable_{renderable}
2653
87
    {
2654
88
    }
2655
89
2656
90
    std::shared_ptr<mg::Renderable> renderable() const override
2657
91
    {
2658
92
        return renderable_;
2659
93
    }
2660
94
2661
95
    void rendered_in(mc::CompositorID /* cid */) override
2662
96
    {
2663
97
    }
2664
98
2665
99
    void occluded_in(mc::CompositorID /* cid */) override
2666
100
    {
2667
101
    }
2668
102
    
2669
103
    bool is_a_surface() const override
2670
104
    {
2671
105
        return false;
2672
106
    }
2673
107
2674
108
private:
2675
109
    std::shared_ptr<mg::Renderable> const renderable_;
2676
110
};
2677
111
2678
76
}
112
}
2679
77
113
2680
78
ms::SurfaceStack::SurfaceStack(
114
ms::SurfaceStack::SurfaceStack(
2681
@@ -95,6 +131,10 @@
2682
95
            elements.emplace_back(element);
131
            elements.emplace_back(element);
2683
96
        }
132
        }
2684
97
    }
133
    }
2685
134
    for (auto const& renderable : overlays)
2686
135
    {
2687
136
        elements.emplace_back(std::make_shared<OverlaySceneElement>(renderable));
2688
137
    }
2689
98
    return elements;
138
    return elements;
2690
99
}
139
}
2691
100
140
2692
@@ -116,6 +156,38 @@
2693
116
    update_rendering_tracker_compositors();
156
    update_rendering_tracker_compositors();
2694
117
}
157
}
2695
118
158
2696
159
void ms::SurfaceStack::add_input_visualization(
2697
160
    std::shared_ptr<mg::Renderable> const& overlay)
2698
161
{
2699
162
    {
2700
163
        std::lock_guard<decltype(guard)> lg(guard);
2701
164
        overlays.push_back(overlay);
2702
165
    }
2703
166
    observers.scene_changed();
2704
167
}
2705
168
2706
169
void ms::SurfaceStack::remove_input_visualization(
2707
170
    std::weak_ptr<mg::Renderable> const& weak_overlay)
2708
171
{
2709
172
    auto overlay = weak_overlay.lock();
2710
173
    {
2711
174
        std::lock_guard<decltype(guard)> lg(guard);
2712
175
        auto const p = std::find(overlays.begin(), overlays.end(), overlay);
2713
176
        if (p == overlays.end())
2714
177
        {
2715
178
            BOOST_THROW_EXCEPTION(std::runtime_error("Attempt to remove an overlay which was never added or which has been previously removed"));
2716
179
        }
2717
180
        overlays.erase(p);
2718
181
    }
2719
182
    
2720
183
    observers.scene_changed();
2721
184
}
2722
185
2723
186
void ms::SurfaceStack::emit_scene_changed()
2724
187
{
2725
188
    observers.scene_changed();
2726
189
}
2727
190
2728
119
void ms::SurfaceStack::add_surface(
191
void ms::SurfaceStack::add_surface(
2729
120
    std::shared_ptr<Surface> const& surface,
192
    std::shared_ptr<Surface> const& surface,
2730
121
    DepthId depth,
193
    DepthId depth,
2731
@@ -264,6 +336,12 @@
2732
264
        { observer->surfaces_reordered(); });
336
        { observer->surfaces_reordered(); });
2733
265
}
337
}
2734
266
338
2735
339
void ms::Observers::scene_changed()
2736
340
{
2737
341
   for_each([&](std::shared_ptr<Observer> const& observer)
2738
342
        { observer->scene_changed(); });
2739
343
}
2740
344
2741
267
void ms::Observers::surface_exists(ms::Surface* surface)
345
void ms::Observers::surface_exists(ms::Surface* surface)
2742
268
{
346
{
2743
269
    for_each([&](std::shared_ptr<Observer> const& observer)
347
    for_each([&](std::shared_ptr<Observer> const& observer)
2744
270
348
2745
=== modified file 'src/server/scene/surface_stack.h'
2746
--- src/server/scene/surface_stack.h	2014-09-10 12:50:53 +0000
2747
+++ src/server/scene/surface_stack.h	2014-09-18 16:04:44 +0000
2748
@@ -24,7 +24,7 @@
2749
24
#include "mir/compositor/scene.h"
24
#include "mir/compositor/scene.h"
2750
25
#include "mir/scene/depth_id.h"
25
#include "mir/scene/depth_id.h"
2751
26
#include "mir/scene/observer.h"
26
#include "mir/scene/observer.h"
2753
27
#include "mir/input/input_targets.h"
27
#include "mir/input/scene.h"
2754
28
28
2755
29
#include "mir/basic_observers.h"
29
#include "mir/basic_observers.h"
2756
30
30
2757
@@ -36,6 +36,10 @@
2758
36
36
2759
37
namespace mir
37
namespace mir
2760
38
{
38
{
2761
39
namespace graphics
2762
40
{
2763
41
class Renderable;
2764
42
}
2765
39
/// Management of Surface objects. Includes the model (SurfaceStack and Surface
43
/// Management of Surface objects. Includes the model (SurfaceStack and Surface
2766
40
/// classes) and controller (SurfaceController) elements of an MVC design.
44
/// classes) and controller (SurfaceController) elements of an MVC design.
2767
41
namespace scene
45
namespace scene
2768
@@ -52,6 +56,7 @@
2769
52
   void surface_added(Surface* surface) override;
56
   void surface_added(Surface* surface) override;
2770
53
   void surface_removed(Surface* surface) override;
57
   void surface_removed(Surface* surface) override;
2771
54
   void surfaces_reordered() override;
58
   void surfaces_reordered() override;
2772
59
   void scene_changed() override;
2773
55
   void surface_exists(Surface* surface) override;
60
   void surface_exists(Surface* surface) override;
2774
56
   void end_observation();
61
   void end_observation();
2775
57
62
2776
@@ -59,7 +64,7 @@
2777
59
   using BasicObservers<Observer>::remove;
64
   using BasicObservers<Observer>::remove;
2778
60
};
65
};
2779
61
66
2781
62
class SurfaceStack : public compositor::Scene, public input::InputTargets, public SurfaceStackModel
67
class SurfaceStack : public compositor::Scene, public input::Scene, public SurfaceStackModel
2782
63
{
68
{
2783
64
public:
69
public:
2784
65
    explicit SurfaceStack(
70
    explicit SurfaceStack(
2785
@@ -71,7 +76,7 @@
2786
71
    void register_compositor(compositor::CompositorID id) override;
76
    void register_compositor(compositor::CompositorID id) override;
2787
72
    void unregister_compositor(compositor::CompositorID id) override;
77
    void unregister_compositor(compositor::CompositorID id) override;
2788
73
78
2790
74
    // From InputTargets
79
    // From Scene
2791
75
    void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& callback);
80
    void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& callback);
2792
76
81
2793
77
    virtual void remove_surface(std::weak_ptr<Surface> const& surface) override;
82
    virtual void remove_surface(std::weak_ptr<Surface> const& surface) override;
2794
@@ -85,6 +90,12 @@
2795
85
    
90
    
2796
86
    void add_observer(std::shared_ptr<Observer> const& observer) override;
91
    void add_observer(std::shared_ptr<Observer> const& observer) override;
2797
87
    void remove_observer(std::weak_ptr<Observer> const& observer) override;
92
    void remove_observer(std::weak_ptr<Observer> const& observer) override;
2798
93
    
2799
94
    // Intended for input overlays, as described in mir::input::Scene documentation.
2800
95
    void add_input_visualization(std::shared_ptr<graphics::Renderable> const& overlay);
2801
96
    void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& overlay);
2802
97
    
2803
98
    void emit_scene_changed() override;
2804
88
99
2805
89
private:
100
private:
2806
90
    SurfaceStack(const SurfaceStack&) = delete;
101
    SurfaceStack(const SurfaceStack&) = delete;
2807
@@ -101,6 +112,8 @@
2808
101
    std::map<DepthId, Layer> layers_by_depth;
112
    std::map<DepthId, Layer> layers_by_depth;
2809
102
    std::map<Surface*,std::shared_ptr<RenderingTracker>> rendering_trackers;
113
    std::map<Surface*,std::shared_ptr<RenderingTracker>> rendering_trackers;
2810
103
    std::set<compositor::CompositorID> registered_compositors;
114
    std::set<compositor::CompositorID> registered_compositors;
2811
115
    
2812
116
    std::vector<std::shared_ptr<graphics::Renderable>> overlays;
2813
104
117
2814
105
    Observers observers;
118
    Observers observers;
2815
106
};
119
};
2816
107
120
2817
=== modified file 'src/server/symbols.map'
2818
--- src/server/symbols.map	2014-09-10 12:50:53 +0000
2819
+++ src/server/symbols.map	2014-09-18 16:04:44 +0000
2820
@@ -108,6 +108,7 @@
2821
108
    mir::DefaultServerConfiguration::the_buffer_allocator*;
108
    mir::DefaultServerConfiguration::the_buffer_allocator*;
2822
109
    mir::DefaultServerConfiguration::the_buffer_initializer*;
109
    mir::DefaultServerConfiguration::the_buffer_initializer*;
2823
110
    mir::DefaultServerConfiguration::the_buffer_stream_factory*;
110
    mir::DefaultServerConfiguration::the_buffer_stream_factory*;
2824
111
    mir::DefaultServerConfiguration::the_buffer_writer*;
2825
111
    mir::DefaultServerConfiguration::the_clock*;
112
    mir::DefaultServerConfiguration::the_clock*;
2826
112
    mir::DefaultServerConfiguration::the_composite_event_filter*;
113
    mir::DefaultServerConfiguration::the_composite_event_filter*;
2827
113
    mir::DefaultServerConfiguration::the_compositor*;
114
    mir::DefaultServerConfiguration::the_compositor*;
2828
@@ -149,7 +150,7 @@
2829
149
    mir::DefaultServerConfiguration::the_input_sender*;
150
    mir::DefaultServerConfiguration::the_input_sender*;
2830
150
    mir::DefaultServerConfiguration::the_input_send_observer*;
151
    mir::DefaultServerConfiguration::the_input_send_observer*;
2831
151
    mir::DefaultServerConfiguration::the_input_targeter*;
152
    mir::DefaultServerConfiguration::the_input_targeter*;
2833
152
    mir::DefaultServerConfiguration::the_input_targets*;
153
    mir::DefaultServerConfiguration::the_input_scene*;
2834
153
    mir::DefaultServerConfiguration::the_logger*;
154
    mir::DefaultServerConfiguration::the_logger*;
2835
154
    mir::DefaultServerConfiguration::the_main_loop*;
155
    mir::DefaultServerConfiguration::the_main_loop*;
2836
155
    mir::DefaultServerConfiguration::the_mediating_display_changer*;
156
    mir::DefaultServerConfiguration::the_mediating_display_changer*;
2837
@@ -407,6 +408,8 @@
2838
407
    mir::input::TouchVisualizer::?TouchVisualizer*;
408
    mir::input::TouchVisualizer::?TouchVisualizer*;
2839
408
    mir::input::TouchVisualizer::TouchVisualizer*;
409
    mir::input::TouchVisualizer::TouchVisualizer*;
2840
409
    mir::input::TouchVisualizer::visualize_touches*;
410
    mir::input::TouchVisualizer::visualize_touches*;
2841
411
    mir::input::TouchVisualizer::enable*;
2842
412
    mir::input::TouchVisualizer::disable*;
2843
410
    mir::input::VTFilter::handle*;
413
    mir::input::VTFilter::handle*;
2844
411
    mir::logging::GlogLogger::GlogLogger*;
414
    mir::logging::GlogLogger::GlogLogger*;
2845
412
    mir::logging::GlogLogger::log*;
415
    mir::logging::GlogLogger::log*;
2846
413
416
2847
=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
2848
--- tests/acceptance-tests/test_nested_mir.cpp	2014-09-10 12:50:53 +0000
2849
+++ tests/acceptance-tests/test_nested_mir.cpp	2014-09-18 16:04:44 +0000
2850
@@ -132,6 +132,11 @@
2851
132
        return adaptee->create_internal_client();
132
        return adaptee->create_internal_client();
2852
133
    }
133
    }
2853
134
134
2854
135
    std::shared_ptr<mg::BufferWriter> make_buffer_writer() override
2855
136
    {
2856
137
        return adaptee->make_buffer_writer();
2857
138
    }
2858
139
2859
135
    void fill_buffer_package(
140
    void fill_buffer_package(
2860
136
        mg::BufferIPCPacker* packer,
141
        mg::BufferIPCPacker* packer,
2861
137
        mg::Buffer const* buffer,
142
        mg::Buffer const* buffer,
2862
@@ -139,7 +144,7 @@
2863
139
    {
144
    {
2864
140
        return adaptee->fill_buffer_package(packer, buffer, msg_type);
145
        return adaptee->fill_buffer_package(packer, buffer, msg_type);
2865
141
    }
146
    }
2867
142
147
    
2868
143
    std::shared_ptr<mg::Platform> const adaptee;
148
    std::shared_ptr<mg::Platform> const adaptee;
2869
144
};
149
};
2870
145
150
2871
146
151
2872
=== modified file 'tests/acceptance-tests/test_touchspot_visualization.cpp'
2873
--- tests/acceptance-tests/test_touchspot_visualization.cpp	2014-06-30 21:33:58 +0000
2874
+++ tests/acceptance-tests/test_touchspot_visualization.cpp	2014-09-18 16:04:44 +0000
2875
@@ -82,6 +82,8 @@
2876
82
struct MockTouchVisualizer : public mi::TouchVisualizer
82
struct MockTouchVisualizer : public mi::TouchVisualizer
2877
83
{
83
{
2878
84
    MOCK_METHOD1(visualize_touches, void(std::vector<mi::TouchVisualizer::Spot> const&));
84
    MOCK_METHOD1(visualize_touches, void(std::vector<mi::TouchVisualizer::Spot> const&));
2879
85
    MOCK_METHOD0(enable, void());
2880
86
    MOCK_METHOD0(disable, void());
2881
85
};
87
};
2882
86
88
2883
87
struct ServerConfiguration : mtf::InputTestingServerConfiguration
89
struct ServerConfiguration : mtf::InputTestingServerConfiguration
2884
88
90
2885
=== modified file 'tests/include/mir_test_doubles/null_platform.h'
2886
--- tests/include/mir_test_doubles/null_platform.h	2014-09-10 12:50:53 +0000
2887
+++ tests/include/mir_test_doubles/null_platform.h	2014-09-18 16:04:44 +0000
2888
@@ -35,7 +35,7 @@
2889
35
    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator(
35
    std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator(
2890
36
            const std::shared_ptr<graphics::BufferInitializer>& /*buffer_initializer*/)
36
            const std::shared_ptr<graphics::BufferInitializer>& /*buffer_initializer*/)
2891
37
    {
37
    {
2893
38
        return std::shared_ptr<graphics::GraphicBufferAllocator>();
38
        return nullptr;
2894
39
    }
39
    }
2895
40
40
2896
41
    std::shared_ptr<graphics::Display> create_display(
41
    std::shared_ptr<graphics::Display> create_display(
2897
@@ -53,7 +53,12 @@
2898
53
53
2899
54
    std::shared_ptr<graphics::InternalClient> create_internal_client()
54
    std::shared_ptr<graphics::InternalClient> create_internal_client()
2900
55
    {
55
    {
2902
56
        return std::shared_ptr<graphics::InternalClient>();
56
        return nullptr;
2903
57
    }
2904
58
    
2905
59
    std::shared_ptr<graphics::BufferWriter> make_buffer_writer()
2906
60
    {
2907
61
        return nullptr;
2908
57
    }
62
    }
2909
58
63
2910
59
    void fill_buffer_package(
64
    void fill_buffer_package(
2911
60
65
2912
=== renamed file 'tests/include/mir_test_doubles/stub_input_targets.h' => 'tests/include/mir_test_doubles/stub_input_scene.h'
2913
--- tests/include/mir_test_doubles/stub_input_targets.h	2014-09-10 12:50:53 +0000
2914
+++ tests/include/mir_test_doubles/stub_input_scene.h	2014-09-18 16:04:44 +0000
2915
@@ -16,10 +16,10 @@
2916
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
2917
17
 */
17
 */
2918
18
18
2921
19
#ifndef MIR_TEST_DOUBLES_STUB_INPUT_TARGETS_H_
19
#ifndef MIR_TEST_DOUBLES_STUB_INPUT_SCENE_H_
2922
20
#define MIR_TEST_DOUBLES_STUB_INPUT_TARGETS_H_
20
#define MIR_TEST_DOUBLES_STUB_INPUT_SCENE_H_
2923
21
21
2925
22
#include "mir/input/input_targets.h"
22
#include "mir/input/scene.h"
2926
23
23
2927
24
namespace mir
24
namespace mir
2928
25
{
25
{
2929
@@ -28,7 +28,7 @@
2930
28
namespace doubles
28
namespace doubles
2931
29
{
29
{
2932
30
30
2934
31
class StubInputTargets : public input::InputTargets
31
class StubInputScene : public input::Scene
2935
32
{
32
{
2936
33
    void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& ) override
33
    void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& ) override
2937
34
    {
34
    {
2938
@@ -39,10 +39,21 @@
2939
39
    void remove_observer(std::weak_ptr<scene::Observer> const& /* observer */)
39
    void remove_observer(std::weak_ptr<scene::Observer> const& /* observer */)
2940
40
    {
40
    {
2941
41
    }
41
    }
2942
42
2943
43
    void add_input_visualization(std::shared_ptr<graphics::Renderable> const& /* overlay */)
2944
44
    {
2945
45
    }
2946
46
    void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& /* overlay */)
2947
47
    {
2948
48
    }
2949
49
    
2950
50
    void emit_scene_changed()
2951
51
    {
2952
52
    }
2953
42
};
53
};
2954
43
54
2955
44
}
55
}
2956
45
}
56
}
2957
46
} // namespace mir
57
} // namespace mir
2958
47
58
2960
48
#endif /* MIR_TEST_DOUBLES_STUB_INPUT_TARGETS_H_ */
59
#endif /* MIR_TEST_DOUBLES_STUB_INPUT_SCENE_H_ */
2961
49
60
2962
=== modified file 'tests/include/mir_test_doubles/stub_scene_element.h'
2963
--- tests/include/mir_test_doubles/stub_scene_element.h	2014-06-20 17:57:16 +0000
2964
+++ tests/include/mir_test_doubles/stub_scene_element.h	2014-09-18 16:04:44 +0000
2965
@@ -48,6 +48,11 @@
2966
48
    void occluded_in(compositor::CompositorID) override
48
    void occluded_in(compositor::CompositorID) override
2967
49
    {
49
    {
2968
50
    }
50
    }
2969
51
    
2970
52
    bool is_a_surface() const override
2971
53
    {
2972
54
        return false;
2973
55
    }
2974
51
56
2975
52
private:
57
private:
2976
53
    std::shared_ptr<graphics::Renderable> const renderable_;
58
    std::shared_ptr<graphics::Renderable> const renderable_;
2977
54
59
2978
=== modified file 'tests/include/mir_test_doubles/stub_touch_visualizer.h'
2979
--- tests/include/mir_test_doubles/stub_touch_visualizer.h	2014-06-26 20:31:56 +0000
2980
+++ tests/include/mir_test_doubles/stub_touch_visualizer.h	2014-09-18 16:04:44 +0000
2981
@@ -33,6 +33,12 @@
2982
33
    void visualize_touches(std::vector<Spot> const&) override
33
    void visualize_touches(std::vector<Spot> const&) override
2983
34
    {
34
    {
2984
35
    }
35
    }
2985
36
    void enable() override
2986
37
    {
2987
38
    }
2988
39
    void disable() override
2989
40
    {
2990
41
    }
2991
36
};
42
};
2992
37
43
2993
38
}
44
}
2994
39
45
2995
=== modified file 'tests/integration-tests/input/android/test_android_cursor_listener.cpp'
2996
--- tests/integration-tests/input/android/test_android_cursor_listener.cpp	2014-09-10 12:50:53 +0000
2997
+++ tests/integration-tests/input/android/test_android_cursor_listener.cpp	2014-09-18 16:04:44 +0000
2998
@@ -26,7 +26,7 @@
2999
26
#include "mir/input/android/default_android_input_configuration.h"
26
#include "mir/input/android/default_android_input_configuration.h"
3000
27
#include "mir/input/event_filter.h"
27
#include "mir/input/event_filter.h"
3001
28
#include "mir/input/cursor_listener.h"
28
#include "mir/input/cursor_listener.h"
3003
29
#include "mir/input/input_targets.h"
29
#include "mir/input/scene.h"
3004
30
#include "mir/input/input_region.h"
30
#include "mir/input/input_region.h"
3005
31
#include "mir/input/input_dispatcher.h"
31
#include "mir/input/input_dispatcher.h"
3006
32
#include "mir/geometry/rectangle.h"
32
#include "mir/geometry/rectangle.h"
3007
33
33
3008
=== modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp'
3009
--- tests/integration-tests/input/android/test_android_input_manager.cpp	2014-09-10 12:50:53 +0000
3010
+++ tests/integration-tests/input/android/test_android_input_manager.cpp	2014-09-18 16:04:44 +0000
3011
@@ -38,7 +38,7 @@
3012
38
#include "mir_test_doubles/mock_event_filter.h"
38
#include "mir_test_doubles/mock_event_filter.h"
3013
39
#include "mir_test_doubles/stub_scene_surface.h"
39
#include "mir_test_doubles/stub_scene_surface.h"
3014
40
#include "mir_test_doubles/stub_input_channel.h"
40
#include "mir_test_doubles/stub_input_channel.h"
3016
41
#include "mir_test_doubles/stub_input_targets.h"
41
#include "mir_test_doubles/stub_scene.h"
3017
42
#include "mir_test_doubles/stub_scene.h"
42
#include "mir_test_doubles/stub_scene.h"
3018
43
#include "mir_test_doubles/stub_input_enumerator.h"
43
#include "mir_test_doubles/stub_input_enumerator.h"
3019
44
#include "mir_test_doubles/stub_touch_visualizer.h"
44
#include "mir_test_doubles/stub_touch_visualizer.h"
3020
45
45
3021
=== modified file 'tests/integration-tests/input/test_nested_input.cpp'
3022
--- tests/integration-tests/input/test_nested_input.cpp	2014-09-10 12:50:53 +0000
3023
+++ tests/integration-tests/input/test_nested_input.cpp	2014-09-18 16:04:44 +0000
3024
@@ -25,7 +25,7 @@
3025
25
#include "src/server/report/null_report_factory.h"
25
#include "src/server/report/null_report_factory.h"
3026
26
#include "mir/raii.h"
26
#include "mir/raii.h"
3027
27
27
3029
28
#include "mir_test_doubles/stub_input_targets.h"
28
#include "mir_test_doubles/stub_scene.h"
3030
29
#include "mir_test_doubles/mock_event_filter.h"
29
#include "mir_test_doubles/mock_event_filter.h"
3031
30
#include "mir_test_doubles/stub_input_enumerator.h"
30
#include "mir_test_doubles/stub_input_enumerator.h"
3032
31
#include "mir_test/fake_shared.h"
31
#include "mir_test/fake_shared.h"
3033
32
32
3034
=== modified file 'tests/mir_test_framework/stubbed_server_configuration.cpp'
3035
--- tests/mir_test_framework/stubbed_server_configuration.cpp	2014-09-10 12:50:53 +0000
3036
+++ tests/mir_test_framework/stubbed_server_configuration.cpp	2014-09-18 16:04:44 +0000
3037
@@ -21,6 +21,7 @@
3038
21
21
3039
22
#include "mir/options/default_configuration.h"
22
#include "mir/options/default_configuration.h"
3040
23
#include "mir/graphics/buffer_ipc_packer.h"
23
#include "mir/graphics/buffer_ipc_packer.h"
3041
24
#include "mir/graphics/buffer_writer.h"
3042
24
#include "mir/graphics/cursor.h"
25
#include "mir/graphics/cursor.h"
3043
25
#include "mir/input/input_channel.h"
26
#include "mir/input/input_channel.h"
3044
26
#include "mir/input/input_manager.h"
27
#include "mir/input/input_manager.h"
3045
@@ -181,6 +182,18 @@
3046
181
        return std::make_shared<mtd::StubDisplay>(display_rects);
182
        return std::make_shared<mtd::StubDisplay>(display_rects);
3047
182
    }
183
    }
3048
183
    
184
    
3049
185
    std::shared_ptr<mg::BufferWriter> make_buffer_writer() override
3050
186
    {
3051
187
        struct NullWriter : mg::BufferWriter 
3052
188
        {
3053
189
            void write(mg::Buffer& /* buffer */, 
3054
190
                unsigned char const* /* data */, size_t /* size */) override
3055
191
            {
3056
192
            }
3057
193
        };
3058
194
        return std::make_shared<NullWriter>();
3059
195
    }
3060
196
    
3061
184
    std::vector<geom::Rectangle> const display_rects;
197
    std::vector<geom::Rectangle> const display_rects;
3062
185
};
198
};
3063
186
199
3064
187
200
3065
=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
3066
--- tests/unit-tests/frontend/test_session_mediator.cpp	2014-09-12 13:26:47 +0000
3067
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2014-09-18 16:04:44 +0000
3068
@@ -203,6 +203,7 @@
3069
203
    MOCK_CONST_METHOD3(fill_buffer_package,
203
    MOCK_CONST_METHOD3(fill_buffer_package,
3070
204
        void(mg::BufferIPCPacker*, mg::Buffer const*, mg::BufferIpcMsgType));
204
        void(mg::BufferIPCPacker*, mg::Buffer const*, mg::BufferIpcMsgType));
3071
205
    MOCK_CONST_METHOD0(egl_native_display, EGLNativeDisplayType());
205
    MOCK_CONST_METHOD0(egl_native_display, EGLNativeDisplayType());
3072
206
    MOCK_METHOD0(make_buffer_writer, std::shared_ptr<mg::BufferWriter>());
3073
206
};
207
};
3074
207
208
3075
208
struct StubScreencast : mtd::NullScreencast
209
struct StubScreencast : mtd::NullScreencast
3076
209
210
3077
=== modified file 'tests/unit-tests/graphics/mesa/test_shm_buffer.cpp'
3078
--- tests/unit-tests/graphics/mesa/test_shm_buffer.cpp	2014-09-10 12:50:53 +0000
3079
+++ tests/unit-tests/graphics/mesa/test_shm_buffer.cpp	2014-09-18 16:04:44 +0000
3080
@@ -1,5 +1,5 @@
3081
1
/*
1
/*
3083
2
 * Copyright © 2013 Canonical Ltd.
2
 * Copyright © 2014 Canonical Ltd.
3084
3
 *
3
 *
3085
4
 * This program is free software: you can redistribute it and/or modify
4
 * This program is free software: you can redistribute it and/or modify
3086
5
 * it under the terms of the GNU General Public License version 3 as
5
 * it under the terms of the GNU General Public License version 3 as
3087
6
6
3088
=== modified file 'tests/unit-tests/graphics/nested/test_nested_platform.cpp'
3089
--- tests/unit-tests/graphics/nested/test_nested_platform.cpp	2014-09-10 12:50:53 +0000
3090
+++ tests/unit-tests/graphics/nested/test_nested_platform.cpp	2014-09-18 16:04:44 +0000
3091
@@ -64,6 +64,11 @@
3092
64
    {
64
    {
3093
65
        return {};
65
        return {};
3094
66
    }
66
    }
3095
67
    
3096
68
    std::shared_ptr<mg::BufferWriter> make_buffer_writer() override
3097
69
    {
3098
70
        return {};
3099
71
    }
3100
67
72
3101
68
    void fill_buffer_package(
73
    void fill_buffer_package(
3102
69
        mg::BufferIPCPacker*, mg::Buffer const*, mg::BufferIpcMsgType) const override {}
74
        mg::BufferIPCPacker*, mg::Buffer const*, mg::BufferIpcMsgType) const override {}
3103
70
75
3104
=== modified file 'tests/unit-tests/input/CMakeLists.txt'
3105
--- tests/unit-tests/input/CMakeLists.txt	2014-09-10 12:50:53 +0000
3106
+++ tests/unit-tests/input/CMakeLists.txt	2014-09-18 16:04:44 +0000
3107
@@ -5,6 +5,7 @@
3108
5
  ${CMAKE_CURRENT_SOURCE_DIR}/test_display_input_region.cpp
5
  ${CMAKE_CURRENT_SOURCE_DIR}/test_display_input_region.cpp
3109
6
  ${CMAKE_CURRENT_SOURCE_DIR}/test_cursor_controller.cpp
6
  ${CMAKE_CURRENT_SOURCE_DIR}/test_cursor_controller.cpp
3110
7
  ${CMAKE_CURRENT_SOURCE_DIR}/test_xcursor_loader.cpp
7
  ${CMAKE_CURRENT_SOURCE_DIR}/test_xcursor_loader.cpp
3111
8
  ${CMAKE_CURRENT_SOURCE_DIR}/test_touchspot_controller.cpp
3112
8
)
9
)
3113
9
10
3114
10
set(
11
set(
3115
11
12
3116
=== modified file 'tests/unit-tests/input/android/test_android_input_target_enumerator.cpp'
3117
--- tests/unit-tests/input/android/test_android_input_target_enumerator.cpp	2014-09-10 12:50:53 +0000
3118
+++ tests/unit-tests/input/android/test_android_input_target_enumerator.cpp	2014-09-18 16:04:44 +0000
3119
@@ -19,13 +19,14 @@
3120
19
#include "src/server/input/android/android_input_target_enumerator.h"
19
#include "src/server/input/android/android_input_target_enumerator.h"
3121
20
20
3122
21
#include "mir/input/input_channel.h"
21
#include "mir/input/input_channel.h"
3124
22
#include "mir/input/input_targets.h"
22
#include "mir/input/scene.h"
3125
23
#include "mir/input/surface.h"
23
#include "mir/input/surface.h"
3126
24
24
3127
25
#include "mir_test/fake_shared.h"
25
#include "mir_test/fake_shared.h"
3128
26
#include "mir_test_doubles/stub_input_channel.h"
26
#include "mir_test_doubles/stub_input_channel.h"
3129
27
#include "mir_test_doubles/stub_input_handles.h"
27
#include "mir_test_doubles/stub_input_handles.h"
3130
28
#include "mir_test_doubles/stub_input_surface.h"
28
#include "mir_test_doubles/stub_input_surface.h"
3131
29
#include "mir_test_doubles/stub_input_scene.h"
3132
29
#include "mir_test_doubles/mock_window_handle_repository.h"
30
#include "mir_test_doubles/mock_window_handle_repository.h"
3133
30
31
3134
31
#include <InputDispatcher.h>
32
#include <InputDispatcher.h>
3135
@@ -48,9 +49,9 @@
3136
48
namespace
49
namespace
3137
49
{
50
{
3138
50
51
3140
51
struct StubInputTargets : public mi::InputTargets
52
struct StubScene : public mtd::StubInputScene
3141
52
{
53
{
3143
53
    StubInputTargets(std::initializer_list<std::shared_ptr<mi::Surface>> const& target_list)
54
    StubScene(std::initializer_list<std::shared_ptr<mi::Surface>> const& target_list)
3144
54
        : targets(target_list.begin(), target_list.end())
55
        : targets(target_list.begin(), target_list.end())
3145
55
    {
56
    {
3146
56
    }
57
    }
3147
@@ -85,7 +86,7 @@
3148
85
    mtd::MockWindowHandleRepository repository;
86
    mtd::MockWindowHandleRepository repository;
3149
86
    droidinput::sp<droidinput::InputWindowHandle> stub_window_handle1 = new mtd::StubWindowHandle;
87
    droidinput::sp<droidinput::InputWindowHandle> stub_window_handle1 = new mtd::StubWindowHandle;
3150
87
    droidinput::sp<droidinput::InputWindowHandle> stub_window_handle2 = new mtd::StubWindowHandle;
88
    droidinput::sp<droidinput::InputWindowHandle> stub_window_handle2 = new mtd::StubWindowHandle;
3152
88
    StubInputTargets targets({target1, target2});
89
    StubScene targets({target1, target2});
3153
89
90
3154
90
    Sequence seq2;
91
    Sequence seq2;
3155
91
    EXPECT_CALL(repository, handle_for_channel(
92
    EXPECT_CALL(repository, handle_for_channel(
3156
92
93
3157
=== modified file 'tests/unit-tests/input/test_cursor_controller.cpp'
3158
--- tests/unit-tests/input/test_cursor_controller.cpp	2014-09-10 12:50:53 +0000
3159
+++ tests/unit-tests/input/test_cursor_controller.cpp	2014-09-18 16:04:44 +0000
3160
@@ -19,7 +19,7 @@
3161
19
#include "src/server/input/cursor_controller.h"
19
#include "src/server/input/cursor_controller.h"
3162
20
20
3163
21
#include "mir/input/surface.h"
21
#include "mir/input/surface.h"
3165
22
#include "mir/input/input_targets.h"
22
#include "mir/input/scene.h"
3166
23
#include "mir/scene/observer.h"
23
#include "mir/scene/observer.h"
3167
24
#include "mir/scene/surface_observer.h"
24
#include "mir/scene/surface_observer.h"
3168
25
#include "mir/graphics/cursor_image.h"
25
#include "mir/graphics/cursor_image.h"
3169
@@ -29,6 +29,7 @@
3170
29
29
3171
30
#include "mir_test/fake_shared.h"
30
#include "mir_test/fake_shared.h"
3172
31
#include "mir_test_doubles/stub_scene_surface.h"
31
#include "mir_test_doubles/stub_scene_surface.h"
3173
32
#include "mir_test_doubles/stub_input_scene.h"
3174
32
33
3175
33
#include <gtest/gtest.h>
34
#include <gtest/gtest.h>
3176
34
#include <gmock/gmock.h>
35
#include <gmock/gmock.h>
3177
@@ -166,9 +167,9 @@
3178
166
    std::vector<std::shared_ptr<ms::SurfaceObserver>> observers;
167
    std::vector<std::shared_ptr<ms::SurfaceObserver>> observers;
3179
167
};
168
};
3180
168
169
3182
169
struct StubInputTargets : public mi::InputTargets
170
struct StubScene : public mtd::StubInputScene
3183
170
{
171
{
3185
171
    StubInputTargets(std::initializer_list<std::shared_ptr<ms::Surface>> const& targets)
172
    StubScene(std::initializer_list<std::shared_ptr<ms::Surface>> const& targets)
3186
172
        : targets(targets.begin(), targets.end())
173
        : targets(targets.begin(), targets.end())
3187
173
    {
174
    {
3188
174
    }
175
    }
3189
@@ -243,7 +244,7 @@
3190
243
{
244
{
3191
244
    using namespace ::testing;
245
    using namespace ::testing;
3192
245
246
3194
246
    StubInputTargets targets({});
247
    StubScene targets({});
3195
247
    
248
    
3196
248
    mi::CursorController controller(mt::fake_shared(targets),
249
    mi::CursorController controller(mt::fake_shared(targets),
3197
249
        mt::fake_shared(cursor), default_cursor_image);
250
        mt::fake_shared(cursor), default_cursor_image);
3198
@@ -262,7 +263,7 @@
3199
262
263
3200
263
    StubInputSurface surface{rect_1_1_1_1,
264
    StubInputSurface surface{rect_1_1_1_1,
3201
264
        std::make_shared<NamedCursorImage>(cursor_name_1)};
265
        std::make_shared<NamedCursorImage>(cursor_name_1)};
3203
265
    StubInputTargets targets({mt::fake_shared(surface)});
266
    StubScene targets({mt::fake_shared(surface)});
3204
266
    
267
    
3205
267
    mi::CursorController controller(mt::fake_shared(targets),
268
    mi::CursorController controller(mt::fake_shared(targets),
3206
268
        mt::fake_shared(cursor), default_cursor_image);
269
        mt::fake_shared(cursor), default_cursor_image);
3207
@@ -279,7 +280,7 @@
3208
279
280
3209
280
    StubInputSurface surface{rect_1_1_1_1,
281
    StubInputSurface surface{rect_1_1_1_1,
3210
281
        nullptr};
282
        nullptr};
3212
282
    StubInputTargets targets({mt::fake_shared(surface)});
283
    StubScene targets({mt::fake_shared(surface)});
3213
283
    
284
    
3214
284
    mi::CursorController controller(mt::fake_shared(targets),
285
    mi::CursorController controller(mt::fake_shared(targets),
3215
285
        mt::fake_shared(cursor), default_cursor_image);
286
        mt::fake_shared(cursor), default_cursor_image);
3216
@@ -296,7 +297,7 @@
3217
296
297
3218
297
    StubInputSurface surface_1{rect_1_1_1_1, std::make_shared<NamedCursorImage>(cursor_name_1)};
298
    StubInputSurface surface_1{rect_1_1_1_1, std::make_shared<NamedCursorImage>(cursor_name_1)};
3219
298
    StubInputSurface surface_2{rect_1_1_1_1, std::make_shared<NamedCursorImage>(cursor_name_2)};
299
    StubInputSurface surface_2{rect_1_1_1_1, std::make_shared<NamedCursorImage>(cursor_name_2)};
3221
299
    StubInputTargets targets({mt::fake_shared(surface_1), mt::fake_shared(surface_2)});
300
    StubScene targets({mt::fake_shared(surface_1), mt::fake_shared(surface_2)});
3222
300
    
301
    
3223
301
    mi::CursorController controller(mt::fake_shared(targets),
302
    mi::CursorController controller(mt::fake_shared(targets),
3224
302
        mt::fake_shared(cursor), default_cursor_image);
303
        mt::fake_shared(cursor), default_cursor_image);
3225
@@ -313,7 +314,7 @@
3226
313
314
3227
314
    StubInputSurface surface{rect_1_1_1_1,
315
    StubInputSurface surface{rect_1_1_1_1,
3228
315
        std::make_shared<NamedCursorImage>(cursor_name_1)};
316
        std::make_shared<NamedCursorImage>(cursor_name_1)};
3230
316
    StubInputTargets targets({mt::fake_shared(surface)});
317
    StubScene targets({mt::fake_shared(surface)});
3231
317
    
318
    
3232
318
    mi::CursorController controller(mt::fake_shared(targets),
319
    mi::CursorController controller(mt::fake_shared(targets),
3233
319
        mt::fake_shared(cursor), default_cursor_image);
320
        mt::fake_shared(cursor), default_cursor_image);
3234
@@ -336,7 +337,7 @@
3235
336
337
3236
337
    StubInputSurface surface{rect_1_1_1_1,
338
    StubInputSurface surface{rect_1_1_1_1,
3237
338
        std::make_shared<NamedCursorImage>(cursor_name_1)};
339
        std::make_shared<NamedCursorImage>(cursor_name_1)};
3239
339
    StubInputTargets targets({mt::fake_shared(surface)});
340
    StubScene targets({mt::fake_shared(surface)});
3240
340
    
341
    
3241
341
    mi::CursorController controller(mt::fake_shared(targets),
342
    mi::CursorController controller(mt::fake_shared(targets),
3242
342
        mt::fake_shared(cursor), default_cursor_image);
343
        mt::fake_shared(cursor), default_cursor_image);
3243
@@ -359,7 +360,7 @@
3244
359
    // Here we also demonstrate that the cursor begins at 0,0.
360
    // Here we also demonstrate that the cursor begins at 0,0.
3245
360
    StubInputSurface surface{rect_0_0_1_1,
361
    StubInputSurface surface{rect_0_0_1_1,
3246
361
        std::make_shared<NamedCursorImage>(cursor_name_1)};
362
        std::make_shared<NamedCursorImage>(cursor_name_1)};
3248
362
    StubInputTargets targets({});
363
    StubScene targets({});
3249
363
    
364
    
3250
364
    mi::CursorController controller(mt::fake_shared(targets),
365
    mi::CursorController controller(mt::fake_shared(targets),
3251
365
        mt::fake_shared(cursor), default_cursor_image);
366
        mt::fake_shared(cursor), default_cursor_image);
3252
@@ -379,7 +380,7 @@
3253
379
    // Here we also demonstrate that the cursor begins at 0,0.
380
    // Here we also demonstrate that the cursor begins at 0,0.
3254
380
    StubInputSurface surface1{rect_0_0_1_1, image};
381
    StubInputSurface surface1{rect_0_0_1_1, image};
3255
381
    StubInputSurface surface2{rect_0_0_1_1, image};
382
    StubInputSurface surface2{rect_0_0_1_1, image};
3257
382
    StubInputTargets targets({});
383
    StubScene targets({});
3258
383
    
384
    
3259
384
    mi::CursorController controller(mt::fake_shared(targets),
385
    mi::CursorController controller(mt::fake_shared(targets),
3260
385
        mt::fake_shared(cursor), default_cursor_image);
386
        mt::fake_shared(cursor), default_cursor_image);
3261
386
387
3262
=== added file 'tests/unit-tests/input/test_touchspot_controller.cpp'
3263
--- tests/unit-tests/input/test_touchspot_controller.cpp	1970-01-01 00:00:00 +0000
3264
+++ tests/unit-tests/input/test_touchspot_controller.cpp	2014-09-18 16:04:44 +0000
3265
@@ -0,0 +1,199 @@
3266
1
/*
3267
2
 * Copyright © 2014 Canonical Ltd.
3268
3
 *
3269
4
 * This program is free software: you can redistribute it and/or modify
3270
5
 * it under the terms of the GNU General Public License version 3 as
3271
6
 * published by the Free Software Foundation.
3272
7
 *
3273
8
 * This program is distributed in the hope that it will be useful,
3274
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3275
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3276
11
 * GNU General Public License for more details.
3277
12
 *
3278
13
 * You should have received a copy of the GNU General Public License
3279
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3280
15
 *
3281
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
3282
17
 */
3283
18
3284
19
#include "src/server/input/touchspot_controller.h"
3285
20
3286
21
#include "mir/graphics/graphic_buffer_allocator.h"
3287
22
#include "mir/graphics/renderable.h"
3288
23
#include "mir/graphics/buffer_writer.h"
3289
24
#include "mir_test/fake_shared.h"
3290
25
#include "mir_test_doubles/stub_buffer.h"
3291
26
#include "mir_test_doubles/stub_scene.h"
3292
27
#include "mir_test_doubles/mock_buffer.h"
3293
28
#include "mir_test_doubles/stub_input_scene.h"
3294
29
3295
30
#include <gmock/gmock.h>
3296
31
#include <gtest/gtest.h>
3297
32
3298
33
#include <algorithm>
3299
34
#include <vector>
3300
35
3301
36
#include <assert.h>
3302
37
3303
38
namespace mi = mir::input;
3304
39
namespace mg = mir::graphics;
3305
40
namespace mt = mir::test;
3306
41
namespace mtd = mt::doubles;
3307
42
namespace geom = mir::geometry;
3308
43
3309
44
namespace
3310
45
{
3311
46
3312
47
struct MockBufferAllocator : public mg::GraphicBufferAllocator
3313
48
{
3314
49
    MOCK_METHOD1(alloc_buffer, std::shared_ptr<mg::Buffer>(mg::BufferProperties const&));
3315
50
    MOCK_METHOD0(supported_pixel_formats, std::vector<MirPixelFormat>(void));
3316
51
};
3317
52
3318
53
struct StubBufferWriter : public mg::BufferWriter
3319
54
{
3320
55
    void write(mg::Buffer& /* buffer */,
3321
56
        unsigned char const* /* data */, size_t /* size */) override
3322
57
    {
3323
58
    }
3324
59
};
3325
60
3326
61
struct StubScene : public mtd::StubInputScene
3327
62
{
3328
63
    void add_input_visualization(std::shared_ptr<mg::Renderable> const& overlay) override
3329
64
    {
3330
65
        overlays.push_back(overlay);
3331
66
    }
3332
67
3333
68
    void remove_input_visualization(std::weak_ptr<mg::Renderable> const& overlay) override
3334
69
    {
3335
70
        auto l = overlay.lock();
3336
71
        assert(l);
3337
72
        
3338
73
        auto it = std::find(overlays.begin(), overlays.end(), l);
3339
74
        assert(it != overlays.end());
3340
75
3341
76
        overlays.erase(it);
3342
77
    }
3343
78
    
3344
79
    void expect_spots_centered_at(std::vector<geom::Point> spots)
3345
80
    {
3346
81
        int const touchspot_side_in_pixels = 64;
3347
82
        for (auto overlay : overlays)
3348
83
        {
3349
84
            auto top_left_pos = overlay->screen_position().top_left;
3350
85
            auto center_pos = geom::Point{top_left_pos.x.as_int() + touchspot_side_in_pixels/2,
3351
86
                top_left_pos.y.as_int() + touchspot_side_in_pixels/2};
3352
87
            auto it = std::find(spots.begin(), spots.end(), center_pos);
3353
88
            EXPECT_FALSE(it == spots.end());
3354
89
            spots.erase(it);
3355
90
        }
3356
91
        // If there are left over spots then we didn't have an overlay corresponding to one
3357
92
        EXPECT_EQ(0, spots.size());
3358
93
    }
3359
94
    
3360
95
    std::vector<std::shared_ptr<mg::Renderable>> overlays;
3361
96
};
3362
97
3363
98
struct TestTouchspotController : public ::testing::Test
3364
99
{
3365
100
    TestTouchspotController()
3366
101
        : allocator(std::make_shared<MockBufferAllocator>()),
3367
102
          writer(std::make_shared<StubBufferWriter>()),
3368
103
          scene(std::make_shared<StubScene>())
3369
104
    {
3370
105
    }
3371
106
    std::shared_ptr<MockBufferAllocator> const allocator;
3372
107
    std::shared_ptr<mg::BufferWriter> const writer;
3373
108
    std::shared_ptr<StubScene> const scene;
3374
109
};
3375
110
3376
111
MATCHER(SoftwareBuffer, "")
3377
112
{
3378
113
    auto properties = static_cast<mg::BufferProperties const&>(arg);
3379
114
    if (properties.usage != mg::BufferUsage::software)
3380
115
        return false;
3381
116
    return true;
3382
117
}
3383
118
3384
119
}
3385
120
3386
121
TEST_F(TestTouchspotController, allocates_software_buffer_for_touchspots)
3387
122
{
3388
123
    using namespace ::testing;
3389
124
3390
125
    EXPECT_CALL(*allocator, alloc_buffer(SoftwareBuffer())).Times(1)
3391
126
        .WillOnce(Return(std::make_shared<mtd::StubBuffer>()));
3392
127
    mi::TouchspotController controller(allocator, writer, scene);
3393
128
}
3394
129
3395
130
TEST_F(TestTouchspotController, touches_result_in_renderables_in_stack)
3396
131
{
3397
132
    using namespace ::testing;
3398
133
    
3399
134
    EXPECT_CALL(*allocator, alloc_buffer(SoftwareBuffer())).Times(1)
3400
135
        .WillOnce(Return(std::make_shared<mtd::StubBuffer>()));
3401
136
    mi::TouchspotController controller(allocator, writer, scene);
3402
137
    controller.enable();
3403
138
    
3404
139
    controller.visualize_touches({ {{0,0}, 1} });
3405
140
3406
141
    scene->expect_spots_centered_at({{0, 0}});
3407
142
}
3408
143
3409
144
TEST_F(TestTouchspotController, spots_move)
3410
145
{
3411
146
    using namespace ::testing;
3412
147
    
3413
148
    EXPECT_CALL(*allocator, alloc_buffer(SoftwareBuffer())).Times(1)
3414
149
        .WillOnce(Return(std::make_shared<mtd::StubBuffer>()));
3415
150
    mi::TouchspotController controller(allocator, writer, scene);
3416
151
    controller.enable();
3417
152
    
3418
153
    controller.visualize_touches({ {{0,0}, 1} });
3419
154
    scene->expect_spots_centered_at({{0, 0}});
3420
155
    controller.visualize_touches({ {{1,1}, 1} });
3421
156
    scene->expect_spots_centered_at({{1, 1}});
3422
157
}
3423
158
3424
159
TEST_F(TestTouchspotController, multiple_spots)
3425
160
{
3426
161
    using namespace ::testing;
3427
162
    
3428
163
    EXPECT_CALL(*allocator, alloc_buffer(SoftwareBuffer())).Times(1)
3429
164
        .WillOnce(Return(std::make_shared<mtd::StubBuffer>()));
3430
165
    mi::TouchspotController controller(allocator, writer, scene);
3431
166
    controller.enable();
3432
167
    
3433
168
    controller.visualize_touches({ {{0,0}, 1}, {{1, 1}, 1}, {{3, 3}, 1} });
3434
169
    scene->expect_spots_centered_at({{0, 0}, {1, 1}, {3, 3}});
3435
170
    controller.visualize_touches({ {{0,0}, 1}, {{1, 1}, 1}, {{3, 3}, 1}, {{5, 5}, 1} });
3436
171
    scene->expect_spots_centered_at({{0, 0}, {1, 1}, {3, 3}, {5, 5}});
3437
172
    controller.visualize_touches({ {{1,1}, 1} });
3438
173
    scene->expect_spots_centered_at({{1, 1}});
3439
174
    controller.visualize_touches({});
3440
175
    scene->expect_spots_centered_at({});
3441
176
}
3442
177
3443
178
// This leaves some semantics undefined, i,e. if the touchspot controller is enabled/disabled
3444
179
// during a gesture do the spots appear/dissapear? I've been unable to develop a strong opinion
3445
180
// on this semantic, so I am leaving it unspecified ~racarr
3446
181
TEST_F(TestTouchspotController, touches_do_not_result_in_renderables_in_stack_when_disabled)
3447
182
{
3448
183
    using namespace ::testing;
3449
184
    
3450
185
    EXPECT_CALL(*allocator, alloc_buffer(SoftwareBuffer())).Times(1)
3451
186
        .WillOnce(Return(std::make_shared<mtd::StubBuffer>()));
3452
187
    mi::TouchspotController controller(allocator, writer, scene);
3453
188
    controller.enable();
3454
189
    
3455
190
    controller.disable();
3456
191
    controller.visualize_touches({ {{0,0}, 1} });
3457
192
3458
193
    scene->expect_spots_centered_at({});
3459
194
3460
195
    controller.enable();
3461
196
    controller.visualize_touches({ {{0,0}, 1} });
3462
197
3463
198
    scene->expect_spots_centered_at({{0, 0}});
3464
199
}
3465
0
200
3466
=== modified file 'tests/unit-tests/scene/test_surface_stack.cpp'
3467
--- tests/unit-tests/scene/test_surface_stack.cpp	2014-09-10 12:50:53 +0000
3468
+++ tests/unit-tests/scene/test_surface_stack.cpp	2014-09-18 16:04:44 +0000
3469
@@ -28,6 +28,7 @@
3470
28
#include "mir_test_doubles/stub_input_channel.h"
28
#include "mir_test_doubles/stub_input_channel.h"
3471
29
#include "mir_test/fake_shared.h"
29
#include "mir_test/fake_shared.h"
3472
30
#include "mir_test_doubles/stub_buffer_stream.h"
30
#include "mir_test_doubles/stub_buffer_stream.h"
3473
31
#include "mir_test_doubles/stub_renderable.h"
3474
31
#include "mir_test_doubles/mock_buffer_stream.h"
32
#include "mir_test_doubles/mock_buffer_stream.h"
3475
32
#include "mir_test_doubles/null_surface_configurator.h"
33
#include "mir_test_doubles/null_surface_configurator.h"
3476
33
34
3477
@@ -103,6 +104,7 @@
3478
103
    MOCK_METHOD1(surface_added, void(ms::Surface*));
104
    MOCK_METHOD1(surface_added, void(ms::Surface*));
3479
104
    MOCK_METHOD1(surface_removed, void(ms::Surface*));
105
    MOCK_METHOD1(surface_removed, void(ms::Surface*));
3480
105
    MOCK_METHOD0(surfaces_reordered, void());
106
    MOCK_METHOD0(surfaces_reordered, void());
3481
107
    MOCK_METHOD0(scene_changed, void());
3482
106
108
3483
107
    MOCK_METHOD1(surface_exists, void(ms::Surface*));
109
    MOCK_METHOD1(surface_exists, void(ms::Surface*));
3484
108
    MOCK_METHOD0(end_observation, void());
110
    MOCK_METHOD0(end_observation, void());
3485
@@ -673,6 +675,100 @@
3486
673
    stack.add_surface(stub_surface1, default_params.depth, default_params.input_mode);
675
    stack.add_surface(stub_surface1, default_params.depth, default_params.input_mode);
3487
674
}
676
}
3488
675
677
3489
678
TEST_F(SurfaceStack, scene_observer_notified_of_add_and_remove_input_visualization)
3490
679
{
3491
680
    using namespace ::testing;
3492
681
3493
682
    MockSceneObserver observer;
3494
683
    mtd::StubRenderable r;
3495
684
3496
685
    InSequence seq;
3497
686
    EXPECT_CALL(observer, scene_changed()).Times(2);
3498
687
3499
688
    stack.add_observer(mt::fake_shared(observer));
3500
689
3501
690
    stack.add_input_visualization(mt::fake_shared(r));
3502
691
    stack.remove_input_visualization(mt::fake_shared(r));
3503
692
}
3504
693
3505
694
TEST_F(SurfaceStack, overlays_do_not_appear_in_input_enumeration)
3506
695
{
3507
696
    mtd::StubRenderable r;
3508
697
    
3509
698
    stack.add_surface(stub_surface1, default_params.depth, default_params.input_mode);
3510
699
    stack.add_surface(stub_surface2, default_params.depth, default_params.input_mode);
3511
700
3512
701
    // Configure surface1 and surface2 to appear in input enumeration.
3513
702
    stub_surface1->configure(mir_surface_attrib_visibility, MirSurfaceVisibility::mir_surface_visibility_exposed);
3514
703
    stub_surface2->configure(mir_surface_attrib_visibility, MirSurfaceVisibility::mir_surface_visibility_exposed);
3515
704
3516
705
    stack.add_input_visualization(mt::fake_shared(r));
3517
706
3518
707
    unsigned int observed_input_targets = 0;
3519
708
    stack.for_each([&observed_input_targets](std::shared_ptr<mi::Surface> const&)
3520
709
        {
3521
710
            observed_input_targets++;
3522
711
        });
3523
712
    EXPECT_EQ(2, observed_input_targets);
3524
713
}
3525
714
3526
715
TEST_F(SurfaceStack, overlays_appear_at_top_of_renderlist)
3527
716
{
3528
717
    using namespace ::testing;
3529
718
3530
719
    mtd::StubRenderable r;
3531
720
    
3532
721
    stack.add_surface(stub_surface1, default_params.depth, default_params.input_mode);
3533
722
    stack.add_input_visualization(mt::fake_shared(r));
3534
723
    stack.add_surface(stub_surface2, default_params.depth, default_params.input_mode);
3535
724
3536
725
    EXPECT_THAT(
3537
726
        stack.scene_elements_for(compositor_id),
3538
727
        ElementsAre(
3539
728
            SceneElementFor(stub_surface1),
3540
729
            SceneElementFor(stub_surface2),
3541
730
            SceneElementFor(mt::fake_shared(r))));    
3542
731
}
3543
732
3544
733
TEST_F(SurfaceStack, removed_overlays_are_removed)
3545
734
{
3546
735
    using namespace ::testing;
3547
736
3548
737
    mtd::StubRenderable r;
3549
738
    
3550
739
    stack.add_surface(stub_surface1, default_params.depth, default_params.input_mode);
3551
740
    stack.add_input_visualization(mt::fake_shared(r));
3552
741
    stack.add_surface(stub_surface2, default_params.depth, default_params.input_mode);
3553
742
3554
743
    EXPECT_THAT(
3555
744
        stack.scene_elements_for(compositor_id),
3556
745
        ElementsAre(
3557
746
            SceneElementFor(stub_surface1),
3558
747
            SceneElementFor(stub_surface2),
3559
748
            SceneElementFor(mt::fake_shared(r))));
3560
749
    
3561
750
    stack.remove_input_visualization(mt::fake_shared(r));
3562
751
3563
752
    EXPECT_THAT(
3564
753
        stack.scene_elements_for(compositor_id),
3565
754
        ElementsAre(
3566
755
            SceneElementFor(stub_surface1),
3567
756
            SceneElementFor(stub_surface2)));
3568
757
}
3569
758
3570
759
TEST_F(SurfaceStack, scene_observers_notified_of_generic_scene_change)
3571
760
{
3572
761
    MockSceneObserver o1, o2;
3573
762
3574
763
    EXPECT_CALL(o1, scene_changed()).Times(1);
3575
764
    EXPECT_CALL(o2, scene_changed()).Times(1);
3576
765
    
3577
766
    stack.add_observer(mt::fake_shared(o1));
3578
767
    stack.add_observer(mt::fake_shared(o2));
3579
768
    
3580
769
    stack.emit_scene_changed();
3581
770
}
3582
771
3583
676
TEST_F(SurfaceStack, only_enumerates_exposed_input_surfaces)
772
TEST_F(SurfaceStack, only_enumerates_exposed_input_surfaces)
3584
677
{
773
{
3585
678
    using namespace ::testing;
774
    using namespace ::testing;
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-08-12	Approve on 2014-09-18
Daniel van Vugt		2014-08-12	Needs Fixing on 2014-09-17
Andreas Pokorny (community)			Approve on 2014-09-17
Alberto Aguirre (community)		2014-09-03	Approve on 2014-09-16
Kevin DuBois (community)		2014-08-12	Approve on 2014-09-16
Cemil Azizoglu (community)			Approve on 2014-09-16
Review via email: mp+230555@code.launchpad.net