Mir

debian/control (+2/-2)
debian/libmirplatform3.install (+1/-1)
include/platform/mir/graphics/platform.h (+3/-0)
include/platform/mir/options/configuration.h (+1/-0)
include/server/mir/default_server_configuration.h (+5/-2)
include/server/mir/input/cursor_listener.h (+2/-2)
include/server/mir/input/touch_visualizer.h (+6/-2)
platform-ABI-sha1sums (+2/-2)
playground/demo-shell/demo_compositor.cpp (+6/-1)
playground/demo-shell/demo_renderer.cpp (+8/-3)
playground/demo-shell/demo_renderer.h (+7/-1)
server-ABI-sha1sums (+5/-4)
src/include/platform/mir/graphics/buffer_writer.h (+44/-0)
src/include/platform/mir/graphics/native_platform.h (+3/-0)
src/include/server/mir/compositor/scene_element.h (+4/-0)
src/include/server/mir/input/scene.h (+23/-8)
src/include/server/mir/scene/legacy_scene_change_notification.h (+2/-0)
src/include/server/mir/scene/observer.h (+4/-0)
src/platform/CMakeLists.txt (+1/-1)
src/platform/graphics/android/CMakeLists.txt (+1/-0)
src/platform/graphics/android/android_buffer_writer.cpp (+70/-0)
src/platform/graphics/android/android_buffer_writer.h (+50/-0)
src/platform/graphics/android/android_display.cpp (+1/-1)
src/platform/graphics/android/android_platform.cpp (+6/-0)
src/platform/graphics/android/android_platform.h (+1/-0)
src/platform/graphics/mesa/CMakeLists.txt (+1/-0)
src/platform/graphics/mesa/buffer_allocator.cpp (+1/-1)
src/platform/graphics/mesa/buffer_writer.cpp (+40/-0)
src/platform/graphics/mesa/buffer_writer.h (+43/-0)
src/platform/graphics/mesa/native_platform.cpp (+5/-0)
src/platform/graphics/mesa/native_platform.h (+1/-0)
src/platform/graphics/mesa/platform.cpp (+6/-0)
src/platform/graphics/mesa/platform.h (+1/-0)
src/platform/graphics/mesa/shm_buffer.cpp (+13/-0)
src/platform/graphics/mesa/shm_buffer.h (+2/-0)
src/platform/options/default_configuration.cpp (+3/-1)
src/platform/symbols.map (+2/-1)
src/server/graphics/default_configuration.cpp (+10/-0)
src/server/graphics/nested/nested_platform.cpp (+5/-0)
src/server/graphics/nested/nested_platform.h (+1/-0)
src/server/input/CMakeLists.txt (+1/-0)
src/server/input/android/android_input_registrar.cpp (+4/-0)
src/server/input/android/android_input_registrar.h (+1/-0)
src/server/input/android/android_input_target_enumerator.cpp (+4/-4)
src/server/input/android/android_input_target_enumerator.h (+3/-3)
src/server/input/android/input_sender.cpp (+9/-5)
src/server/input/android/input_sender.h (+1/-0)
src/server/input/cursor_controller.cpp (+8/-3)
src/server/input/cursor_controller.h (+3/-3)
src/server/input/default_configuration.cpp (+16/-10)
src/server/input/touchspot_controller.cpp (+166/-0)
src/server/input/touchspot_controller.h (+77/-0)
src/server/input/touchspot_image.c (+1034/-0)
src/server/scene/basic_surface.cpp (+0/-1)
src/server/scene/default_configuration.cpp (+2/-2)
src/server/scene/legacy_scene_change_notification.cpp (+5/-0)
src/server/scene/surface_stack.cpp (+78/-0)
src/server/scene/surface_stack.h (+16/-3)
src/server/symbols.map (+4/-1)
tests/acceptance-tests/test_nested_mir.cpp (+6/-1)
tests/acceptance-tests/test_touchspot_visualization.cpp (+2/-0)
tests/include/mir_test_doubles/null_platform.h (+7/-2)
tests/include/mir_test_doubles/stub_input_scene.h (+16/-5)
tests/include/mir_test_doubles/stub_scene_element.h (+5/-0)
tests/include/mir_test_doubles/stub_touch_visualizer.h (+6/-0)
tests/integration-tests/input/android/test_android_cursor_listener.cpp (+1/-1)
tests/integration-tests/input/android/test_android_input_manager.cpp (+1/-1)
tests/integration-tests/input/test_nested_input.cpp (+1/-1)
tests/mir_test_framework/stubbed_server_configuration.cpp (+13/-0)
tests/unit-tests/frontend/test_session_mediator.cpp (+1/-0)
tests/unit-tests/graphics/mesa/test_shm_buffer.cpp (+1/-1)
tests/unit-tests/graphics/nested/test_nested_platform.cpp (+5/-0)
tests/unit-tests/input/CMakeLists.txt (+1/-0)
tests/unit-tests/input/android/test_android_input_target_enumerator.cpp (+5/-4)
tests/unit-tests/input/test_cursor_controller.cpp (+12/-11)
tests/unit-tests/input/test_touchspot_controller.cpp (+199/-0)
tests/unit-tests/scene/test_surface_stack.cpp (+96/-0)

To merge this branch:

bzr merge lp:~mir-team/mir/touchspot-renderable

Wishlist

Fix Released

Link a bug report

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

This proposal supersedes a proposal from 2014-07-30.

Commit message

Add touchspot visualizations toggleable with --enable-touchspots

Description of the change

Add touchspot visualizations toggleable with --enable-touchspots, a runtime configuration method will be added at the USC level.

A humble attempt at a review guide, beginning with comments on the implementation (1, 2):

1. A lot of the diff size comes from touchspot_image.c .I feel that the actual cost from this is minimal and its better than implementing/copy-pasting an anti-aliased circle drawing algorithm. I think I would prefer to implement the drawing algorthmically using libpixman, but there has been some resistance in the past.

2. The core class is TouchspotController (implements TouchVisualizer) (touchspot_controller.cpp). TouchspotController implements a bespoke interface out of android-input (see droidinput::PointerController, and src/server/input/android_android/pointer_controller.cpp). TouchspotController responds to an instantaneous list of touchpoints (that is to say is not responsible for touch state tracking) and maintains an internal set of Renderables which it places at appropriate positions in the scene.

It's come up, should TouchspotController really use a bespoke interface for touch visualization or instead function as a server input filter. I'll give a few reasons why I've chosen this path (a, b, c):

a. Test guidance: There are two tests which guide towards the bespoke interface. First the test which expresses that device touches result in invocation of the TouchspotController. The TouchVisualizer interface allows this to be tested without involving the unrelated parts of MirEvent, it also allows for testing of the touch-visualization loop independent of the TouchspotController, helping solve a problem under test for shells which desire alternate implementations.
b. Reduction of domain: The TouchVisualizer is not interested in key events, the ability to accept/reject events, or a host of other things the InputFilter offers.
c. Decoupling from dispatch loop: The TouchVisualizer (through droidinput::PointerController) operates at the level of the InputReader. Given that it may never consume input events, there is no need for it to exist as part of the dispatch loop where it can stall a greater portion of the server event stream (due to say lock contention on the scene).

Moving on to some comments about the assorted server changes:

1. DemoRenderer requires modification in order to not render decorations on the touchspots. Ultimately I think the overridden ::begin interface is pretty strange...but its not any worse than the existing code. This little hack exposes a wart of DemoRenderer I had yet to notice...it implements mg::Renderer but no one consumes it through this interface.)prop
2. SurfaceStack extended with add/remove input_visualization. Ideally this would use a more scenegraphy style approach...not requiring bespoke methods for input visualizations (this interface is appropriate for touchspots, and then cursors). Changing add_surface/remove_surface to be add_renderable/remove_renderable is not a trivial task though, in particular due to the nature of SurfaceObservers (observing a superset of renderable properties) I estimated that this would add a couple thousand more lines to the diff. Ultimately this method is useful for multiple consumers (touchspot, cursor) and easy to verify (see changes in test_surface_stack) so I decided it had a certain pragmatic elegance.
3. SceneObserver extended with scene_changed, SurfaceStack extended with emit_scene_changed. It's not possible for the TouchspotRenderables to use the SurfaceObserver interface, and so an interface to notify the compositor the renderables have been added/removed/moved is required. In order for the TouchspotRenderable to use the the same interface as SurfaceObservation a few changes would be required. Notably the point at which surface observers are installed (SceneObserver:surface_added/removed) would need to work through a common base interface (presumably mg::Renderable or mc::SceneElement). Then, the SurfaceObserver interface itself would need trimming down, some methods are inappropriate for non surface renderables, i.e. SurfaceAttributes. Actually! If we wish to enforce the notion that the "scene" is a complete representation of the visual output, the SurfaceObserver needs trimming down anyway, the compositor should not be responding directly to a MirSurfaceAttrib change, rather the shell should respond and make changes to directly render-able attributes (i.e. size...) triggering recomposition. This suggests that two interfaces are warranted: mir::shell::SurfaceObserver and mir::compositor::(SceneElement/Renderable)Observer . I estimated this as another 2000 lines or so of diff though, and likely to cause some controversy, so I don't really want to open it up in this mp.
4. mi::InputTargets renamed to mi::Scene, with the addition of add/remove input_visualization and emit_scene_changed I think this is an obvious choice.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-30: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2264/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-07-30: Posted in a previous version of this proposal

At a quick glance, the things making this a 3685 line proposal actually don't need to be here...

(1) server-ABI-sha1sums: Changes to the ordering of this file are unreviewable (can't tell if things have been deleted or just moved). Please either keep the existing ordering or propose a re-ordering separately as a pre-req.

(2) touchspot_image.c: Obviously big as text. I think we can do better by generating this texture algorithmically. Not a blocker but I might do a proof-of-concept to demonstrate...

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-07-30: Posted in a previous version of this proposal

(3) Unused #includes and whitespace changes can be removed:
src/server/compositor/temporary_buffers.cpp
src/server/compositor/temporary_buffers.h

(4) src/platform/graphics/android/android_buffer_writer.cpp
Hmm, I'm wondering if we should have already abstracted software buffers on the server side so you don't need to write platform-specific code like this.

(5) A touchspot size of 64px is probably too small for high-res displays. If you're actually touching the display then it would be helpful for the touchspot to not be so small that it's completely hidden behind a finger. Consider making the Renderable rectangle dimensions independent of the buffer dimensions. OpenGL will scale for you.

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-07-30: Posted in a previous version of this proposal

Proposed reoredering as prereq.

(3) Unused #includes and whitespace changes can be removed:
src/server/compositor/temporary_buffers.cpp
src/server/compositor/temporary_buffers.h

Fixed! Thanks.

>> (4) src/platform/graphics/android/android_buffer_writer.cpp
>> Hmm, I'm wondering if we should have already abstracted software buffers on the server side so you
>> don't need to write platform-specific code like this.

You mean something like a generic version of the mesa shm_buffer? At one point I was thinking about something like this...but this way should be faster on platforms like android with HWC which allow generic buffer overlay.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-30: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2275/rebuild

review: Approve (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2014-07-30: Posted in a previous version of this proposal

needed?:
639 + auto mga_buffer = std::dynamic_pointer_cast<mga::Buffer>(buffer);
640 + if (!mga_buffer)
641 + BOOST_THROW_EXCEPTION(std::logic_error("Invalid buffer (did not originate from platform graphics driver)"));

could there be stronger typing than void*?
void mga::AndroidBufferWriter::write(std::shared_ptr<mg::Buffer> const& buffer, void const* data, size_t size)

overlay is a bit overloaded already, maybe just add_cursor_renderable()?
2824 + void add_overlay(std::shared_ptr<graphics::Renderable> const& overlay);
2825 + void remove_overlay(std::weak_ptr<graphics::Renderable> const& overlay);

const&
643 + auto handle = buffer->native_buffer_handle();

we shouldn't be adding this to Renderable without rejecting all 'decorated' renderables down in the hwc code. This function makes the RenderableList indeterminate in terms of what would appear on the screen. It says it should be decorated but doesn't say what this entails.
165 + virtual bool should_be_decorated() const = 0;

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-30: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2278/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-07-31: Posted in a previous version of this proposal

> You mean something like a generic version of the mesa shm_buffer? At one point
> I was thinking about something like this...but this way should be faster on
> platforms like android with HWC which allow generic buffer overlay.

That's interesting. GBM also allows overlays (bypass) of software buffers. However when I enabled it, the performance was worse, which is quite reasonable to expect but is driver-dependent too. Maybe Android would also benefit from intentionally disallowing overlaying of buffers that reside in CPU memory... Although if the CPU/GPU memory is shared then theoretically there should be no performance disadvantage to overlaying software buffers.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-07-31: Posted in a previous version of this proposal

Alright my blocking concern (1) is fixed. Please consider issues (2)-(5) still.

review: Abstain

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-07-31: Posted in a previous version of this proposal

Yeah...kind of strange I guess, just using static cast.

>> could there be stronger typing than void*?
>> void mga::AndroidBufferWriter::write(std::shared_ptr<mg::Buffer> const& buffer, void const* data, >> size_t size)

Using unsigned char now or did you mean something that encodes the pixel format?

>> overlay is a bit overloaded already, maybe just add_cursor_renderable()?
>> 2824 + void add_overlay(std::shared_ptr<graphics::Renderable> const& overlay);
>> 2825 + void remove_overlay(std::weak_ptr<graphics::Renderable> const& overlay);

How about "input_visualization"

>> const&
>> 643 + auto handle = buffer->native_buffer_handle();

Fixed

>> we shouldn't be adding this to Renderable without rejecting all 'decorated' renderables down in >> the hwc code. This function makes the RenderableList indeterminate in terms of what would appear >> on the screen. It says it should be decorated but doesn't say what this entails.
>> 165 + virtual bool should_be_decorated() const = 0;

I'm not sure the renderables should be / need to be rejected. If a shell wants to draw decorations then it is responsible for recognizing that passing the renderlist to the display buffer isn't appropriate right? So this method is really just for the shell compositor tor ecognize if the renderable is of a type which should be decorated. I agree it's strange...but I don't know how to do anything better without decorations expressed in the scene.

Revision history for this message

Kevin DuBois (kdub) wrote on 2014-08-01: Posted in a previous version of this proposal

> needed?:
> 639 + auto mga_buffer = std::dynamic_pointer_cast<mga::Buffer>(buffer);
> 640 + if (!mga_buffer)
> 641 + BOOST_THROW_EXCEPTION(std::logic_error("Invalid buffer (did not
> originate from platform graphics driver)"));
>
> Yeah...kind of strange I guess, just using static cast.
>
> >> could there be stronger typing than void*?
> >> void mga::AndroidBufferWriter::write(std::shared_ptr<mg::Buffer> const&
> buffer, void const* data, >> size_t size)
>
> Using unsigned char now or did you mean something that encodes the pixel
> format?
>
> >> overlay is a bit overloaded already, maybe just add_cursor_renderable()?
> >> 2824 + void add_overlay(std::shared_ptr<graphics::Renderable> const&
> overlay);
> >> 2825 + void remove_overlay(std::weak_ptr<graphics::Renderable> const&
> overlay);
>
> How about "input_visualization"
>
>
> >> const&
> >> 643 + auto handle = buffer->native_buffer_handle();
>
> Fixed
>
> >> we shouldn't be adding this to Renderable without rejecting all 'decorated'
> renderables down in >> the hwc code. This function makes the RenderableList
> indeterminate in terms of what would appear >> on the screen. It says it
> should be decorated but doesn't say what this entails.
> >> 165 + virtual bool should_be_decorated() const = 0;
>
> I'm not sure the renderables should be / need to be rejected. If a shell wants
> to draw decorations then it is responsible for recognizing that passing the
> renderlist to the display buffer isn't appropriate right? So this method is
> really just for the shell compositor tor ecognize if the renderable is of a
> type which should be decorated. I agree it's strange...but I don't know how to
> do anything better without decorations expressed in the scene.

The problem is really that:
mg::DisplayBuffer::post_renderables_if_optimizable() has the contract of either rejecting the list as whole, or painting exactly what is contained in the list. The addition of should_be_decorated() throws a big wrench in that contract because the implementer doesn't know what to paint correctly if should_be_decorated() returns true.

This also drives at the conversation in lp:~kdub/mir/prep-for-1348330. The compositors wants to do something different if this is a 'input visualization'. So, a decent compromise to me seems to be:
bool is_a_input_visualization()
instead of
bool should_be_decorated().
That way, the RenderableList remains definite, and can leave it up to the compositors as to what they want to do with the visualization.

> needed?:
> 639 + auto mga_buffer = std::dynamic_pointer_cast<mga::Buffer>(buffer);
> 640 + if (!mga_buffer)
> 641 + BOOST_THROW_EXCEPTION(std::logic_error("Invalid buffer (did not
> originate from platform graphics driver)"));
> 
> Yeah...kind of strange I guess, just using static cast.
> 
> >> could there be stronger typing than void*?
> >> void mga::AndroidBufferWriter::write(std::shared_ptr<mg::Buffer> const&
> buffer, void const* data, >> size_t size)
> 
> Using unsigned char now or did you mean something that encodes the pixel
> format?
> 
> >> overlay is a bit overloaded already, maybe just add_cursor_renderable()?
> >> 2824 + void add_overlay(std::shared_ptr<graphics::Renderable> const&
> overlay);
> >> 2825 + void remove_overlay(std::weak_ptr<graphics::Renderable> const&
> overlay);
> 
> How about "input_visualization"
> 
> 
> >> const&
> >> 643 + auto handle = buffer->native_buffer_handle();
> 
> Fixed
> 
> >> we shouldn't be adding this to Renderable without rejecting all 'decorated'
> renderables down in >> the hwc code. This function makes the RenderableList
> indeterminate in terms of what would appear >> on the screen. It says it
> should be decorated but doesn't say what this entails.
> >> 165 + virtual bool should_be_decorated() const = 0;
> 
> I'm not sure the renderables should be / need to be rejected. If a shell wants
> to draw decorations then it is responsible for recognizing that passing the
> renderlist to the display buffer isn't appropriate right? So this method is
> really just for the shell compositor tor ecognize if the renderable is of a
> type which should be decorated. I agree it's strange...but I don't know how to
> do anything better without decorations expressed in the scene.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-08-04: Posted in a previous version of this proposal

I think it's safe to say that demo-shell's decorations are a proof of concept that may change dramatically in the case of "everything's in the scene graph".

A scenegraph may exist in memory or in run-time recursion structure (at present, also used in Compiz). If the scenegraph moves to the former then should_be_decorated() wouldn't exist.

At the same time, should_be_decorated() probably shouldn't exist as it will be superseded by improved surface dimension info, that's been started but not finished yet:
https://code.launchpad.net/~vanvugt/mir/clarify-surface-size-pos/+merge/218578

That said, should_be_decorated() is simple enough that it's easy to drop when and if we're ready.

I suspect we can do better than the way post_renderables_if_optimizable() is designed right now, but until something better is proposed we should try to not block the overlays effort.

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-08-04: Posted in a previous version of this proposal

should_be_decorated->is_a_surface

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-04: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1818
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2307/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1189
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1195/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/829/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/830/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/112/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2307/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-07: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1820
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2343/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1246
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1252/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1235/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/865/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/866/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/170/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2343/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-08: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1821
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1262
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1251/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/876/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/877/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/186/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2354/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2014-08-11: Posted in a previous version of this proposal

I guess, still 'needs fixing', as the "is_a_surface" still has no context down within the mg::DisplayBuffer::post_renderables_if_optimizable function. Like, what should the display buffer do if this function returns false? "can hwc draw non-surfaces?" has an ambiguous answer.

In my estimation, mg::Renderable should just be a basic list of squares, the traditional information needed for blitting. A RenderableList should give a defined, specific picture that can be drawn.
I don't mind SceneElement gaining information that's specific to the scene, but Renderable should remain a simple list of squares.

Just for future planning, I think that some of this conflict is just because the name 'Renderable' is liked quite a lot. Perhaps we should rename the stuff down in the compositor BlitSquares, and then the Renderable/SceneElements can expand in whichever ways they need to, without dragging the platform display buffers (and the HWC implementation) along for the ride.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-11: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2363/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-12: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2364/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-12: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2371/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-08-12: Posted in a previous version of this proposal

Kevin: Moved is_a_surface to scene element. Chose is_a_surface over is_an_input_visualization to avoid the term input_visualization sticking (im not that hot on it).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-13: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1828
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2373/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1295
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1301/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/895/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/896/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/219/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2373/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-13:

FAILED: Continuous integration, rev:1828
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mir-team/mir/touchspot-renderable/+merge/230555/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2374/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1296
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1302/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1284/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/896/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/897/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/220/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2374/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-13:

FAILED: Continuous integration, rev:1829
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mir-team/mir/touchspot-renderable/+merge/230555/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2378/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1300
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1306/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1288/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/900
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/900/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/901/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/224/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2378/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2416/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-18:

FAILED: Continuous integration, rev:1831
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2429/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1371/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1377/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1354/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/951/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/952/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/291/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2429/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-18:

FAILED: Continuous integration, rev:1832
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2430/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1373/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1379/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1356/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/952/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/953/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/293/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2430/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-21:

FAILED: Continuous integration, rev:1833
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2466/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1424/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1403/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/988/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/340/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2466/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2467/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2474/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2475/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-27:

FAILED: Continuous integration, rev:1836
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2517/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1479/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1485/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1039/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/400/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2517/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-08-28:

Per previous discussions (in kdub's proposals I think?) any logic specific to how demo shell does decorations will likely need to be rewritten and/or removed in future as proper window management takes shape. And I think we're already landing too much code that apparently has a short lifespan.

Between that and my previous comments above, Abstain.

review: Abstain

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-02:

FAILED: Continuous integration, rev:1837
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2584/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1568/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1574/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1550/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1106/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/487/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2584/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-03:

PASSED: Continuous integration, rev:1838
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2585/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1576
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1107
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/489
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/489/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2623
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12528

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2585/rebuild

review: Approve (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2014-09-03:

#1
86 + void begin(std::unordered_set<graphics::Renderable::ID> &&renderables_not_to_decorate) const;

I think its a bit more flexible not to force the use of the rvalue.
void begin(std::unordered_set<graphics::Renderable::ID> renderables_not_to_decorate) const;

begin(std::move(a)) would still use the move constructor

#2
193 + virtual std::shared_ptr<BufferWriter> create_buffer_writer() = 0;
I had to change to make_* over in my MP :)
<side note> I think that the "display stuff" should get split out of Platform into its own interface to get rid of NativePlatform.

#3
167 + virtual void write(std::shared_ptr<Buffer> const& buffer, unsigned char const* data, size_t size) = 0;

A continuation from the superseded discussion, but a char* and a size seems like it puts more burden on the caller of the interface to make sure that raw data in the char* matches what the buffer expects. (An example of this is line 1059 where we throw if the size is incorrect) The ideal is probably to see something like:
write(Buffer&, std::vector<Pixels>)
where the write function figures out how to get the pixels into that buffer (adjust for stride, format differences, etc etc)

#4
711 + auto mga_buffer = std::static_pointer_cast<mga::Buffer>(buffer);
needs removal.
Somewhat related, but write() could use a Buffer& instead of a shared_ptr<Buffer>

#5
716 + int usage = GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN;
minor point, but we just need SW_WRITE_OFTEN

#6
696 +mga::AndroidBufferWriter::AndroidBufferWriter()
We recreate the gralloc module in the constructor here, could reuse a single instance.

#7
698 + int err;
699 +
could use auto and get rid of these lines

#8
963 +
2701
whitespace introduction

#9
The 64x64x4 still increases mir's memory and installation footprint a fair amount, maybe we could programatically create a smaller image?

Revision history for this message

Kevin DuBois (kdub) wrote on 2014-09-03:

okay, so structurally, much better.

I think
#1,2,4,5,7,8
are my 'needs fixings'

and the rest are just suggestions

review: Needs Fixing

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-09-03:

Kevin. Thanks for review :) Getting to your comments asap.

Reflected some on the configuration requirements with Anpok this morning. In particular autopilot would like to runtime enable/disable the visualization via IPC. I considered a mirclient function but we lack the necessary infrastructure, i.e.

mir_input_device_enable_touch_visualization could make sense if we supported some sort of client MirInputDevice enumeration.

For now ( some sort of client InputDevice enumeration is available) I have landed on the com.canonical.Unity.Screen DBus interface in USC. USC MP incoming soon.

In order to support this without awkward usage of mir options in USC or exposing the touchspot controller implementation I have added enable/disable methods to the TouchVisualizer interface and ported the default server configuration to use this mechanism for the static touchspot option.

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-09-03:

kdub 1. Fixed rvalue usage...still not used to move semantics I guess.
2. Aha good call
3. It seems like we really need a Pixels(Array, Size, PixelFormat) kind of type...not for this MP though I think.
4, 5: Good call.
6: Hmm I kind of have the thought that I like it more this way so people can just construct it without getting in to the game of who owns the dependencies. On the other hand its not clear that hiding the depdency in the constructor is really correct. I think you could make an argument for it though in that the gralloc module is effectively a system resource...*shrug* I dont have a strong enough opinion to change it really but maybe someone else will comment.
7, 8: Fixed
9: I've thought about it...the problem is effective circle anti-aliasing algorithms are more than a few dozen that lines long...at which point the question starts to become, should we link in pixman? etc...to which there has been a little resistance in the past so I didn't want to dredge up again.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-03:

PASSED: Continuous integration, rev:1842
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2602/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1591
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1597
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1573
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1124
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/510
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/510/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2638
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12585

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2602/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-03:

FAILED: Continuous integration, rev:1846
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2604/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1594
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1600
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1576/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1126
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1126/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/513/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2604/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-09-03:

Interesting it looks like one of the jenkins jobs missed r1847...ah the perils of real time.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2605/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2606/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-04:

PASSED: Continuous integration, rev:1849
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2610/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1608
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1584
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1132
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/521
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/521/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2648
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12619

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2610/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2014-09-04:

Not a complete review yet, just some first notes:

162 +class BufferWriter

At first glance it would be more natural to introduce a Buffer::write() method instead of a class that acts on the buffer, unless we want to potentially support multiple implementations of it.

1577 +void mi::TouchspotController::visualize_touches(std::vector<Spot> const& touches)

Perhaps the logic in this method would be more clear if we split it out into different stages, e.g.:

1. grow touchpot renderable vector as needed (already there)
2. for each touch: set up and add renderable to scene
3. for unused renderables: remove from scene

1618 + scene->emit_scene_changed();

We should call this out of lock if possible.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-06:

Why are the touchspots not rendered with just GL draw commands?

Why the need for raw RGB data?

review: Needs Information

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-09-08:

write/BufferWriter discussed in standup. Calling scene->emit_scene_changed out of lock now.

Will think if visualize touches can be cleared up.

>>
>> Why are the touchspots not rendered with just GL draw commands?
>> Why the need for raw RGB data?
>>

It seems to me that RGB data is simpler in every way except for polluting the launchpad diff. No worry about anti-aliasing approaches, no dealing with GL contexts, etc...

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-09:

PASSED: Continuous integration, rev:1852
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2656/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1663
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1178
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/582
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/582/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2702
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12921

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2656/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-09:

touch_visualizer.h should be in the public headers as the USC branch that makes use of this feature will use it.

review: Needs Fixing

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-09:

556 + if (buffer.stride().as_uint32_t() * buffer_size.height.as_uint32_t() != size)
557 + BOOST_THROW_EXCEPTION(std::logic_error("Size of pixels is not equal to size of buffer"));

You should just do a line by line copy. You'll be excluding devices with stride.

review: Needs Fixing

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-09:

1362 + void move_to(geom::Point pos)
1363 + {
1364 + std::lock_guard<std::mutex> lg(guard);
1365 + position = pos;
1366 + }

The position should either represent the centroid of the buffer, or it should be translated so that the renderable position centroid is the position given.

Othewise, the touchspots look like they are offset from the touch location.

review: Needs Fixing

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-09:

With overlays enabled in an android based device, for a device say with 4 overlay layers..

It only renders 3/4 simultaneous touch-spots but the other client surfaces are not getting rendered.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-10:

PASSED: Continuous integration, rev:1854
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2669/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1666
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1191
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/603
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/603/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2720
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12987

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2669/rebuild

review: Approve (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-09-10:

touchspot_controller.cpp:
+ nits: a lot of additional whitespace ..
+ unsure: from what interfaces it needs it feels more like belonging to scene maybe?
+ needs fixing: visualize_touches will benefit a lot from extracting the three steps inside the mutex block into separate methods, and you could remove some of the comments then
+ needs fixing: touch spot render ables should be centered around the spots

I might have missed the rationale behind it, because looking at how buffer writer is looks like an alternative buffer allocator/constructor function. Especially looking at the behavior - new buffer must match the old buffer in size...?

Nit: mgm::BufferWriter::write should throw std::invalid_argument when no shm buffer is supplied.

So this is a needs information with two small needs fixing.

review: Needs Fixing

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-09-10:

Thanks!

Republished header.
Fixed touchspot centroid.
Made stride copy line by line.l
Overlay issue revealed to be unrelated.
Will clean up visualize_touches in the next hour or so.
Will reflect on moving touchspot_controller to scene, and continue to reflect on BufferWriter.

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-09-10:

I found it pretty difficult to refactor visualize_touches...

Splitting out functions seemed only to introduce obscure function names that further impaired readability, e.g.

ensure_renderable_pool_has_size_locked, etc...

I've added a textual description of the spot->renderable assignment algorithm in the hopes that this helps?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-10:

FAILED: Continuous integration, rev:1860
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2687/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1707/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1713/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1686/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1209/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/623/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2687/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2688/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-09-11:

sryy,but i meant something trivial like:

1441 + {
1442 + std::lock_guard<std::mutex> lg(guard);
1443 +
1444 + if (!enabled)
1445 + {
1446 + remove_touchspot_renderables();
1454 + return;
1455 + }
1456 +
1457 + grow_touchspot_renderables(touches.size());
1461 +
1462 + update_touchspot_renderables(touches);
1487 + }
1488 +
1489 + // TODO (hackish): We may have just moved renderables which with the current
1490 + // architecture of surface observers will not trigger a propagation to the
1491 + // compositor damage callback we need this "emit_scene_changed".
1492 + scene->emit_scene_changed();

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2014-09-11:

> I found it pretty difficult to refactor visualize_touches...
>
> Splitting out functions seemed only to introduce obscure function names that further impaired readability, e.g.

I think that, as a first step at least, moving the operations out of a single, big loop will help, and then we can more easily extract to separate functions if we think it will provide gain in readability. For example (code tested with unit tests):

> 1. grow touchpot renderable vector as needed (already there)
> 2. for each touch: set up and add renderable to scene
> 3. for unused renderables: remove from scene

unsigned int const num_touches = enabled ? touches.size() : 0;

while (touchspot_renderables.size() < num_touches)
touchspot_renderables.push_back(std::make_shared<TouchspotRenderable>(touchspot_buffer));

// Update renderables used for touches
for (unsigned int i = 0; i < num_touches; ++i)
{
auto const& renderable = touchspot_renderables[i];

renderable->move_center_to(touches[i].touch_location);

if (i >= renderables_in_use)
scene->add_input_visualization(renderable);
}

// Update unused renderables
for (unsigned int i = num_touches; i < renderables_in_use; ++i)
scene->remove_input_visualization(touchspot_renderables[i]);

renderables_in_use = num_touches;

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-09-11:

Oh yeah thats much nicer...thanks alf.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-11:

PASSED: Continuous integration, rev:1866
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2702/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1224
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1224/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/647
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/647/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2749
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13092

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2702/rebuild

review: Approve (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-09-15:

Pushed a bunch of random cleanup.

Reflected on mg::BufferWriter v. mg::Buffer::write, decided to keep it as is after consulting the guideline:

Prefer non-member non-friend functions.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-15:

FAILED: Continuous integration, rev:1875
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2727/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1765
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1772/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1743/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1249/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/680/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2727/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-15:

PASSED: Continuous integration, rev:1876
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2728/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1767
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1774
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1250
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1250/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/682
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/682/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2781
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13222

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2728/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-15:

Needs fixing: Wrong year.

1511 +++ src/server/input/touchspot_image.c

I know you already covered this, but given this is mostly a debug thing...What if we are asked to change the color...or the size...

I'd rather just have a dumb basic non-antialiased circle drawing routine (but I don't feel strongly about it so non-blocking).
    for(int y = -radius; y < radius; y++)
    {
        for(int x = -radius; x < radius; x++)
        {
            if( (x*x + y*y) <= radius_sq)
            {
                buffer.setpixel(radius + x, radius + y);
            }
        }
    }

2766 +
2767 + // Intended for input overlays, as described in mir::input::Scene documentation.
2768 + void add_input_visualization(std::shared_ptr<graphics::Renderable> const& overlay);
2769 + void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& overlay);
2770 +
2771 + void emit_scene_changed() override;

I know covered already but seems like a strange interface addition for something named input::scene...But again don't feel too strongly about it since our scene interface is already wonky anyways...

review: Needs Fixing

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2014-09-16:

Looks good to me overall.

Minor stuff :

1472 +/// of touchspot renderables for visualization. Touchspot visualization
1473 +/// and must be enabled through a call to ::enable

Incorrect sentence in comment

1003 === modified file 'src/server/input/android/android_input_target_enumerator.cpp'

Should this file be renamed to something like android_scene_enumerator.cpp to reflect the input_target --> scene change?

1037 === modified file 'src/server/input/android/android_input_target_enumerator.h'

Ditto

review: Approve

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-09-16:

Updated copyright and comments.

Alberto: I agree add/remove_input_visualization is strange. I'd rather see a "layers" API but still don't know how to implement it...

Non antialiased circle would be ok if the main other use weren't screen casting where having a nice antialiased ubuntu orange circle is worth something.

Cemil:

Fixed comment.

Wrt to android_input_target_enumerator, my thought is no, as the InputDispatcher doesn't deal in terms of scene. Perhaps the most accurate name would be AndroidInputWindowHandleEnumerator but I don't think that adds much.

Revision history for this message

Kevin DuBois (kdub) wrote on 2014-09-16:

looking good!

needs-fixings:
could some of the new files be 'private'?

c-cast:
537 + usage, top, left, width, height, (void**) &vaddr) )

mir::graphics::android::AndroidBufferWriter could just be mir::graphics::android::BufferWriter

suggestions:
enable()/disable() on touch visualizer seems a bit misplaced. Could the compositor just know whether it should draw visualizations or not and then call the visualize_touches according to what it wants to do?
The BufferWriters could also have a test.

Revision history for this message

Kevin DuBois (kdub) wrote on 2014-09-16:

well, looks good to me then!

review: Approve

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2014-09-16:

kdub's comment reminded me a couple of other things that I had in mind but had forgotten by the time I finished reviewing :-). This MP will break the server ABI no matter what but let's try to minimize our exposure :

144 === renamed file 'src/include/server/mir/input/touch_visualizer.h' => 'include/server/mir/input/touch_visualizer.h'

Can this stay private please unless you'll be changing downstreams to use this functionality right away?

1 === added file 'include/platform/mir/graphics/buffer_writer.h'

Can we make this private for now?

Since we are messging with makefiles, symbols, etc., also, can you please make sure the 3 downstreams still build? Finding them out at release time is a real PITA.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-16:

@Cemil,

The touch_visualizer.h header will be needed by this USC branch:
https://code.launchpad.net/~mir-team/unity-system-compositor/touchspot-toggling/+merge/233742

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

PASSED: Continuous integration, rev:1878
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2735/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1786
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1257
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1257/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/693
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/693/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2795
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13279

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2735/rebuild

review: Approve (continuous-integration)

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2014-09-16:

> @Cemil,
>
> The touch_visualizer.h header will be needed by this USC branch:
> https://code.launchpad.net/~mir-team/unity-system-compositor/touchspot-
> toggling/+merge/233742

O ok that's fine.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-16:

OK.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

FAILED: Continuous integration, rev:1881
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2737/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1781/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1788
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1758/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1259/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/695/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2737/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

FAILED: Continuous integration, rev:1882
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2739/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1783/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1790/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1760/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1261/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/697/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2739/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-17:

FAILED: Continuous integration, rev:1883
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2741/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1785
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1792/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1762/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1263/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/699/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2741/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-17:

FAILED: Continuous integration, rev:1884
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2742/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1786
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1793/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1763/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1264/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/700/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2742/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-17:

PASSED: Continuous integration, rev:1885
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2743/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1265
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/701
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/701/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2799
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13298

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2743/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-17:

FAILED: Continuous integration, rev:1887
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2744/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1790
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1797
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1766/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1266
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1266/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/703
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/703/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2801/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13301

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2744/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2014-09-17:

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-09-17:

(6) Server ABI broken, and needs bumping due to:
include/server/mir/default_server_configuration.h
include/server/mir/input/cursor_listener.h
etc.

Although you will probably find CI fails on any server ABI bump. We need to fix bug 1293944 to get past that.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-17:

FAILED: Continuous integration, rev:1888
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2750/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1805
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1772/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1272
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1272/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/709
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/709/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2807/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13341

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2750/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-17:

PASSED: Continuous integration, rev:1889
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2751/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1806
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1273
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1273/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/710
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/710/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2808
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13348

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2751/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2014-09-18:

Feel free to ignore my "Needs fixing" above if it causes too much grief. So long as we remember to:
1. Bump MIRSERVER_ABI to 26 before branching/releasing 0.8.0; and
2. Not backport this branch or any ABI breaks to 0.7;
then we're OK.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-18:

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/1082/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1804/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1811/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1778/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/466/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/715/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2014-09-18:

Fixed text conflicts.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-18:

PASSED: Continuous integration, rev:1890
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2761/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1812
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1819
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1283
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1283/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/722
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/722/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2818
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13416

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2761/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2014-09-18:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'debian/control'
 --- debian/control	2014-09-10 12:50:53 +0000
 +++ debian/control	2014-09-18 16:04:44 +0000
@@ -60,7 +60,7 @@
+  .
   Contains the shared library needed by server applications for Mir.
--Package: libmirplatform2
++Package: libmirplatform3
  Section: libs
  Architecture: i386 amd64 armhf arm64
  Multi-Arch: same
@@ -123,7 +123,7 @@
  Architecture: i386 amd64 armhf arm64
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
--Depends: libmirplatform2 (= ${binary:Version}),
++Depends: libmirplatform3 (= ${binary:Version}),
           libmircommon-dev,
           libboost-program-options-dev,
           ${misc:Depends},
 === renamed file 'debian/libmirplatform2.install' => 'debian/libmirplatform3.install'
 --- debian/libmirplatform2.install	2014-09-10 12:50:53 +0000
 +++ debian/libmirplatform3.install	2014-09-18 16:04:44 +0000
@@ -1,1 +1,1 @@
--usr/lib/*/libmirplatform.so.2
++usr/lib/*/libmirplatform.so.3
 === modified file 'include/platform/mir/graphics/platform.h'
 --- include/platform/mir/graphics/platform.h	2014-09-11 19:07:15 +0000
 +++ include/platform/mir/graphics/platform.h	2014-09-18 16:04:44 +0000
@@ -53,6 +53,7 @@
  class GraphicBufferAllocator;
  class GLConfig;
  class GLProgramFactory;
++class BufferWriter;
  enum class BufferIpcMsgType
+ {
@@ -86,6 +87,8 @@
      virtual std::shared_ptr<GraphicBufferAllocator> create_buffer_allocator(
          std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
++
++    virtual std::shared_ptr<BufferWriter> make_buffer_writer() = 0;
      /**
       * Creates the display subsystem.
 === modified file 'include/platform/mir/options/configuration.h'
 --- include/platform/mir/options/configuration.h	2014-09-10 12:50:53 +0000
 +++ include/platform/mir/options/configuration.h	2014-09-18 16:04:44 +0000
@@ -41,6 +41,7 @@
  extern char const* const input_report_opt;
  extern char const* const host_socket_opt;
  extern char const* const frontend_threads_opt;
++extern char const* const touchspots_opt;
  extern char const* const fatal_abort_opt;
  extern char const* const name_opt;
 === modified file 'include/server/mir/default_server_configuration.h'
 --- include/server/mir/default_server_configuration.h	2014-09-10 12:50:53 +0000
 +++ include/server/mir/default_server_configuration.h	2014-09-18 16:04:44 +0000
@@ -105,6 +105,7 @@
  class BufferInitializer;
  class DisplayReport;
  class GraphicBufferAllocator;
++class BufferWriter;
  class Cursor;
  class CursorImage;
  class GLConfig;
@@ -114,7 +115,7 @@
  namespace input
+ {
  class InputReport;
--class InputTargets;
++class Scene;
  class InputManager;
  class CompositeEventFilter;
  class InputChannelFactory;
@@ -214,6 +215,7 @@
       * dependencies of compositor on the rest of the Mir
       *  @{ */
      virtual std::shared_ptr<graphics::GraphicBufferAllocator> the_buffer_allocator();
++    virtual std::shared_ptr<graphics::BufferWriter> the_buffer_writer();
      virtual std::shared_ptr<compositor::Scene>                  the_scene();
      virtual std::shared_ptr<compositor::FrameDroppingPolicyFactory> the_frame_dropping_policy_factory();
      /** @} */
@@ -291,7 +293,7 @@
      virtual std::shared_ptr<input::InputReport> the_input_report();
      virtual std::shared_ptr<input::CompositeEventFilter> the_composite_event_filter();
      virtual std::shared_ptr<shell::InputTargeter> the_input_targeter();
--    virtual std::shared_ptr<input::InputTargets>  the_input_targets();
++    virtual std::shared_ptr<input::Scene>  the_input_scene();
      virtual std::shared_ptr<input::CursorListener> the_cursor_listener();
      virtual std::shared_ptr<input::TouchVisualizer> the_touch_visualizer();
      virtual std::shared_ptr<input::InputRegion>    the_input_region();
@@ -359,6 +361,7 @@
      CachedPtr<graphics::NativePlatform>    graphics_native_platform;
      CachedPtr<graphics::BufferInitializer> buffer_initializer;
      CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
++    CachedPtr<graphics::BufferWriter> buffer_writer;
      CachedPtr<graphics::Display>      display;
      CachedPtr<graphics::Cursor>       cursor;
      CachedPtr<graphics::CursorImage>  default_cursor_image;
 === modified file 'include/server/mir/input/cursor_listener.h'
 --- include/server/mir/input/cursor_listener.h	2013-04-30 20:44:31 +0000
 +++ include/server/mir/input/cursor_listener.h	2014-09-18 16:04:44 +0000
@@ -35,8 +35,8 @@
  protected:
      CursorListener() = default;
--    CursorListener(const CursorListener&) = delete;
--    CursorListener& operator=(const CursorListener&) = delete;
++    CursorListener(CursorListener const&) = delete;
++    CursorListener& operator=(CursorListener const&) = delete;
  };
+ }
 === renamed file 'src/include/server/mir/input/touch_visualizer.h' => 'include/server/mir/input/touch_visualizer.h'
 --- src/include/server/mir/input/touch_visualizer.h	2014-09-10 12:50:53 +0000
 +++ include/server/mir/input/touch_visualizer.h	2014-09-18 16:04:44 +0000
@@ -39,11 +39,15 @@
+     {
          geometry::Point touch_location;
--        // If pressure is non-zero, it indicates a press at the spot, as
--        // opposed to a hover.
++        // If pressure is zero, the touch-point can be interpreted as a hover.
          float pressure;
      };
++    // Toggle visualization of touches
++    virtual void enable() = 0;
++    virtual void disable() = 0;
++
++    // Visualize a given set of touches statelessly.
      virtual void visualize_touches(std::vector<Spot> const& touches) = 0;
  protected:
 === modified file 'platform-ABI-sha1sums'
 --- platform-ABI-sha1sums	2014-09-12 09:03:19 +0000
 +++ platform-ABI-sha1sums	2014-09-18 16:04:44 +0000
@@ -31,9 +31,9 @@
 d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
  f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
  c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
--656a7e1ae3b246930431a6174526fbdc2c76649e  include/platform/mir/graphics/platform.h
++c775727ea15fd8affa5b4dc9cd226d782e436001  include/platform/mir/graphics/platform.h
 f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
--b0014e8c4f44f831c9d178f995efb172417aaee4  include/platform/mir/options/configuration.h
++f5746dab3336266cfd410ce4e4d01333df6e5b99  include/platform/mir/options/configuration.h
 c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
  b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h
 === modified file 'playground/demo-shell/demo_compositor.cpp'
 --- playground/demo-shell/demo_compositor.cpp	2014-09-10 12:50:53 +0000
 +++ playground/demo-shell/demo_compositor.cpp	2014-09-18 16:04:44 +0000
@@ -66,6 +66,8 @@
      //the elements should be notified if they are rendered or not
      bool nonrenderlist_elements{false};
      mg::RenderableList renderable_list;
++    std::unordered_set<mg::Renderable::ID> decoration_skip_list;
++
      auto elements = scene->scene_elements_for(this);
      for(auto const& it : elements)
+     {
@@ -73,6 +75,9 @@
          auto const& view_area = display_buffer.view_area();
          auto embellished = renderer.would_embellish(*renderable, view_area);
          auto any_part_drawn = (view_area.overlaps(renderable->screen_position()) || embellished);
++
++        if (!it->is_a_surface())
++            decoration_skip_list.insert(renderable->id());
          if (renderable->visible() && any_part_drawn)
+         {
              renderable_list.push_back(renderable);
@@ -96,7 +101,7 @@
          display_buffer.make_current();
          renderer.set_rotation(display_buffer.orientation());
--        renderer.begin();
++        renderer.begin(std::move(decoration_skip_list));
          renderer.render(renderable_list);
          display_buffer.post_update();
          renderer.end();
 === modified file 'playground/demo-shell/demo_renderer.cpp'
 --- playground/demo-shell/demo_renderer.cpp	2014-09-10 12:50:53 +0000
 +++ playground/demo-shell/demo_renderer.cpp	2014-09-18 16:04:44 +0000
@@ -171,7 +171,7 @@
      glDeleteTextures(1, &titlebar_corner_tex);
+ }
--void DemoRenderer::begin() const
++void DemoRenderer::begin(std::unordered_set<graphics::Renderable::ID> decoration_skip_list_) const
+ {
      bool const opaque = destination_alpha() == compositor::DestinationAlpha::opaque;
      if (opaque)
@@ -184,14 +184,19 @@
      if (opaque)
          glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
++
++    decoration_skip_list = decoration_skip_list_;
+ }
  void DemoRenderer::tessellate(std::vector<graphics::GLPrimitive>& primitives,
                                graphics::Renderable const& renderable) const
+ {
      GLRenderer::tessellate(primitives, renderable);
--    tessellate_shadow(primitives, renderable, shadow_radius);
--    tessellate_frame(primitives, renderable, titlebar_height);
++    if (decoration_skip_list.find(renderable.id()) == decoration_skip_list.end())
++    {
++        tessellate_shadow(primitives, renderable, shadow_radius);
++        tessellate_frame(primitives, renderable, titlebar_height);
++    }
+ }
  void DemoRenderer::tessellate_shadow(std::vector<graphics::GLPrimitive>& primitives,
 === modified file 'playground/demo-shell/demo_renderer.h'
 --- playground/demo-shell/demo_renderer.h	2014-09-10 12:50:53 +0000
 +++ playground/demo-shell/demo_renderer.h	2014-09-18 16:04:44 +0000
@@ -21,6 +21,8 @@
  #include "mir/compositor/gl_renderer.h"
++#include <unordered_set>
++
  namespace mir
+ {
  namespace examples
@@ -37,7 +39,9 @@
          float const shadow_radius);
      ~DemoRenderer();
--    void begin() const override;
++    void begin() const override { GLRenderer::begin(); }
++    void begin(std::unordered_set<graphics::Renderable::ID> renderables_not_to_decorate) const;
++
      void tessellate(
          std::vector<graphics::GLPrimitive>& primitives,
          graphics::Renderable const& renderable) const override;
@@ -59,6 +63,8 @@
      float const corner_radius;
      GLuint shadow_corner_tex;
      GLuint titlebar_corner_tex;
++
++    mutable std::unordered_set<graphics::Renderable::ID> decoration_skip_list;
  };
  } // namespace examples
 === modified file 'server-ABI-sha1sums'
 --- server-ABI-sha1sums	2014-09-12 09:03:19 +0000
 +++ server-ABI-sha1sums	2014-09-18 16:04:44 +0000
@@ -31,14 +31,14 @@
 d2c1ac723ccef538d9a378228a02b0f173bd7  include/platform/mir/graphics/graphic_buffer_allocator.h
  f90a35371e236a6cfec8e9a8474dbb3305c7621e  include/platform/mir/graphics/internal_client.h
  c9730cac4a3a101f9706ec6f444958abe047fd88  include/platform/mir/graphics/internal_surface.h
--656a7e1ae3b246930431a6174526fbdc2c76649e  include/platform/mir/graphics/platform.h
++c775727ea15fd8affa5b4dc9cd226d782e436001  include/platform/mir/graphics/platform.h
 f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
--b0014e8c4f44f831c9d178f995efb172417aaee4  include/platform/mir/options/configuration.h
++f5746dab3336266cfd410ce4e4d01333df6e5b99  include/platform/mir/options/configuration.h
 c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
  b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h
  f4030e400baf8baa9c38e7c6ec6b4a5ad7134aeb  include/server/mir/compositor/compositor.h
--f102d38fd8afd63b636d76005f9b80f3adda0858  include/server/mir/default_server_configuration.h
++ef0b6f26fb40a72e4a4744e4d9c4bd044142de47  include/server/mir/default_server_configuration.h
  af1ff0714be973ac76d56006a2e5991f68cd1dec  include/server/mir/display_server.h
 db331f1c0e956eced5c9fc73a2b2122dbc8dc7  include/server/mir/frontend/connection_creator.h
  e6e92642301fc9bb85e1d38087a5dd84e5d30fd7  include/server/mir/frontend/connections.h
@@ -55,12 +55,13 @@
 b43a84cce0ad671ed68fe2ba796fbc7b79e31  include/server/mir/frontend/surface_id.h
 aa4c4db5468d9b9fe8e98a64444538aadd6e17b  include/server/mir/frontend/template_protobuf_message_processor.h
  f95c2bddf13d15993ef5d6a0ad7b9106ae550b87  include/server/mir/input/composite_event_filter.h
--c1e96c372d7856d59947f3145d273b1285b569bc  include/server/mir/input/cursor_listener.h
++cef18b7215fbe00550d18c0aa0f79b641cff494e  include/server/mir/input/cursor_listener.h
 fc402686e862809bf24714a8746cdde97cb1  include/server/mir/input/event_filter.h
 dda41d56c6b937a1ed197982e5fa37f50df  include/server/mir/input/input_channel.h
 f1d9cf83bbb1256f0b4d1ba1d94d95af98c52f0  include/server/mir/input/input_dispatcher.h
  b2ec497c6bec1b3a67c991f31cc7b7c51050ecbb  include/server/mir/input/input_reception_mode.h
 bf95b4512c8b91df7c20edf56a3c0734957  include/server/mir/input/surface.h
++036f3967757873751fcacaa768ca11a52001c225  include/server/mir/input/touch_visualizer.h
 b241f1e8211386bb8735ee0f752b666949  include/server/mir/main_loop.h
  edd5a0a6be0be57ef64c5af89fc5a65dc558648c  include/server/mir/report_exception.h
  8192727cf5fa0b2b5798b2211c2c8a4ad65c9f60  include/server/mir/run_mir.h
 === added file 'src/include/platform/mir/graphics/buffer_writer.h'
 --- src/include/platform/mir/graphics/buffer_writer.h	1970-01-01 00:00:00 +0000
 +++ src/include/platform/mir/graphics/buffer_writer.h	2014-09-18 16:04:44 +0000
@@ -0,0 +1,44 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Robert Carr <robert.carr@canonical.com>
++ */
++
++#include <cstddef>
++
++namespace mir
++{
++namespace graphics
++{
++class Buffer;
++
++/// An interface provided by the graphics platform allowing for writing untiled pixel data into buffers.
++class BufferWriter
++{
++public:
++    virtual ~BufferWriter() = default;
++
++    // Expects data to be an unstrided array containing (buffer.width * buffer.height) pixels. Likewise
++    // it is expected that buffer and data match in pixel format.
++    virtual void write(Buffer& buffer, unsigned char const* data, size_t size) = 0;
++
++protected:
++    BufferWriter() = default;
++    BufferWriter(BufferWriter const&) = delete;
++    BufferWriter& operator=(BufferWriter const&) = delete;
++};
++
++}
++}
 === modified file 'src/include/platform/mir/graphics/native_platform.h'
 --- src/include/platform/mir/graphics/native_platform.h	2014-09-10 12:50:53 +0000
 +++ src/include/platform/mir/graphics/native_platform.h	2014-09-18 16:04:44 +0000
@@ -36,6 +36,7 @@
  class InternalClient;
  class BufferIPCPacker;
  class Buffer;
++class BufferWriter;
  class DisplayReport;
  class NestedContext;
@@ -58,6 +59,8 @@
          Buffer const* buffer,
          BufferIpcMsgType msg_type) const = 0;
++    virtual std::shared_ptr<BufferWriter> make_buffer_writer() = 0;
++
      virtual ~NativePlatform() = default;
      NativePlatform(NativePlatform const&) = delete;
      NativePlatform& operator=(NativePlatform const&) = delete;
 === modified file 'src/include/server/mir/compositor/scene_element.h'
 --- src/include/server/mir/compositor/scene_element.h	2014-09-10 12:50:53 +0000
 +++ src/include/server/mir/compositor/scene_element.h	2014-09-18 16:04:44 +0000
@@ -39,6 +39,10 @@
      virtual std::shared_ptr<graphics::Renderable> renderable() const = 0;
      virtual void rendered_in(CompositorID cid) = 0;
      virtual void occluded_in(CompositorID cid) = 0;
++
++    // Query whether the SceneElement represents a window-surface, which at the discretion of the compositor
++    // may be eligible for window decoration.
++    virtual bool is_a_surface() const = 0;
  protected:
      SceneElement() = default;
 === renamed file 'src/include/server/mir/input/input_targets.h' => 'src/include/server/mir/input/scene.h'
 --- src/include/server/mir/input/input_targets.h	2014-09-10 12:50:53 +0000
 +++ src/include/server/mir/input/scene.h	2014-09-18 16:04:44 +0000
@@ -17,8 +17,8 @@
   *              Daniel d'Andradra <daniel.dandrada@canonical.com>
   */
--#ifndef MIR_INPUT_INPUT_TARGETS_H_
--#define MIR_INPUT_INPUT_TARGETS_H_
++#ifndef MIR_INPUT_INPUT_SCENE_H_
++#define MIR_INPUT_INPUT_SCENE_H_
  #include "mir/input/input_channel_factory.h"
@@ -30,28 +30,43 @@
+ {
  class Observer;
+ }
++namespace graphics
++{
++class Renderable;
++}
  namespace input
+ {
  class Surface;
--class InputTargets
++class Scene
+ {
  public:
--    virtual ~InputTargets() = default;
++    virtual ~Scene() = default;
      virtual void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& callback) = 0;
      virtual void add_observer(std::shared_ptr<scene::Observer> const& observer) = 0;
      virtual void remove_observer(std::weak_ptr<scene::Observer> const& observer) = 0;
++    // An interface which the input stack can use to add certain non interactive input visualizations
++    // in to the scene (i.e. cursors, touchspots). Overlay renderables will be rendered above all surfaces.
++    // Within the set of overlay renderables, rendering order is undefined.
++    virtual void add_input_visualization(std::shared_ptr<graphics::Renderable> const& overlay) = 0;
++    virtual void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& overlay) = 0;
++
++    // As input visualizations added through the overlay system will not use the standard SurfaceObserver
++    // mechanism, we require this method to trigger recomposition.
++    // TODO: How can something like SurfaceObserver be adapted to work with non surface renderables?
++    virtual void emit_scene_changed() = 0;
++
  protected:
--    InputTargets() = default;
--    InputTargets(InputTargets const&) = delete;
--    InputTargets& operator=(InputTargets const&) = delete;
++    Scene() = default;
++    Scene(Scene const&) = delete;
++    Scene& operator=(Scene const&) = delete;
  };
+ }
+ }
--#endif // MIR_INPUT_INPUT_TARGETS
++#endif // MIR_INPUT_INPUT_SCENE
 === modified file 'src/include/server/mir/scene/legacy_scene_change_notification.h'
 --- src/include/server/mir/scene/legacy_scene_change_notification.h	2014-09-10 12:50:53 +0000
 +++ src/include/server/mir/scene/legacy_scene_change_notification.h	2014-09-18 16:04:44 +0000
@@ -45,6 +45,8 @@
      void surface_added(Surface* surface) override;
      void surface_removed(Surface* surface) override;
      void surfaces_reordered() override;
++
++    void scene_changed() override;
      void surface_exists(Surface* surface) override;
      void end_observation() override;
 === modified file 'src/include/server/mir/scene/observer.h'
 --- src/include/server/mir/scene/observer.h	2014-09-10 12:50:53 +0000
 +++ src/include/server/mir/scene/observer.h	2014-09-18 16:04:44 +0000
@@ -36,6 +36,10 @@
      virtual void surface_added(Surface* surface) = 0;
      virtual void surface_removed(Surface* surface) = 0;
      virtual void surfaces_reordered() = 0;
++
++    // Used to indicate the scene has changed in some way beyond the present surfaces
++    // and will require full recomposition.
++    virtual void scene_changed() = 0;
      // Called at observer registration to notify of already existing surfaces.
      virtual void surface_exists(Surface* surface) = 0;
 === modified file 'src/platform/CMakeLists.txt'
 --- src/platform/CMakeLists.txt	2014-09-10 13:27:58 +0000
 +++ src/platform/CMakeLists.txt	2014-09-18 16:04:44 +0000
@@ -3,7 +3,7 @@
    ${PROJECT_SOURCE_DIR}/src/include/platform
+ )
--set(MIRPLATFORM_ABI 2)
++set(MIRPLATFORM_ABI 3)
  set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 === modified file 'src/platform/graphics/android/CMakeLists.txt'
 --- src/platform/graphics/android/CMakeLists.txt	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/android/CMakeLists.txt	2014-09-18 16:04:44 +0000
@@ -35,6 +35,7 @@
    device_quirks.cpp
    real_hwc_wrapper.cpp
    hwc_fallback_gl_renderer.cpp
++  android_buffer_writer.cpp
+ )
  add_library(mirplatformgraphicsandroid SHARED
    $<TARGET_OBJECTS:mirplatformgraphicsandroidobjects>
 === added file 'src/platform/graphics/android/android_buffer_writer.cpp'
 --- src/platform/graphics/android/android_buffer_writer.cpp	1970-01-01 00:00:00 +0000
 +++ src/platform/graphics/android/android_buffer_writer.cpp	2014-09-18 16:04:44 +0000
@@ -0,0 +1,70 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by:
++ *   Robert Carr <robert.carr@canonical.com>
++ */
++
++#include "android_buffer_writer.h"
++#include "buffer.h"
++
++#include "mir/graphics/android/android_native_buffer.h"
++
++#include <hardware/hardware.h>
++
++#include <boost/throw_exception.hpp>
++#include <stdexcept>
++
++#include <string.h>
++
++namespace mg = mir::graphics;
++namespace mga = mg::android;
++
++mga::BufferWriter::BufferWriter()
++{
++    auto err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (hw_module_t const **)(&hw_module));
++    if (err < 0)
++        BOOST_THROW_EXCEPTION(std::runtime_error("Could not open hardware module"));
++}
++
++void mga::BufferWriter::write(mg::Buffer& buffer, unsigned char const* data, size_t size)
++{
++    auto buffer_size = buffer.size();
++    auto bpp = MIR_BYTES_PER_PIXEL(buffer.pixel_format());
++    if (bpp * buffer_size.width.as_uint32_t() * buffer_size.height.as_uint32_t() != size)
++        BOOST_THROW_EXCEPTION(std::logic_error("Size of pixels is not equal to size of buffer"));
++
++    auto const& handle = buffer.native_buffer_handle();
++
++    char* vaddr;
++    int usage = GRALLOC_USAGE_SW_WRITE_OFTEN;
++    int width = buffer.size().width.as_uint32_t();
++    int height = buffer.size().height.as_uint32_t();
++    int top = 0;
++    int left = 0;
++    if ( hw_module->lock(hw_module, handle->handle(),
++        usage, top, left, width, height, reinterpret_cast<void**>(&vaddr)) )
++        BOOST_THROW_EXCEPTION(std::runtime_error("error securing buffer for client cpu use"));
++
++    // Copy line by line in case of stride != width*bpp
++    for (int i = 0; i < height; i++)
++    {
++        int line_offset_in_buffer = buffer.stride().as_uint32_t()*i;
++        int line_offset_in_source = bpp*width*i;
++        memcpy(vaddr + line_offset_in_buffer, data + line_offset_in_source, width * bpp);
++    }
++
++    hw_module->unlock(hw_module, handle->handle());
++}
 === added file 'src/platform/graphics/android/android_buffer_writer.h'
 --- src/platform/graphics/android/android_buffer_writer.h	1970-01-01 00:00:00 +0000
 +++ src/platform/graphics/android/android_buffer_writer.h	2014-09-18 16:04:44 +0000
@@ -0,0 +1,50 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by:
++ *   Robert Carr <robert.carr@canonical.com>
++ */
++
++#ifndef MIR_PLATFORM_ANDROID_ANDROID_BUFFER_WRITER_H_
++#define MIR_PLATFORM_ANDROID_ANDROID_BUFFER_WRITER_H_
++
++#include "mir/graphics/buffer_writer.h"
++
++#include <hardware/gralloc.h>
++
++#include <memory>
++
++namespace mir
++{
++namespace graphics
++{
++namespace android
++{
++
++class BufferWriter : public graphics::BufferWriter
++{
++public:
++     BufferWriter();
++
++     void write(graphics::Buffer& buffer, unsigned char const* pixels, size_t size) override;
++private:
++     gralloc_module_t const* hw_module;
++};
++
++}
++}
++}
++
++#endif /* MIR_PLATFORM_ANDROID_ANDROID_BUFFER_WRITER_H_ */
 === modified file 'src/platform/graphics/android/android_display.cpp'
 --- src/platform/graphics/android/android_display.cpp	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/android/android_display.cpp	2014-09-18 16:04:44 +0000
@@ -103,7 +103,7 @@
  auto mga::AndroidDisplay::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /* initial_image */) -> std::shared_ptr<Cursor>
+ {
--    return std::shared_ptr<Cursor>();
++    return nullptr;
+ }
  std::unique_ptr<mg::GLContext> mga::AndroidDisplay::create_gl_context()
 === modified file 'src/platform/graphics/android/android_platform.cpp'
 --- src/platform/graphics/android/android_platform.cpp	2014-09-15 18:58:24 +0000
 +++ src/platform/graphics/android/android_platform.cpp	2014-09-18 16:04:44 +0000
@@ -24,6 +24,7 @@
  #include "android_display.h"
  #include "internal_client.h"
  #include "output_builder.h"
++#include "android_buffer_writer.h"
  #include "hwc_loggers.h"
  #include "mir/graphics/platform_ipc_package.h"
  #include "mir/graphics/android/native_buffer.h"
@@ -153,6 +154,11 @@
      return std::make_shared<mga::InternalClient>();
+ }
++std::shared_ptr<mg::BufferWriter> mga::AndroidPlatform::make_buffer_writer()
++{
++    return std::make_shared<mga::BufferWriter>();
++}
++
  extern "C" std::shared_ptr<mg::Platform> mg::create_platform(
      std::shared_ptr<mo::Option> const& options,
      std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
 === modified file 'src/platform/graphics/android/android_platform.h'
 --- src/platform/graphics/android/android_platform.h	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/android/android_platform.h	2014-09-18 16:04:44 +0000
@@ -49,6 +49,7 @@
          std::shared_ptr<graphics::GLConfig> const& /*gl_config*/);
      std::shared_ptr<PlatformIPCPackage> get_ipc_package();
      std::shared_ptr<InternalClient> create_internal_client();
++    std::shared_ptr<graphics::BufferWriter> make_buffer_writer() override;
      void fill_buffer_package(
          BufferIPCPacker* packer, graphics::Buffer const* buffer, BufferIpcMsgType msg_type) const;
      EGLNativeDisplayType egl_native_display() const;
 === modified file 'src/platform/graphics/mesa/CMakeLists.txt'
 --- src/platform/graphics/mesa/CMakeLists.txt	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/mesa/CMakeLists.txt	2014-09-18 16:04:44 +0000
@@ -33,6 +33,7 @@
    anonymous_shm_file.cpp
    shm_buffer.cpp
    bypass.cpp
++  buffer_writer.cpp
+ )
  add_library(mirplatformgraphicsmesa SHARED
 === modified file 'src/platform/graphics/mesa/buffer_allocator.cpp'
 --- src/platform/graphics/mesa/buffer_allocator.cpp	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/mesa/buffer_allocator.cpp	2014-09-18 16:04:44 +0000
@@ -39,7 +39,7 @@
  #include <cassert>
  namespace mg  = mir::graphics;
--namespace mgm = mir::graphics::mesa;
++namespace mgm = mg::mesa;
  namespace geom = mir::geometry;
  namespace
 === added file 'src/platform/graphics/mesa/buffer_writer.cpp'
 --- src/platform/graphics/mesa/buffer_writer.cpp	1970-01-01 00:00:00 +0000
 +++ src/platform/graphics/mesa/buffer_writer.cpp	2014-09-18 16:04:44 +0000
@@ -0,0 +1,40 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Robert Carr <robert.carr@canonical.com>
++ */
++
++#include "buffer_writer.h"
++
++#include "shm_buffer.h"
++
++#include <boost/throw_exception.hpp>
++#include <stdexcept>
++
++namespace mg = mir::graphics;
++namespace mgm = mir::graphics::mesa;
++
++mgm::BufferWriter::BufferWriter()
++{
++}
++
++void mgm::BufferWriter::write(mg::Buffer& buffer, unsigned char const* data, size_t size)
++{
++    auto shm_buffer = dynamic_cast<mgm::ShmBuffer*>(&buffer);
++    if (!shm_buffer)
++        BOOST_THROW_EXCEPTION(std::logic_error("Direct CPU write is only supported to software allocated buffers on mesa platform"));
++
++    shm_buffer->write(data, size);
++}
 === added file 'src/platform/graphics/mesa/buffer_writer.h'
 --- src/platform/graphics/mesa/buffer_writer.h	1970-01-01 00:00:00 +0000
 +++ src/platform/graphics/mesa/buffer_writer.h	2014-09-18 16:04:44 +0000
@@ -0,0 +1,43 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Robert Carr <robert.carr@canonical.com>
++ */
++
++#ifndef MIR_GRAPHICS_MESA_BUFFER_WRITER_H_
++#define MIR_GRAPHICS_MESA_BUFFER_WRITER_H_
++
++#include "mir/graphics/buffer_writer.h"
++
++namespace mir
++{
++namespace graphics
++{
++class Buffer;
++
++namespace mesa
++{
++class BufferWriter : public graphics::BufferWriter
++{
++public:
++    BufferWriter();
++
++    void write(graphics::Buffer& buffer, unsigned char const* data, size_t size) override;
++};
++}
++}
++}
++
++#endif // MIR_GRAPHICS_MESA_BUFFER_WRITER_H_
 === modified file 'src/platform/graphics/mesa/native_platform.cpp'
 --- src/platform/graphics/mesa/native_platform.cpp	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/mesa/native_platform.cpp	2014-09-18 16:04:44 +0000
@@ -21,6 +21,7 @@
  #include "native_platform.h"
  #include "buffer_allocator.h"
++#include "buffer_writer.h"
  #include "mir/graphics/buffer_ipc_packer.h"
  #include "mir/graphics/platform_ipc_package.h"
  #include "mir/graphics/nested_context.h"
@@ -157,3 +158,7 @@
      native_display.reset();
+ }
++std::shared_ptr<mg::BufferWriter> mgm::NativePlatform::make_buffer_writer()
++{
++    return std::make_shared<mgm::BufferWriter>();
++}
 === modified file 'src/platform/graphics/mesa/native_platform.h'
 --- src/platform/graphics/mesa/native_platform.h	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/mesa/native_platform.h	2014-09-18 16:04:44 +0000
@@ -44,6 +44,7 @@
      std::shared_ptr<InternalClient> create_internal_client() override;
      void fill_buffer_package(
          BufferIPCPacker* packer, Buffer const* buffer, BufferIpcMsgType msg_type) const override;
++    std::shared_ptr<graphics::BufferWriter> make_buffer_writer() override;
      static std::shared_ptr<InternalNativeDisplay> internal_native_display();
      static bool internal_native_display_in_use();
 === modified file 'src/platform/graphics/mesa/platform.cpp'
 --- src/platform/graphics/mesa/platform.cpp	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/mesa/platform.cpp	2014-09-18 16:04:44 +0000
@@ -23,6 +23,7 @@
  #include "internal_client.h"
  #include "internal_native_display.h"
  #include "linux_virtual_terminal.h"
++#include "buffer_writer.h"
  #include "mir/graphics/platform_ipc_package.h"
  #include "mir/graphics/buffer_ipc_packer.h"
  #include "mir/options/option.h"
@@ -216,6 +217,11 @@
      return std::make_shared<mgm::InternalClient>(internal_native_display);
+ }
++std::shared_ptr<mg::BufferWriter> mgm::Platform::make_buffer_writer()
++{
++    return std::make_shared<mgm::BufferWriter>();
++}
++
  EGLNativeDisplayType mgm::Platform::egl_native_display() const
+ {
      return gbm.device;
 === modified file 'src/platform/graphics/mesa/platform.h'
 --- src/platform/graphics/mesa/platform.h	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/mesa/platform.h	2014-09-18 16:04:44 +0000
@@ -54,6 +54,7 @@
      /* From Platform */
      std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator(
              const std::shared_ptr<BufferInitializer>& buffer_initializer);
++    std::shared_ptr<graphics::BufferWriter> make_buffer_writer();
      std::shared_ptr<graphics::Display> create_display(
          std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
          std::shared_ptr<GLProgramFactory> const& program_factory,
 === modified file 'src/platform/graphics/mesa/shm_buffer.cpp'
 --- src/platform/graphics/mesa/shm_buffer.cpp	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/mesa/shm_buffer.cpp	2014-09-18 16:04:44 +0000
@@ -23,6 +23,12 @@
  #include <GLES2/gl2.h>
  #include <GLES2/gl2ext.h>
++#include <boost/throw_exception.hpp>
++
++#include <stdexcept>
++
++#include <string.h>
++
  namespace mgm = mir::graphics::mesa;
  namespace geom = mir::geometry;
@@ -85,3 +91,10 @@
+ {
      return false;
+ }
++
++void mgm::ShmBuffer::write(unsigned char const* data, size_t data_size)
++{
++    if (data_size != stride_.as_uint32_t()*size().height.as_uint32_t())
++        BOOST_THROW_EXCEPTION(std::logic_error("Size is not equal to number of pixels in buffer"));
++    memcpy(pixels, data, data_size);
++}
 === modified file 'src/platform/graphics/mesa/shm_buffer.h'
 --- src/platform/graphics/mesa/shm_buffer.h	2014-09-10 12:50:53 +0000
 +++ src/platform/graphics/mesa/shm_buffer.h	2014-09-18 16:04:44 +0000
@@ -49,6 +49,8 @@
      void gl_bind_to_texture() override;
      bool can_bypass() const;
++    void write(unsigned char const* data, size_t size);
++
  private:
      ShmBuffer(ShmBuffer const&) = delete;
      ShmBuffer& operator=(ShmBuffer const&) = delete;
 === modified file 'src/platform/options/default_configuration.cpp'
 --- src/platform/options/default_configuration.cpp	2014-09-10 12:50:53 +0000
 +++ src/platform/options/default_configuration.cpp	2014-09-18 16:04:44 +0000
@@ -43,9 +43,9 @@
  char const* const mo::frontend_threads_opt        = "ipc-thread-pool";
  char const* const mo::name_opt                    = "name";
  char const* const mo::offscreen_opt               = "offscreen";
++char const* const mo::touchspots_opt               = "enable-touchspots";
  char const* const mo::fatal_abort_opt             = "on-fatal-error-abort";
--
  char const* const mo::glog                 = "glog";
  char const* const mo::glog_stderrthreshold = "glog-stderrthreshold";
  char const* const mo::glog_minloglevel     = "glog-minloglevel";
@@ -161,6 +161,8 @@
              "When nested, the name Mir uses when registering with the host.")
          (offscreen_opt,
              "Render to offscreen buffers instead of the real outputs.")
++        (touchspots_opt,
++            "Display visualization of touchspots (e.g. for screencasting).")
          (fatal_abort_opt, "On \"fatal error\" conditions [e.g. drivers behaving "
              "in unexpected ways] abort (to get a core dump)");
 === modified file 'src/platform/symbols.map'
 --- src/platform/symbols.map	2014-09-10 12:50:53 +0000
 +++ src/platform/symbols.map	2014-09-18 16:04:44 +0000
@@ -1,4 +1,4 @@
--MIRPLATFORM_2 {
++MIRPLATFORM_3 {
   global:
    extern "C++" {
  # The following symbols come from running a script over the generated docs. Vis:
@@ -252,6 +252,7 @@
      mir::options::scene_report_opt*;
      mir::options::server_socket_opt*;
      mir::options::session_mediator_report_opt*;
++    mir::options::touchspots_opt*;
      typeinfo?for?mir::AbnormalExit;
      typeinfo?for?mir::EmergencyCleanupRegistry;
      typeinfo?for?mir::FatalErrorStrategy;
 === modified file 'src/server/graphics/default_configuration.cpp'
 --- src/server/graphics/default_configuration.cpp	2014-09-10 12:50:53 +0000
 +++ src/server/graphics/default_configuration.cpp	2014-09-18 16:04:44 +0000
@@ -106,6 +106,16 @@
          });
+ }
++std::shared_ptr<mg::BufferWriter>
++mir::DefaultServerConfiguration::the_buffer_writer()
++{
++    return buffer_writer(
++        [&]()
++        {
++            return the_graphics_platform()->make_buffer_writer();
++        });
++}
++
  std::shared_ptr<mg::Display>
  mir::DefaultServerConfiguration::the_display()
+ {
 === modified file 'src/server/graphics/nested/nested_platform.cpp'
 --- src/server/graphics/nested/nested_platform.cpp	2014-09-10 12:50:53 +0000
 +++ src/server/graphics/nested/nested_platform.cpp	2014-09-18 16:04:44 +0000
@@ -80,6 +80,11 @@
      return native_platform->create_buffer_allocator(buffer_initializer);
+ }
++std::shared_ptr<mg::BufferWriter> mgn::NestedPlatform::make_buffer_writer()
++{
++    return native_platform->make_buffer_writer();
++}
++
  std::shared_ptr<mg::Display> mgn::NestedPlatform::create_display(
      std::shared_ptr<mg::DisplayConfigurationPolicy> const& conf_policy,
      std::shared_ptr<mg::GLProgramFactory> const&,
 === modified file 'src/server/graphics/nested/nested_platform.h'
 --- src/server/graphics/nested/nested_platform.h	2014-09-10 12:50:53 +0000
 +++ src/server/graphics/nested/nested_platform.h	2014-09-18 16:04:44 +0000
@@ -49,6 +49,7 @@
              std::shared_ptr<GLConfig> const& gl_config);
      std::shared_ptr<PlatformIPCPackage> get_ipc_package() override;
      std::shared_ptr<InternalClient> create_internal_client() override;
++    std::shared_ptr<BufferWriter> make_buffer_writer() override;
      void fill_buffer_package(
          BufferIPCPacker* packer, Buffer const* Buffer, BufferIpcMsgType msg_type) const override;
      EGLNativeDisplayType egl_native_display() const;
 === modified file 'src/server/input/CMakeLists.txt'
 --- src/server/input/CMakeLists.txt	2014-09-10 12:50:53 +0000
 +++ src/server/input/CMakeLists.txt	2014-09-18 16:04:44 +0000
@@ -16,6 +16,7 @@
    default_configuration.cpp
    xcursor_loader.cpp
    builtin_cursor_images.cpp
++  touchspot_controller.cpp
+ )
  add_subdirectory(android)
 === modified file 'src/server/input/android/android_input_registrar.cpp'
 --- src/server/input/android/android_input_registrar.cpp	2014-09-10 12:50:53 +0000
 +++ src/server/input/android/android_input_registrar.cpp	2014-09-18 16:04:44 +0000
@@ -123,3 +123,7 @@
+ {
      remove(surface);
+ }
++
++void mia::InputRegistrar::SceneObserver::scene_changed()
++{
++}
 === modified file 'src/server/input/android/android_input_registrar.h'
 --- src/server/input/android/android_input_registrar.h	2014-09-10 12:50:53 +0000
 +++ src/server/input/android/android_input_registrar.h	2014-09-18 16:04:44 +0000
@@ -73,6 +73,7 @@
          void surface_added(scene::Surface* surface) override;
          void surface_removed(scene::Surface* surface) override;
          void surface_exists(scene::Surface* surface) override;
++        void scene_changed() override;
          SurfaceCallback add, remove;
      };
 === modified file 'src/server/input/android/android_input_target_enumerator.cpp'
 --- src/server/input/android/android_input_target_enumerator.cpp	2014-09-10 12:50:53 +0000
 +++ src/server/input/android/android_input_target_enumerator.cpp	2014-09-18 16:04:44 +0000
@@ -20,7 +20,7 @@
  #include "android_window_handle_repository.h"
--#include "mir/input/input_targets.h"
++#include "mir/input/scene.h"
  #include "mir/input/surface.h"
  #include <InputWindow.h>
@@ -28,9 +28,9 @@
  namespace mi = mir::input;
  namespace mia = mi::android;
--mia::InputTargetEnumerator::InputTargetEnumerator(std::shared_ptr<mi::InputTargets> const& targets,
++mia::InputTargetEnumerator::InputTargetEnumerator(std::shared_ptr<mi::Scene> const& scene,
                                                    std::shared_ptr<mia::WindowHandleRepository> const& repository)
--    : targets(targets),
++    : scene(scene),
        repository(repository)
+ {
+ }
@@ -41,7 +41,7 @@
  void mia::InputTargetEnumerator::for_each(std::function<void(droidinput::sp<droidinput::InputWindowHandle> const&)> const& callback)
+ {
--    targets->for_each(
++    scene->for_each(
          [&callback, this](std::shared_ptr<mi::Surface> const& target)
+         {
              auto handle = repository->handle_for_channel(target->input_channel());
 === modified file 'src/server/input/android/android_input_target_enumerator.h'
 --- src/server/input/android/android_input_target_enumerator.h	2014-09-10 12:50:53 +0000
 +++ src/server/input/android/android_input_target_enumerator.h	2014-09-18 16:04:44 +0000
@@ -41,7 +41,7 @@
+ }
  namespace input
+ {
--class InputTargets;
++class Scene;
  namespace android
+ {
  class WindowHandleRepository;
@@ -49,14 +49,14 @@
  class InputTargetEnumerator : public droidinput::InputEnumerator
+ {
  public:
--    explicit InputTargetEnumerator(std::shared_ptr<input::InputTargets> const& targets,
++    explicit InputTargetEnumerator(std::shared_ptr<input::Scene> const& scene,
                                     std::shared_ptr<WindowHandleRepository> const& repository);
      virtual ~InputTargetEnumerator() noexcept(true);
      void for_each(std::function<void(droidinput::sp<droidinput::InputWindowHandle> const&)> const& callback);
  private:
--    std::shared_ptr<input::InputTargets> const targets;
++    std::shared_ptr<input::Scene> const scene;
      std::shared_ptr<input::android::WindowHandleRepository> const repository;
  };
 === modified file 'src/server/input/android/input_sender.cpp'
 --- src/server/input/android/input_sender.cpp	2014-09-10 12:50:53 +0000
 +++ src/server/input/android/input_sender.cpp	2014-09-18 16:04:44 +0000
@@ -83,8 +83,12 @@
      surface_added(surface);
+ }
--
--void mia::InputSender::SceneObserver::remove_transfer_for(mir::input::Surface * surface)
++void mia::InputSender::SceneObserver::scene_changed()
++{
++}
++
++
++void mia::InputSender::SceneObserver::remove_transfer_for(mi::Surface * surface)
+ {
      std::shared_ptr<InputChannel> closed_channel = surface->input_channel();
@@ -96,7 +100,7 @@
+ }
  mia::InputSender::InputSenderState::InputSenderState(std::shared_ptr<mir::MainLoop> const& main_loop,
--                                                     std::shared_ptr<mir::input::InputSendObserver> const& observer,
++                                                     std::shared_ptr<mi::InputSendObserver> const& observer,
                                                       std::shared_ptr<InputReport> const& report)
      : main_loop{main_loop}, report{report}, observer{observer}, seq{}
+ {
@@ -131,7 +135,7 @@
      transfer->send(std::move(entry));
+ }
--void mia::InputSender::InputSenderState::add_transfer(int fd, mir::input::Surface * surface)
++void mia::InputSender::InputSenderState::add_transfer(int fd, mi::Surface * surface)
+ {
      std::lock_guard<std::mutex> lock(sender_mutex);
      std::shared_ptr<ActiveTransfer> transfer{get_transfer(fd)};
@@ -163,7 +167,7 @@
      return seq;
+ }
--mia::InputSender::ActiveTransfer::ActiveTransfer(InputSenderState & state, int server_fd, mir::input::Surface* surface) :
++mia::InputSender::ActiveTransfer::ActiveTransfer(InputSenderState & state, int server_fd, mi::Surface* surface) :
      state(state),
      publisher{droidinput::sp<droidinput::InputChannel>(
              new droidinput::InputChannel(droidinput::String8(surface->name()), server_fd))},
 === modified file 'src/server/input/android/input_sender.h'
 --- src/server/input/android/input_sender.h	2014-09-10 12:50:53 +0000
 +++ src/server/input/android/input_sender.h	2014-09-18 16:04:44 +0000
@@ -76,6 +76,7 @@
          void surface_added(scene::Surface* surface) override;
          void surface_removed(scene::Surface* surface) override;
          void surface_exists(scene::Surface* surface) override;
++        void scene_changed() override;
          void remove_transfer_for(input::Surface* surface);
          InputSenderState & state;
 === modified file 'src/server/input/cursor_controller.cpp'
 --- src/server/input/cursor_controller.cpp	2014-06-23 02:57:39 +0000
 +++ src/server/input/cursor_controller.cpp	2014-09-18 16:04:44 +0000
@@ -18,7 +18,7 @@
  #include "cursor_controller.h"
--#include "mir/input/input_targets.h"
++#include "mir/input/scene.h"
  #include "mir/input/surface.h"
  #include "mir/graphics/cursor.h"
  #include "mir/scene/observer.h"
@@ -130,6 +130,11 @@
+     {
          cursor_controller->update_cursor_image();
+     }
++
++    void scene_changed()
++    {
++        cursor_controller->update_cursor_image();
++    }
      void surface_exists(ms::Surface *surface)
+     {
@@ -157,7 +162,7 @@
  };
  std::shared_ptr<mi::Surface> topmost_surface_containing_point(
--    std::shared_ptr<mi::InputTargets> const& targets, geom::Point const& point)
++    std::shared_ptr<mi::Scene> const& targets, geom::Point const& point)
+ {
      std::shared_ptr<mi::Surface> top_surface_at_point;
      targets->for_each([&top_surface_at_point, &point]
@@ -171,7 +176,7 @@
+ }
--mi::CursorController::CursorController(std::shared_ptr<mi::InputTargets> const& input_targets,
++mi::CursorController::CursorController(std::shared_ptr<mi::Scene> const& input_targets,
      std::shared_ptr<mg::Cursor> const& cursor,
      std::shared_ptr<mg::CursorImage> const& default_cursor_image) :
          input_targets(input_targets),
 === modified file 'src/server/input/cursor_controller.h'
 --- src/server/input/cursor_controller.h	2014-06-11 17:42:49 +0000
 +++ src/server/input/cursor_controller.h	2014-09-18 16:04:44 +0000
@@ -39,12 +39,12 @@
  namespace input
+ {
--class InputTargets;
++class Scene;
  class CursorController : public CursorListener
+ {
  public:
--    CursorController(std::shared_ptr<InputTargets> const& input_targets,
++    CursorController(std::shared_ptr<Scene> const& input_targets,
          std::shared_ptr<graphics::Cursor> const& cursor,
          std::shared_ptr<graphics::CursorImage> const& default_cursor_image);
      virtual ~CursorController();
@@ -56,7 +56,7 @@
      void update_cursor_image();
  private:
--    std::shared_ptr<InputTargets> const input_targets;
++    std::shared_ptr<Scene> const input_targets;
      std::shared_ptr<graphics::Cursor> const cursor;
      std::shared_ptr<graphics::CursorImage> const default_cursor_image;
 === modified file 'src/server/input/default_configuration.cpp'
 --- src/server/input/default_configuration.cpp	2014-09-10 12:50:53 +0000
 +++ src/server/input/default_configuration.cpp	2014-09-18 16:04:44 +0000
@@ -30,6 +30,7 @@
  #include "event_filter_chain.h"
  #include "null_input_configuration.h"
  #include "cursor_controller.h"
++#include "touchspot_controller.h"
  #include "null_input_dispatcher.h"
  #include "null_input_targeter.h"
  #include "xcursor_loader.h"
@@ -114,7 +115,7 @@
              auto dispatcher = std::make_shared<droidinput::InputDispatcher>(
                  the_dispatcher_policy(),
                  the_input_report(),
--                std::make_shared<mia::InputTargetEnumerator>(the_input_targets(), registrar));
++                std::make_shared<mia::InputTargetEnumerator>(the_input_scene(), registrar));
              registrar->set_dispatcher(dispatcher);
              return dispatcher;
          });
@@ -234,7 +235,7 @@
      return cursor_listener(
          [this]() -> std::shared_ptr<mi::CursorListener>
+         {
--            return std::make_shared<mi::CursorController>(the_input_targets(),
++            return std::make_shared<mi::CursorController>(the_input_scene(),
                  the_cursor(), the_default_cursor_image());
          });
@@ -243,16 +244,21 @@
  std::shared_ptr<mi::TouchVisualizer>
  mir::DefaultServerConfiguration::the_touch_visualizer()
+ {
--    struct NullTouchVisualizer : public mi::TouchVisualizer
--    {
--        void visualize_touches(std::vector<Spot> const& /* touches */) override
--        {
--        }
--    };
      return touch_visualizer(
--        [this]()
++        [this]() -> std::shared_ptr<mi::TouchVisualizer>
+         {
--            return std::make_shared<NullTouchVisualizer>();
++            auto visualizer = std::make_shared<mi::TouchspotController>(the_buffer_allocator(), the_buffer_writer(),
++                the_input_scene());
++
++            // The visualizer is disabled by default and can be enabled statically via
++            // the MIR_SERVER_ENABLE_TOUCHSPOTS option. In the USC/unity8/autopilot case
++            // it will be toggled at runtime via com.canonical.Unity.Screen DBus interface
++            if (the_options()->is_set(options::touchspots_opt))
++            {
++                visualizer->enable();
++            }
++
++            return visualizer;
          });
+ }
 === added file 'src/server/input/touchspot_controller.cpp'
 --- src/server/input/touchspot_controller.cpp	1970-01-01 00:00:00 +0000
 +++ src/server/input/touchspot_controller.cpp	2014-09-18 16:04:44 +0000
@@ -0,0 +1,166 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Robert Carr <robert.carr@canonical.com>
++ */
++
++#include "touchspot_controller.h"
++#include "touchspot_image.c"
++
++#include "mir/graphics/graphic_buffer_allocator.h"
++#include "mir/graphics/buffer_properties.h"
++#include "mir/graphics/buffer.h"
++#include "mir/graphics/buffer_writer.h"
++#include "mir/graphics/renderable.h"
++#include "mir/geometry/dimensions.h"
++#include "mir/input/scene.h"
++
++namespace mi = mir::input;
++namespace mg = mir::graphics;
++namespace geom = mir::geometry;
++
++namespace
++{
++geom::Size const touchspot_size = {touchspot_image.width, touchspot_image.height};
++MirPixelFormat const touchspot_pixel_format = mir_pixel_format_argb_8888;
++}
++
++class mi::TouchspotRenderable : public mg::Renderable
++{
++public:
++    TouchspotRenderable(std::shared_ptr<mg::Buffer> const& buffer)
++        : buffer_(buffer),
++          position({0, 0})
++    {
++    }
++
++// mg::Renderable
++    mg::Renderable::ID id() const override
++    {
++        return this;
++    }
++
++    std::shared_ptr<mg::Buffer> buffer() const override
++    {
++        return buffer_;
++    }
++
++    bool alpha_enabled() const override
++    {
++        return false;
++    }
++
++    geom::Rectangle screen_position() const
++    {
++        return {position, buffer_->size()};
++    }
++
++    float alpha() const
++    {
++        return 1.0;
++    }
++
++    glm::mat4 transformation() const
++    {
++        return glm::mat4();
++    }
++
++    bool visible() const
++    {
++        return true;
++    }
++
++    bool shaped() const
++    {
++        return true;
++    }
++
++    int buffers_ready_for_compositor() const
++    {
++        return 1;
++    }
++
++// TouchspotRenderable
++    void move_center_to(geom::Point pos)
++    {
++        std::lock_guard<std::mutex> lg(guard);
++        position = {pos.x.as_int() - touchspot_image.width/2, pos.y.as_int() - touchspot_image.height/2};
++    }
++
++
++private:
++    std::shared_ptr<mg::Buffer> const buffer_;
++
++    std::mutex guard;
++    geom::Point position;
++};
++
++
++mi::TouchspotController::TouchspotController(std::shared_ptr<mg::GraphicBufferAllocator> const& allocator,
++    std::shared_ptr<mg::BufferWriter> const& buffer_writer,
++    std::shared_ptr<mi::Scene> const& scene)
++    : touchspot_buffer(allocator->alloc_buffer({touchspot_size, touchspot_pixel_format, mg::BufferUsage::software})),
++      scene(scene),
++      enabled(false),
++      renderables_in_use(0)
++{
++    unsigned int const pixels_size = touchspot_size.width.as_uint32_t()*touchspot_size.height.as_uint32_t() *
++        MIR_BYTES_PER_PIXEL(touchspot_pixel_format);
++
++    buffer_writer->write(*touchspot_buffer, touchspot_image.pixel_data, pixels_size);
++}
++
++void mi::TouchspotController::visualize_touches(std::vector<Spot> const& touches)
++{
++    {
++    std::lock_guard<std::mutex> lg(guard);
++
++    unsigned int const num_touches = enabled ? touches.size() : 0;
++
++    while (touchspot_renderables.size() < num_touches)
++        touchspot_renderables.push_back(std::make_shared<TouchspotRenderable>(touchspot_buffer));
++
++    for (unsigned int i = 0; i < num_touches; i++)
++    {
++        auto const& renderable = touchspot_renderables[i];
++
++        renderable->move_center_to(touches[i].touch_location);
++        if (i >= renderables_in_use)
++            scene->add_input_visualization(renderable);
++    }
++
++    for (unsigned int i = num_touches; i < renderables_in_use; i++)
++        scene->remove_input_visualization(touchspot_renderables[i]);
++
++    renderables_in_use = num_touches;
++    } // release mutex
++
++    // TODO (hackish): We may have just moved renderables which with the current
++    // architecture of surface observers will not trigger a propagation to the
++    // compositor damage callback we need this "emit_scene_changed".
++    scene->emit_scene_changed();
++}
++
++void mi::TouchspotController::enable()
++{
++    std::lock_guard<std::mutex> lg(guard);
++    enabled = true;
++}
++
++void mi::TouchspotController::disable()
++{
++    std::lock_guard<std::mutex> lg(guard);
++    enabled = false;
++}
 === added file 'src/server/input/touchspot_controller.h'
 --- src/server/input/touchspot_controller.h	1970-01-01 00:00:00 +0000
 +++ src/server/input/touchspot_controller.h	2014-09-18 16:04:44 +0000
@@ -0,0 +1,77 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Robert Carr <robert.carr@canonical.com>
++ */
++
++#ifndef MIR_INPUT_TOUCHSPOT_CONTROLLER_H_
++#define MIR_INPUT_TOUCHSPOT_CONTROLLER_H_
++
++#include "mir/input/touch_visualizer.h"
++
++#include <memory>
++#include <mutex>
++
++namespace mir
++{
++namespace graphics
++{
++class GraphicBufferAllocator;
++class Buffer;
++class BufferWriter;
++class Renderable;
++}
++namespace input
++{
++class Scene;
++class TouchspotRenderable;
++
++/// Receives touchspot events out of the input stack and manages appearance
++/// of touchspot renderables for visualization. Touchspot visualization is
++/// disabled by default and must be enabled through a call to ::enable.
++class TouchspotController : public TouchVisualizer
++{
++public:
++    TouchspotController(std::shared_ptr<graphics::GraphicBufferAllocator> const& allocator,
++        std::shared_ptr<graphics::BufferWriter> const& writer,
++        std::shared_ptr<input::Scene> const& scene);
++
++    virtual ~TouchspotController() = default;
++
++    void enable() override;
++    void disable() override;
++
++    void visualize_touches(std::vector<Spot> const& touches) override;
++
++protected:
++    TouchspotController(TouchspotController const&) = delete;
++    TouchspotController& operator=(TouchspotController const&) = delete;
++
++private:
++    std::shared_ptr<graphics::Buffer> touchspot_buffer;
++    std::shared_ptr<Scene> scene;
++
++    std::mutex guard;
++
++    bool enabled;
++
++    unsigned int renderables_in_use;
++    std::vector<std::shared_ptr<TouchspotRenderable>> touchspot_renderables;
++};
++
++}
++}
++
++#endif // MIR_INPUT_TOUCHSPOT_CONTROLLER_H_
 === added file 'src/server/input/touchspot_image.c'
 --- src/server/input/touchspot_image.c	1970-01-01 00:00:00 +0000
 +++ src/server/input/touchspot_image.c	2014-09-18 16:04:44 +0000
@@ -0,0 +1,1034 @@
++/* GIMP RGBA C-Source image dump (spot.c) */
++
++static const struct {
++  unsigned int 	 width;
++  unsigned int 	 height;
++  unsigned int 	 bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */
++  unsigned char	 pixel_data[64 * 64 * 4 + 1];
++} touchspot_image = {
++  64, 64, 4,
++{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,5,0,0,0,65,0,0,0,104,0,0,0,129,
++0,0,0,154,0,0,0,179,0,0,0,204,0,0,0,230,
++0,0,0,230,0,0,0,204,0,0,0,179,0,0,0,154,
++0,0,0,129,0,0,0,104,0,0,0,65,0,0,0,5,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,15,0,0,0,88,0,0,0,166,
++0,0,0,240,0,0,0,255,0,0,0,255,0,0,0,255,
++0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
++0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
++0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,240,
++0,0,0,166,0,0,0,88,0,0,0,15,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,95,
++0,0,0,187,0,0,0,250,0,0,0,255,0,0,0,255,
++0,0,0,255,0,15,28,255,0,45,82,255,0,60,108,255,
++0,75,135,255,0,89,161,255,0,104,188,255,0,119,215,255,
++0,119,215,255,0,104,188,255,0,89,161,255,0,75,135,255,
++0,60,108,255,0,45,82,255,0,15,28,255,0,0,0,255,
++0,0,0,255,0,0,0,255,0,0,0,250,0,0,0,187,
++0,0,0,95,0,0,0,3,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,83,0,0,0,215,0,0,0,255,
++0,0,0,255,0,0,0,255,0,27,49,255,0,70,126,255,
++0,112,203,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,112,203,255,
++0,70,126,255,0,27,49,255,0,0,0,255,0,0,0,255,
++0,0,0,255,0,0,0,215,0,0,0,83,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,69,
++0,0,0,203,0,0,0,255,0,0,0,255,0,12,22,255,
++0,77,139,255,0,124,223,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,124,223,255,0,77,139,255,
++0,13,23,255,0,0,0,255,0,0,0,255,0,0,0,203,
++0,0,0,69,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,24,0,0,0,187,0,0,0,255,
++0,0,0,255,0,8,14,255,0,71,128,255,0,133,240,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,133,240,255,0,72,130,255,0,8,15,255,0,0,0,255,
++0,0,0,255,0,0,0,187,0,0,0,24,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,53,0,0,0,228,0,0,0,255,0,4,7,255,
++0,62,112,255,0,129,232,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,129,233,255,0,63,114,255,
++0,4,8,255,0,0,0,255,0,0,0,228,0,0,0,53,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,
++0,0,0,247,0,0,0,255,0,28,51,255,0,122,220,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,123,221,255,0,28,50,255,0,0,0,255,0,0,0,247,
++0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,3,0,0,0,140,0,0,0,255,
++0,0,0,255,0,49,89,255,0,134,242,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,134,242,255,0,47,86,255,0,0,0,255,
++0,0,0,255,0,0,0,140,0,0,0,3,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,5,0,0,0,181,0,0,0,255,0,1,2,255,
++0,74,133,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,71,129,255,
++0,1,1,255,0,0,0,255,0,0,0,178,0,0,0,3,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,151,0,0,0,255,0,7,14,255,0,98,177,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,95,172,255,0,6,12,255,0,0,0,255,0,0,0,143,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,103,
++0,0,0,255,0,2,4,255,0,105,189,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,101,182,255,0,2,3,255,0,0,0,255,
++0,0,0,95,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,61,0,0,0,250,
++0,0,0,255,0,81,147,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,76,138,255,0,0,0,255,
++0,0,0,248,0,0,0,55,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,30,0,0,0,234,0,0,0,255,
++0,56,100,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,51,92,255,
++0,0,0,255,0,0,0,230,0,0,0,26,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,195,0,0,0,255,0,33,59,255,
++0,136,246,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,135,243,255,
++0,29,52,255,0,0,0,255,0,0,0,193,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,79,0,0,0,255,0,8,14,255,0,126,228,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,124,224,255,0,8,15,255,0,0,0,255,0,0,0,77,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,
++0,0,0,213,0,0,0,255,0,71,129,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,72,130,255,0,0,0,255,0,0,0,211,
++0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,98,
++0,0,0,255,0,14,25,255,0,134,241,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,133,240,255,0,13,24,255,0,0,0,255,
++0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,227,
++0,0,0,255,0,83,150,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,81,147,255,0,0,0,255,
++0,0,0,223,0,0,0,6,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,115,0,0,0,255,
++0,21,37,255,0,137,247,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,136,246,255,0,19,34,255,
++0,0,0,255,0,0,0,110,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,209,0,0,0,255,
++0,88,159,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,88,158,255,
++0,0,0,255,0,0,0,209,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,32,0,0,0,255,0,3,6,255,
++0,131,237,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,132,239,255,
++0,4,7,255,0,0,0,255,0,0,0,32,0,0,0,0,
++0,0,0,0,0,0,0,111,0,0,0,255,0,38,69,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,39,71,255,0,0,0,255,0,0,0,111,0,0,0,0,
++0,0,0,0,0,0,0,189,0,0,0,255,0,81,147,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,82,149,255,0,0,0,255,0,0,0,189,0,0,0,0,
++0,0,0,17,0,0,0,251,0,1,1,255,0,124,224,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,124,224,255,0,1,1,255,0,0,0,251,0,0,0,17,
++0,0,0,89,0,0,0,255,0,28,51,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,28,50,255,0,0,0,255,0,0,0,89,
++0,0,0,128,0,0,0,255,0,63,114,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,58,104,255,0,0,0,255,0,0,0,128,
++0,0,0,155,0,0,0,255,0,77,140,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,73,132,255,0,0,0,255,0,0,0,155,
++0,0,0,181,0,0,0,255,0,91,164,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,88,158,255,0,0,0,255,0,0,0,181,
++0,0,0,208,0,0,0,255,0,105,190,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,102,185,255,0,0,0,255,0,0,0,208,
++0,0,0,234,0,0,0,255,0,119,215,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,117,212,255,0,0,0,255,0,0,0,234,
++0,0,0,254,0,0,0,255,0,132,239,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,132,238,255,0,0,0,255,0,0,0,254,
++0,0,0,254,0,0,0,255,0,132,239,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,132,238,255,0,0,0,255,0,0,0,254,
++0,0,0,234,0,0,0,255,0,119,215,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,117,212,255,0,0,0,255,0,0,0,234,
++0,0,0,208,0,0,0,255,0,105,190,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,102,185,255,0,0,0,255,0,0,0,208,
++0,0,0,181,0,0,0,255,0,91,164,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,88,158,255,0,0,0,255,0,0,0,181,
++0,0,0,155,0,0,0,255,0,77,140,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,73,132,255,0,0,0,255,0,0,0,155,
++0,0,0,128,0,0,0,255,0,63,114,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,58,104,255,0,0,0,255,0,0,0,128,
++0,0,0,89,0,0,0,255,0,28,51,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,28,50,255,0,0,0,255,0,0,0,89,
++0,0,0,17,0,0,0,251,0,1,1,255,0,124,224,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,124,224,255,0,1,1,255,0,0,0,251,0,0,0,17,
++0,0,0,0,0,0,0,189,0,0,0,255,0,81,147,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,82,149,255,0,0,0,255,0,0,0,189,0,0,0,0,
++0,0,0,0,0,0,0,111,0,0,0,255,0,38,69,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,39,71,255,0,0,0,255,0,0,0,111,0,0,0,0,
++0,0,0,0,0,0,0,32,0,0,0,255,0,3,6,255,
++0,131,237,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,132,239,255,
++0,4,7,255,0,0,0,255,0,0,0,32,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,209,0,0,0,255,
++0,88,159,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,88,158,255,
++0,0,0,255,0,0,0,209,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,115,0,0,0,255,
++0,21,37,255,0,137,247,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,136,246,255,0,19,34,255,
++0,0,0,255,0,0,0,110,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,227,
++0,0,0,255,0,83,150,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,81,147,255,0,0,0,255,
++0,0,0,223,0,0,0,6,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,98,
++0,0,0,255,0,14,25,255,0,134,241,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,133,240,255,0,13,24,255,0,0,0,255,
++0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,
++0,0,0,213,0,0,0,255,0,71,129,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,72,130,255,0,0,0,255,0,0,0,211,
++0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,79,0,0,0,255,0,8,14,255,0,126,228,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,124,224,255,0,8,15,255,0,0,0,255,0,0,0,77,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,195,0,0,0,255,0,33,59,255,
++0,136,246,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,135,243,255,
++0,29,52,255,0,0,0,255,0,0,0,193,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,30,0,0,0,234,0,0,0,255,
++0,56,100,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,51,92,255,
++0,0,0,255,0,0,0,230,0,0,0,26,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,61,0,0,0,250,
++0,0,0,255,0,81,147,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,76,138,255,0,0,0,255,
++0,0,0,248,0,0,0,55,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,103,
++0,0,0,255,0,2,4,255,0,105,189,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,101,182,255,0,2,3,255,0,0,0,255,
++0,0,0,95,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,151,0,0,0,255,0,7,14,255,0,98,177,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,95,172,255,0,6,12,255,0,0,0,255,0,0,0,143,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,5,0,0,0,181,0,0,0,255,0,1,2,255,
++0,74,133,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,71,129,255,
++0,1,1,255,0,0,0,255,0,0,0,178,0,0,0,3,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,3,0,0,0,140,0,0,0,255,
++0,0,0,255,0,49,89,255,0,134,242,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,134,242,255,0,47,86,255,0,0,0,255,
++0,0,0,255,0,0,0,140,0,0,0,3,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,
++0,0,0,247,0,0,0,255,0,28,51,255,0,122,220,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,123,221,255,0,28,50,255,0,0,0,255,0,0,0,247,
++0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,53,0,0,0,228,0,0,0,255,0,4,7,255,
++0,62,112,255,0,129,232,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,129,233,255,0,63,114,255,
++0,4,8,255,0,0,0,255,0,0,0,228,0,0,0,53,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,24,0,0,0,187,0,0,0,255,
++0,0,0,255,0,8,14,255,0,71,128,255,0,133,240,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,133,240,255,0,72,130,255,0,8,15,255,0,0,0,255,
++0,0,0,255,0,0,0,187,0,0,0,24,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,69,
++0,0,0,203,0,0,0,255,0,0,0,255,0,12,22,255,
++0,77,139,255,0,124,223,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,124,223,255,0,77,139,255,
++0,13,23,255,0,0,0,255,0,0,0,255,0,0,0,203,
++0,0,0,69,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,83,0,0,0,215,0,0,0,255,
++0,0,0,255,0,0,0,255,0,27,49,255,0,70,126,255,
++0,112,203,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,139,251,255,
++0,139,251,255,0,139,251,255,0,139,251,255,0,112,203,255,
++0,70,126,255,0,27,49,255,0,0,0,255,0,0,0,255,
++0,0,0,255,0,0,0,215,0,0,0,83,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,95,
++0,0,0,187,0,0,0,250,0,0,0,255,0,0,0,255,
++0,0,0,255,0,15,28,255,0,45,82,255,0,60,108,255,
++0,75,135,255,0,89,161,255,0,104,188,255,0,119,215,255,
++0,119,215,255,0,104,188,255,0,89,161,255,0,75,135,255,
++0,60,108,255,0,45,82,255,0,15,28,255,0,0,0,255,
++0,0,0,255,0,0,0,255,0,0,0,250,0,0,0,187,
++0,0,0,95,0,0,0,3,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,15,0,0,0,88,0,0,0,166,
++0,0,0,240,0,0,0,255,0,0,0,255,0,0,0,255,
++0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
++0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,255,
++0,0,0,255,0,0,0,255,0,0,0,255,0,0,0,240,
++0,0,0,166,0,0,0,88,0,0,0,15,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,5,0,0,0,65,0,0,0,104,0,0,0,129,
++0,0,0,154,0,0,0,179,0,0,0,204,0,0,0,230,
++0,0,0,230,0,0,0,204,0,0,0,179,0,0,0,154,
++0,0,0,129,0,0,0,104,0,0,0,65,0,0,0,5,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
++};
 === modified file 'src/server/scene/basic_surface.cpp'
 --- src/server/scene/basic_surface.cpp	2014-09-10 12:50:53 +0000
 +++ src/server/scene/basic_surface.cpp	2014-09-18 16:04:44 +0000
@@ -667,7 +667,6 @@
      mg::Renderable::ID id() const override
      { return id_; }
--
  private:
      std::shared_ptr<mc::BufferStream> const underlying_buffer_stream;
      std::shared_ptr<mg::Buffer> mutable compositor_buffer;
 === modified file 'src/server/scene/default_configuration.cpp'
 --- src/server/scene/default_configuration.cpp	2014-09-10 12:50:53 +0000
 +++ src/server/scene/default_configuration.cpp	2014-09-18 16:04:44 +0000
@@ -20,7 +20,7 @@
  #include "mir/graphics/display.h"
  #include "mir/graphics/gl_context.h"
--#include "mir/input/input_targets.h"
++#include "mir/input/scene.h"
  #include "mir/abnormal_exit.h"
  #include "mir/scene/session.h"
@@ -57,7 +57,7 @@
                           { return std::make_shared<ms::SurfaceStack>(the_scene_report()); });
+ }
--std::shared_ptr<mi::InputTargets> mir::DefaultServerConfiguration::the_input_targets()
++std::shared_ptr<mi::Scene> mir::DefaultServerConfiguration::the_input_scene()
+ {
      return surface_stack([this]()
                           { return std::make_shared<ms::SurfaceStack>(the_scene_report()); });
 === modified file 'src/server/scene/legacy_scene_change_notification.cpp'
 --- src/server/scene/legacy_scene_change_notification.cpp	2014-09-10 12:50:53 +0000
 +++ src/server/scene/legacy_scene_change_notification.cpp	2014-09-18 16:04:44 +0000
@@ -82,6 +82,11 @@
      scene_notify_change();
+ }
++void ms::LegacySceneChangeNotification::scene_changed()
++{
++    scene_notify_change();
++}
++
  void ms::LegacySceneChangeNotification::end_observation()
+ {
      std::unique_lock<decltype(surface_observers_guard)> lg(surface_observers_guard);
 === modified file 'src/server/scene/surface_stack.cpp'
 --- src/server/scene/surface_stack.cpp	2014-09-10 12:50:53 +0000
 +++ src/server/scene/surface_stack.cpp	2014-09-18 16:04:44 +0000
@@ -68,11 +68,47 @@
          tracker->occluded_in(cid);
+     }
++    bool is_a_surface() const override
++    {
++        return true;
++    }
++
  private:
      std::shared_ptr<mg::Renderable> const renderable_;
      std::shared_ptr<ms::RenderingTracker> const tracker;
  };
++class OverlaySceneElement : public mc::SceneElement
++{
++public:
++    OverlaySceneElement(
++        std::shared_ptr<mg::Renderable> renderable)
++        : renderable_{renderable}
++    {
++    }
++
++    std::shared_ptr<mg::Renderable> renderable() const override
++    {
++        return renderable_;
++    }
++
++    void rendered_in(mc::CompositorID /* cid */) override
++    {
++    }
++
++    void occluded_in(mc::CompositorID /* cid */) override
++    {
++    }
++
++    bool is_a_surface() const override
++    {
++        return false;
++    }
++
++private:
++    std::shared_ptr<mg::Renderable> const renderable_;
++};
++
+ }
  ms::SurfaceStack::SurfaceStack(
@@ -95,6 +131,10 @@
              elements.emplace_back(element);
+         }
+     }
++    for (auto const& renderable : overlays)
++    {
++        elements.emplace_back(std::make_shared<OverlaySceneElement>(renderable));
++    }
      return elements;
+ }
@@ -116,6 +156,38 @@
      update_rendering_tracker_compositors();
+ }
++void ms::SurfaceStack::add_input_visualization(
++    std::shared_ptr<mg::Renderable> const& overlay)
++{
++    {
++        std::lock_guard<decltype(guard)> lg(guard);
++        overlays.push_back(overlay);
++    }
++    observers.scene_changed();
++}
++
++void ms::SurfaceStack::remove_input_visualization(
++    std::weak_ptr<mg::Renderable> const& weak_overlay)
++{
++    auto overlay = weak_overlay.lock();
++    {
++        std::lock_guard<decltype(guard)> lg(guard);
++        auto const p = std::find(overlays.begin(), overlays.end(), overlay);
++        if (p == overlays.end())
++        {
++            BOOST_THROW_EXCEPTION(std::runtime_error("Attempt to remove an overlay which was never added or which has been previously removed"));
++        }
++        overlays.erase(p);
++    }
++
++    observers.scene_changed();
++}
++
++void ms::SurfaceStack::emit_scene_changed()
++{
++    observers.scene_changed();
++}
++
  void ms::SurfaceStack::add_surface(
      std::shared_ptr<Surface> const& surface,
      DepthId depth,
@@ -264,6 +336,12 @@
          { observer->surfaces_reordered(); });
+ }
++void ms::Observers::scene_changed()
++{
++   for_each([&](std::shared_ptr<Observer> const& observer)
++        { observer->scene_changed(); });
++}
++
  void ms::Observers::surface_exists(ms::Surface* surface)
+ {
      for_each([&](std::shared_ptr<Observer> const& observer)
 === modified file 'src/server/scene/surface_stack.h'
 --- src/server/scene/surface_stack.h	2014-09-10 12:50:53 +0000
 +++ src/server/scene/surface_stack.h	2014-09-18 16:04:44 +0000
@@ -24,7 +24,7 @@
  #include "mir/compositor/scene.h"
  #include "mir/scene/depth_id.h"
  #include "mir/scene/observer.h"
--#include "mir/input/input_targets.h"
++#include "mir/input/scene.h"
  #include "mir/basic_observers.h"
@@ -36,6 +36,10 @@
  namespace mir
+ {
++namespace graphics
++{
++class Renderable;
++}
  /// Management of Surface objects. Includes the model (SurfaceStack and Surface
  /// classes) and controller (SurfaceController) elements of an MVC design.
  namespace scene
@@ -52,6 +56,7 @@
     void surface_added(Surface* surface) override;
     void surface_removed(Surface* surface) override;
     void surfaces_reordered() override;
++   void scene_changed() override;
     void surface_exists(Surface* surface) override;
     void end_observation();
@@ -59,7 +64,7 @@
     using BasicObservers<Observer>::remove;
  };
--class SurfaceStack : public compositor::Scene, public input::InputTargets, public SurfaceStackModel
++class SurfaceStack : public compositor::Scene, public input::Scene, public SurfaceStackModel
+ {
  public:
      explicit SurfaceStack(
@@ -71,7 +76,7 @@
      void register_compositor(compositor::CompositorID id) override;
      void unregister_compositor(compositor::CompositorID id) override;
--    // From InputTargets
++    // From Scene
      void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& callback);
      virtual void remove_surface(std::weak_ptr<Surface> const& surface) override;
@@ -85,6 +90,12 @@
      void add_observer(std::shared_ptr<Observer> const& observer) override;
      void remove_observer(std::weak_ptr<Observer> const& observer) override;
++
++    // Intended for input overlays, as described in mir::input::Scene documentation.
++    void add_input_visualization(std::shared_ptr<graphics::Renderable> const& overlay);
++    void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& overlay);
++
++    void emit_scene_changed() override;
  private:
      SurfaceStack(const SurfaceStack&) = delete;
@@ -101,6 +112,8 @@
      std::map<DepthId, Layer> layers_by_depth;
      std::map<Surface*,std::shared_ptr<RenderingTracker>> rendering_trackers;
      std::set<compositor::CompositorID> registered_compositors;
++
++    std::vector<std::shared_ptr<graphics::Renderable>> overlays;
      Observers observers;
  };
 === modified file 'src/server/symbols.map'
 --- src/server/symbols.map	2014-09-10 12:50:53 +0000
 +++ src/server/symbols.map	2014-09-18 16:04:44 +0000
@@ -108,6 +108,7 @@
      mir::DefaultServerConfiguration::the_buffer_allocator*;
      mir::DefaultServerConfiguration::the_buffer_initializer*;
      mir::DefaultServerConfiguration::the_buffer_stream_factory*;
++    mir::DefaultServerConfiguration::the_buffer_writer*;
      mir::DefaultServerConfiguration::the_clock*;
      mir::DefaultServerConfiguration::the_composite_event_filter*;
      mir::DefaultServerConfiguration::the_compositor*;
@@ -149,7 +150,7 @@
      mir::DefaultServerConfiguration::the_input_sender*;
      mir::DefaultServerConfiguration::the_input_send_observer*;
      mir::DefaultServerConfiguration::the_input_targeter*;
--    mir::DefaultServerConfiguration::the_input_targets*;
++    mir::DefaultServerConfiguration::the_input_scene*;
      mir::DefaultServerConfiguration::the_logger*;
      mir::DefaultServerConfiguration::the_main_loop*;
      mir::DefaultServerConfiguration::the_mediating_display_changer*;
@@ -407,6 +408,8 @@
      mir::input::TouchVisualizer::?TouchVisualizer*;
      mir::input::TouchVisualizer::TouchVisualizer*;
      mir::input::TouchVisualizer::visualize_touches*;
++    mir::input::TouchVisualizer::enable*;
++    mir::input::TouchVisualizer::disable*;
      mir::input::VTFilter::handle*;
      mir::logging::GlogLogger::GlogLogger*;
      mir::logging::GlogLogger::log*;
 === modified file 'tests/acceptance-tests/test_nested_mir.cpp'
 --- tests/acceptance-tests/test_nested_mir.cpp	2014-09-10 12:50:53 +0000
 +++ tests/acceptance-tests/test_nested_mir.cpp	2014-09-18 16:04:44 +0000
@@ -132,6 +132,11 @@
          return adaptee->create_internal_client();
+     }
++    std::shared_ptr<mg::BufferWriter> make_buffer_writer() override
++    {
++        return adaptee->make_buffer_writer();
++    }
++
      void fill_buffer_package(
          mg::BufferIPCPacker* packer,
          mg::Buffer const* buffer,
@@ -139,7 +144,7 @@
+     {
          return adaptee->fill_buffer_package(packer, buffer, msg_type);
+     }
--
++
      std::shared_ptr<mg::Platform> const adaptee;
  };
 === modified file 'tests/acceptance-tests/test_touchspot_visualization.cpp'
 --- tests/acceptance-tests/test_touchspot_visualization.cpp	2014-06-30 21:33:58 +0000
 +++ tests/acceptance-tests/test_touchspot_visualization.cpp	2014-09-18 16:04:44 +0000
@@ -82,6 +82,8 @@
  struct MockTouchVisualizer : public mi::TouchVisualizer
+ {
      MOCK_METHOD1(visualize_touches, void(std::vector<mi::TouchVisualizer::Spot> const&));
++    MOCK_METHOD0(enable, void());
++    MOCK_METHOD0(disable, void());
  };
  struct ServerConfiguration : mtf::InputTestingServerConfiguration
 === modified file 'tests/include/mir_test_doubles/null_platform.h'
 --- tests/include/mir_test_doubles/null_platform.h	2014-09-10 12:50:53 +0000
 +++ tests/include/mir_test_doubles/null_platform.h	2014-09-18 16:04:44 +0000
@@ -35,7 +35,7 @@
      std::shared_ptr<graphics::GraphicBufferAllocator> create_buffer_allocator(
              const std::shared_ptr<graphics::BufferInitializer>& /*buffer_initializer*/)
+     {
--        return std::shared_ptr<graphics::GraphicBufferAllocator>();
++        return nullptr;
+     }
      std::shared_ptr<graphics::Display> create_display(
@@ -53,7 +53,12 @@
      std::shared_ptr<graphics::InternalClient> create_internal_client()
+     {
--        return std::shared_ptr<graphics::InternalClient>();
++        return nullptr;
++    }
++
++    std::shared_ptr<graphics::BufferWriter> make_buffer_writer()
++    {
++        return nullptr;
+     }
      void fill_buffer_package(
 === renamed file 'tests/include/mir_test_doubles/stub_input_targets.h' => 'tests/include/mir_test_doubles/stub_input_scene.h'
 --- tests/include/mir_test_doubles/stub_input_targets.h	2014-09-10 12:50:53 +0000
 +++ tests/include/mir_test_doubles/stub_input_scene.h	2014-09-18 16:04:44 +0000
@@ -16,10 +16,10 @@
   * Authored by: Robert Carr <robert.carr@canonical.com>
   */
--#ifndef MIR_TEST_DOUBLES_STUB_INPUT_TARGETS_H_
--#define MIR_TEST_DOUBLES_STUB_INPUT_TARGETS_H_
++#ifndef MIR_TEST_DOUBLES_STUB_INPUT_SCENE_H_
++#define MIR_TEST_DOUBLES_STUB_INPUT_SCENE_H_
--#include "mir/input/input_targets.h"
++#include "mir/input/scene.h"
  namespace mir
+ {
@@ -28,7 +28,7 @@
  namespace doubles
+ {
--class StubInputTargets : public input::InputTargets
++class StubInputScene : public input::Scene
+ {
      void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& ) override
+     {
@@ -39,10 +39,21 @@
      void remove_observer(std::weak_ptr<scene::Observer> const& /* observer */)
+     {
+     }
++
++    void add_input_visualization(std::shared_ptr<graphics::Renderable> const& /* overlay */)
++    {
++    }
++    void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& /* overlay */)
++    {
++    }
++
++    void emit_scene_changed()
++    {
++    }
  };
+ }
+ }
  } // namespace mir
--#endif /* MIR_TEST_DOUBLES_STUB_INPUT_TARGETS_H_ */
++#endif /* MIR_TEST_DOUBLES_STUB_INPUT_SCENE_H_ */
 === modified file 'tests/include/mir_test_doubles/stub_scene_element.h'
 --- tests/include/mir_test_doubles/stub_scene_element.h	2014-06-20 17:57:16 +0000
 +++ tests/include/mir_test_doubles/stub_scene_element.h	2014-09-18 16:04:44 +0000
@@ -48,6 +48,11 @@
      void occluded_in(compositor::CompositorID) override
+     {
+     }
++
++    bool is_a_surface() const override
++    {
++        return false;
++    }
  private:
      std::shared_ptr<graphics::Renderable> const renderable_;
 === modified file 'tests/include/mir_test_doubles/stub_touch_visualizer.h'
 --- tests/include/mir_test_doubles/stub_touch_visualizer.h	2014-06-26 20:31:56 +0000
 +++ tests/include/mir_test_doubles/stub_touch_visualizer.h	2014-09-18 16:04:44 +0000
@@ -33,6 +33,12 @@
      void visualize_touches(std::vector<Spot> const&) override
+     {
+     }
++    void enable() override
++    {
++    }
++    void disable() override
++    {
++    }
  };
+ }
 === modified file 'tests/integration-tests/input/android/test_android_cursor_listener.cpp'
 --- tests/integration-tests/input/android/test_android_cursor_listener.cpp	2014-09-10 12:50:53 +0000
 +++ tests/integration-tests/input/android/test_android_cursor_listener.cpp	2014-09-18 16:04:44 +0000
@@ -26,7 +26,7 @@
  #include "mir/input/android/default_android_input_configuration.h"
  #include "mir/input/event_filter.h"
  #include "mir/input/cursor_listener.h"
--#include "mir/input/input_targets.h"
++#include "mir/input/scene.h"
  #include "mir/input/input_region.h"
  #include "mir/input/input_dispatcher.h"
  #include "mir/geometry/rectangle.h"
 === modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp'
 --- tests/integration-tests/input/android/test_android_input_manager.cpp	2014-09-10 12:50:53 +0000
 +++ tests/integration-tests/input/android/test_android_input_manager.cpp	2014-09-18 16:04:44 +0000
@@ -38,7 +38,7 @@
  #include "mir_test_doubles/mock_event_filter.h"
  #include "mir_test_doubles/stub_scene_surface.h"
  #include "mir_test_doubles/stub_input_channel.h"
--#include "mir_test_doubles/stub_input_targets.h"
++#include "mir_test_doubles/stub_scene.h"
  #include "mir_test_doubles/stub_scene.h"
  #include "mir_test_doubles/stub_input_enumerator.h"
  #include "mir_test_doubles/stub_touch_visualizer.h"
 === modified file 'tests/integration-tests/input/test_nested_input.cpp'
 --- tests/integration-tests/input/test_nested_input.cpp	2014-09-10 12:50:53 +0000
 +++ tests/integration-tests/input/test_nested_input.cpp	2014-09-18 16:04:44 +0000
@@ -25,7 +25,7 @@
  #include "src/server/report/null_report_factory.h"
  #include "mir/raii.h"
--#include "mir_test_doubles/stub_input_targets.h"
++#include "mir_test_doubles/stub_scene.h"
  #include "mir_test_doubles/mock_event_filter.h"
  #include "mir_test_doubles/stub_input_enumerator.h"
  #include "mir_test/fake_shared.h"
 === modified file 'tests/mir_test_framework/stubbed_server_configuration.cpp'
 --- tests/mir_test_framework/stubbed_server_configuration.cpp	2014-09-10 12:50:53 +0000
 +++ tests/mir_test_framework/stubbed_server_configuration.cpp	2014-09-18 16:04:44 +0000
@@ -21,6 +21,7 @@
  #include "mir/options/default_configuration.h"
  #include "mir/graphics/buffer_ipc_packer.h"
++#include "mir/graphics/buffer_writer.h"
  #include "mir/graphics/cursor.h"
  #include "mir/input/input_channel.h"
  #include "mir/input/input_manager.h"
@@ -181,6 +182,18 @@
          return std::make_shared<mtd::StubDisplay>(display_rects);
+     }
++    std::shared_ptr<mg::BufferWriter> make_buffer_writer() override
++    {
++        struct NullWriter : mg::BufferWriter
++        {
++            void write(mg::Buffer& /* buffer */,
++                unsigned char const* /* data */, size_t /* size */) override
++            {
++            }
++        };
++        return std::make_shared<NullWriter>();
++    }
++
      std::vector<geom::Rectangle> const display_rects;
  };
 === modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
 --- tests/unit-tests/frontend/test_session_mediator.cpp	2014-09-12 13:26:47 +0000
 +++ tests/unit-tests/frontend/test_session_mediator.cpp	2014-09-18 16:04:44 +0000
@@ -203,6 +203,7 @@
      MOCK_CONST_METHOD3(fill_buffer_package,
          void(mg::BufferIPCPacker*, mg::Buffer const*, mg::BufferIpcMsgType));
      MOCK_CONST_METHOD0(egl_native_display, EGLNativeDisplayType());
++    MOCK_METHOD0(make_buffer_writer, std::shared_ptr<mg::BufferWriter>());
  };
  struct StubScreencast : mtd::NullScreencast
 === modified file 'tests/unit-tests/graphics/mesa/test_shm_buffer.cpp'
 --- tests/unit-tests/graphics/mesa/test_shm_buffer.cpp	2014-09-10 12:50:53 +0000
 +++ tests/unit-tests/graphics/mesa/test_shm_buffer.cpp	2014-09-18 16:04:44 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright © 2013 Canonical Ltd.
++ * Copyright © 2014 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify
   * it under the terms of the GNU General Public License version 3 as
 === modified file 'tests/unit-tests/graphics/nested/test_nested_platform.cpp'
 --- tests/unit-tests/graphics/nested/test_nested_platform.cpp	2014-09-10 12:50:53 +0000
 +++ tests/unit-tests/graphics/nested/test_nested_platform.cpp	2014-09-18 16:04:44 +0000
@@ -64,6 +64,11 @@
+     {
          return {};
+     }
++
++    std::shared_ptr<mg::BufferWriter> make_buffer_writer() override
++    {
++        return {};
++    }
      void fill_buffer_package(
          mg::BufferIPCPacker*, mg::Buffer const*, mg::BufferIpcMsgType) const override {}
 === modified file 'tests/unit-tests/input/CMakeLists.txt'
 --- tests/unit-tests/input/CMakeLists.txt	2014-09-10 12:50:53 +0000
 +++ tests/unit-tests/input/CMakeLists.txt	2014-09-18 16:04:44 +0000
@@ -5,6 +5,7 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/test_display_input_region.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_cursor_controller.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_xcursor_loader.cpp
++  ${CMAKE_CURRENT_SOURCE_DIR}/test_touchspot_controller.cpp
+ )
  set(
 === modified file 'tests/unit-tests/input/android/test_android_input_target_enumerator.cpp'
 --- tests/unit-tests/input/android/test_android_input_target_enumerator.cpp	2014-09-10 12:50:53 +0000
 +++ tests/unit-tests/input/android/test_android_input_target_enumerator.cpp	2014-09-18 16:04:44 +0000
@@ -19,13 +19,14 @@
  #include "src/server/input/android/android_input_target_enumerator.h"
  #include "mir/input/input_channel.h"
--#include "mir/input/input_targets.h"
++#include "mir/input/scene.h"
  #include "mir/input/surface.h"
  #include "mir_test/fake_shared.h"
  #include "mir_test_doubles/stub_input_channel.h"
  #include "mir_test_doubles/stub_input_handles.h"
  #include "mir_test_doubles/stub_input_surface.h"
++#include "mir_test_doubles/stub_input_scene.h"
  #include "mir_test_doubles/mock_window_handle_repository.h"
  #include <InputDispatcher.h>
@@ -48,9 +49,9 @@
  namespace
+ {
--struct StubInputTargets : public mi::InputTargets
++struct StubScene : public mtd::StubInputScene
+ {
--    StubInputTargets(std::initializer_list<std::shared_ptr<mi::Surface>> const& target_list)
++    StubScene(std::initializer_list<std::shared_ptr<mi::Surface>> const& target_list)
          : targets(target_list.begin(), target_list.end())
+     {
+     }
@@ -85,7 +86,7 @@
      mtd::MockWindowHandleRepository repository;
      droidinput::sp<droidinput::InputWindowHandle> stub_window_handle1 = new mtd::StubWindowHandle;
      droidinput::sp<droidinput::InputWindowHandle> stub_window_handle2 = new mtd::StubWindowHandle;
--    StubInputTargets targets({target1, target2});
++    StubScene targets({target1, target2});
      Sequence seq2;
      EXPECT_CALL(repository, handle_for_channel(
 === modified file 'tests/unit-tests/input/test_cursor_controller.cpp'
 --- tests/unit-tests/input/test_cursor_controller.cpp	2014-09-10 12:50:53 +0000
 +++ tests/unit-tests/input/test_cursor_controller.cpp	2014-09-18 16:04:44 +0000
@@ -19,7 +19,7 @@
  #include "src/server/input/cursor_controller.h"
  #include "mir/input/surface.h"
--#include "mir/input/input_targets.h"
++#include "mir/input/scene.h"
  #include "mir/scene/observer.h"
  #include "mir/scene/surface_observer.h"
  #include "mir/graphics/cursor_image.h"
@@ -29,6 +29,7 @@
  #include "mir_test/fake_shared.h"
  #include "mir_test_doubles/stub_scene_surface.h"
++#include "mir_test_doubles/stub_input_scene.h"
  #include <gtest/gtest.h>
  #include <gmock/gmock.h>
@@ -166,9 +167,9 @@
      std::vector<std::shared_ptr<ms::SurfaceObserver>> observers;
  };
--struct StubInputTargets : public mi::InputTargets
++struct StubScene : public mtd::StubInputScene
+ {
--    StubInputTargets(std::initializer_list<std::shared_ptr<ms::Surface>> const& targets)
++    StubScene(std::initializer_list<std::shared_ptr<ms::Surface>> const& targets)
          : targets(targets.begin(), targets.end())
+     {
+     }
@@ -243,7 +244,7 @@
+ {
      using namespace ::testing;
--    StubInputTargets targets({});
++    StubScene targets({});
      mi::CursorController controller(mt::fake_shared(targets),
          mt::fake_shared(cursor), default_cursor_image);
@@ -262,7 +263,7 @@
      StubInputSurface surface{rect_1_1_1_1,
          std::make_shared<NamedCursorImage>(cursor_name_1)};
--    StubInputTargets targets({mt::fake_shared(surface)});
++    StubScene targets({mt::fake_shared(surface)});
      mi::CursorController controller(mt::fake_shared(targets),
          mt::fake_shared(cursor), default_cursor_image);
@@ -279,7 +280,7 @@
      StubInputSurface surface{rect_1_1_1_1,
          nullptr};
--    StubInputTargets targets({mt::fake_shared(surface)});
++    StubScene targets({mt::fake_shared(surface)});
      mi::CursorController controller(mt::fake_shared(targets),
          mt::fake_shared(cursor), default_cursor_image);
@@ -296,7 +297,7 @@
      StubInputSurface surface_1{rect_1_1_1_1, std::make_shared<NamedCursorImage>(cursor_name_1)};
      StubInputSurface surface_2{rect_1_1_1_1, std::make_shared<NamedCursorImage>(cursor_name_2)};
--    StubInputTargets targets({mt::fake_shared(surface_1), mt::fake_shared(surface_2)});
++    StubScene targets({mt::fake_shared(surface_1), mt::fake_shared(surface_2)});
      mi::CursorController controller(mt::fake_shared(targets),
          mt::fake_shared(cursor), default_cursor_image);
@@ -313,7 +314,7 @@
      StubInputSurface surface{rect_1_1_1_1,
          std::make_shared<NamedCursorImage>(cursor_name_1)};
--    StubInputTargets targets({mt::fake_shared(surface)});
++    StubScene targets({mt::fake_shared(surface)});
      mi::CursorController controller(mt::fake_shared(targets),
          mt::fake_shared(cursor), default_cursor_image);
@@ -336,7 +337,7 @@
      StubInputSurface surface{rect_1_1_1_1,
          std::make_shared<NamedCursorImage>(cursor_name_1)};
--    StubInputTargets targets({mt::fake_shared(surface)});
++    StubScene targets({mt::fake_shared(surface)});
      mi::CursorController controller(mt::fake_shared(targets),
          mt::fake_shared(cursor), default_cursor_image);
@@ -359,7 +360,7 @@
      // Here we also demonstrate that the cursor begins at 0,0.
      StubInputSurface surface{rect_0_0_1_1,
          std::make_shared<NamedCursorImage>(cursor_name_1)};
--    StubInputTargets targets({});
++    StubScene targets({});
      mi::CursorController controller(mt::fake_shared(targets),
          mt::fake_shared(cursor), default_cursor_image);
@@ -379,7 +380,7 @@
      // Here we also demonstrate that the cursor begins at 0,0.
      StubInputSurface surface1{rect_0_0_1_1, image};
      StubInputSurface surface2{rect_0_0_1_1, image};
--    StubInputTargets targets({});
++    StubScene targets({});
      mi::CursorController controller(mt::fake_shared(targets),
          mt::fake_shared(cursor), default_cursor_image);
 === added file 'tests/unit-tests/input/test_touchspot_controller.cpp'
 --- tests/unit-tests/input/test_touchspot_controller.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unit-tests/input/test_touchspot_controller.cpp	2014-09-18 16:04:44 +0000
@@ -0,0 +1,199 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Robert Carr <robert.carr@canonical.com>
++ */
++
++#include "src/server/input/touchspot_controller.h"
++
++#include "mir/graphics/graphic_buffer_allocator.h"
++#include "mir/graphics/renderable.h"
++#include "mir/graphics/buffer_writer.h"
++#include "mir_test/fake_shared.h"
++#include "mir_test_doubles/stub_buffer.h"
++#include "mir_test_doubles/stub_scene.h"
++#include "mir_test_doubles/mock_buffer.h"
++#include "mir_test_doubles/stub_input_scene.h"
++
++#include <gmock/gmock.h>
++#include <gtest/gtest.h>
++
++#include <algorithm>
++#include <vector>
++
++#include <assert.h>
++
++namespace mi = mir::input;
++namespace mg = mir::graphics;
++namespace mt = mir::test;
++namespace mtd = mt::doubles;
++namespace geom = mir::geometry;
++
++namespace
++{
++
++struct MockBufferAllocator : public mg::GraphicBufferAllocator
++{
++    MOCK_METHOD1(alloc_buffer, std::shared_ptr<mg::Buffer>(mg::BufferProperties const&));
++    MOCK_METHOD0(supported_pixel_formats, std::vector<MirPixelFormat>(void));
++};
++
++struct StubBufferWriter : public mg::BufferWriter
++{
++    void write(mg::Buffer& /* buffer */,
++        unsigned char const* /* data */, size_t /* size */) override
++    {
++    }
++};
++
++struct StubScene : public mtd::StubInputScene
++{
++    void add_input_visualization(std::shared_ptr<mg::Renderable> const& overlay) override
++    {
++        overlays.push_back(overlay);
++    }
++
++    void remove_input_visualization(std::weak_ptr<mg::Renderable> const& overlay) override
++    {
++        auto l = overlay.lock();
++        assert(l);
++
++        auto it = std::find(overlays.begin(), overlays.end(), l);
++        assert(it != overlays.end());
++
++        overlays.erase(it);
++    }
++
++    void expect_spots_centered_at(std::vector<geom::Point> spots)
++    {
++        int const touchspot_side_in_pixels = 64;
++        for (auto overlay : overlays)
++        {
++            auto top_left_pos = overlay->screen_position().top_left;
++            auto center_pos = geom::Point{top_left_pos.x.as_int() + touchspot_side_in_pixels/2,
++                top_left_pos.y.as_int() + touchspot_side_in_pixels/2};
++            auto it = std::find(spots.begin(), spots.end(), center_pos);
++            EXPECT_FALSE(it == spots.end());
++            spots.erase(it);
++        }
++        // If there are left over spots then we didn't have an overlay corresponding to one
++        EXPECT_EQ(0, spots.size());
++    }
++
++    std::vector<std::shared_ptr<mg::Renderable>> overlays;
++};
++
++struct TestTouchspotController : public ::testing::Test
++{
++    TestTouchspotController()
++        : allocator(std::make_shared<MockBufferAllocator>()),
++          writer(std::make_shared<StubBufferWriter>()),
++          scene(std::make_shared<StubScene>())
++    {
++    }
++    std::shared_ptr<MockBufferAllocator> const allocator;
++    std::shared_ptr<mg::BufferWriter> const writer;
++    std::shared_ptr<StubScene> const scene;
++};
++
++MATCHER(SoftwareBuffer, "")
++{
++    auto properties = static_cast<mg::BufferProperties const&>(arg);
++    if (properties.usage != mg::BufferUsage::software)
++        return false;
++    return true;
++}
++
++}
++
++TEST_F(TestTouchspotController, allocates_software_buffer_for_touchspots)
++{
++    using namespace ::testing;
++
++    EXPECT_CALL(*allocator, alloc_buffer(SoftwareBuffer())).Times(1)
++        .WillOnce(Return(std::make_shared<mtd::StubBuffer>()));
++    mi::TouchspotController controller(allocator, writer, scene);
++}
++
++TEST_F(TestTouchspotController, touches_result_in_renderables_in_stack)
++{
++    using namespace ::testing;
++
++    EXPECT_CALL(*allocator, alloc_buffer(SoftwareBuffer())).Times(1)
++        .WillOnce(Return(std::make_shared<mtd::StubBuffer>()));
++    mi::TouchspotController controller(allocator, writer, scene);
++    controller.enable();
++
++    controller.visualize_touches({ {{0,0}, 1} });
++
++    scene->expect_spots_centered_at({{0, 0}});
++}
++
++TEST_F(TestTouchspotController, spots_move)
++{
++    using namespace ::testing;
++
++    EXPECT_CALL(*allocator, alloc_buffer(SoftwareBuffer())).Times(1)
++        .WillOnce(Return(std::make_shared<mtd::StubBuffer>()));
++    mi::TouchspotController controller(allocator, writer, scene);
++    controller.enable();
++
++    controller.visualize_touches({ {{0,0}, 1} });
++    scene->expect_spots_centered_at({{0, 0}});
++    controller.visualize_touches({ {{1,1}, 1} });
++    scene->expect_spots_centered_at({{1, 1}});
++}
++
++TEST_F(TestTouchspotController, multiple_spots)
++{
++    using namespace ::testing;
++
++    EXPECT_CALL(*allocator, alloc_buffer(SoftwareBuffer())).Times(1)
++        .WillOnce(Return(std::make_shared<mtd::StubBuffer>()));
++    mi::TouchspotController controller(allocator, writer, scene);
++    controller.enable();
++
++    controller.visualize_touches({ {{0,0}, 1}, {{1, 1}, 1}, {{3, 3}, 1} });
++    scene->expect_spots_centered_at({{0, 0}, {1, 1}, {3, 3}});
++    controller.visualize_touches({ {{0,0}, 1}, {{1, 1}, 1}, {{3, 3}, 1}, {{5, 5}, 1} });
++    scene->expect_spots_centered_at({{0, 0}, {1, 1}, {3, 3}, {5, 5}});
++    controller.visualize_touches({ {{1,1}, 1} });
++    scene->expect_spots_centered_at({{1, 1}});
++    controller.visualize_touches({});
++    scene->expect_spots_centered_at({});
++}
++
++// This leaves some semantics undefined, i,e. if the touchspot controller is enabled/disabled
++// during a gesture do the spots appear/dissapear? I've been unable to develop a strong opinion
++// on this semantic, so I am leaving it unspecified ~racarr
++TEST_F(TestTouchspotController, touches_do_not_result_in_renderables_in_stack_when_disabled)
++{
++    using namespace ::testing;
++
++    EXPECT_CALL(*allocator, alloc_buffer(SoftwareBuffer())).Times(1)
++        .WillOnce(Return(std::make_shared<mtd::StubBuffer>()));
++    mi::TouchspotController controller(allocator, writer, scene);
++    controller.enable();
++
++    controller.disable();
++    controller.visualize_touches({ {{0,0}, 1} });
++
++    scene->expect_spots_centered_at({});
++
++    controller.enable();
++    controller.visualize_touches({ {{0,0}, 1} });
++
++    scene->expect_spots_centered_at({{0, 0}});
++}
 === modified file 'tests/unit-tests/scene/test_surface_stack.cpp'
 --- tests/unit-tests/scene/test_surface_stack.cpp	2014-09-10 12:50:53 +0000
 +++ tests/unit-tests/scene/test_surface_stack.cpp	2014-09-18 16:04:44 +0000
@@ -28,6 +28,7 @@
  #include "mir_test_doubles/stub_input_channel.h"
  #include "mir_test/fake_shared.h"
  #include "mir_test_doubles/stub_buffer_stream.h"
++#include "mir_test_doubles/stub_renderable.h"
  #include "mir_test_doubles/mock_buffer_stream.h"
  #include "mir_test_doubles/null_surface_configurator.h"
@@ -103,6 +104,7 @@
      MOCK_METHOD1(surface_added, void(ms::Surface*));
      MOCK_METHOD1(surface_removed, void(ms::Surface*));
      MOCK_METHOD0(surfaces_reordered, void());
++    MOCK_METHOD0(scene_changed, void());
      MOCK_METHOD1(surface_exists, void(ms::Surface*));
      MOCK_METHOD0(end_observation, void());
@@ -673,6 +675,100 @@
      stack.add_surface(stub_surface1, default_params.depth, default_params.input_mode);
+ }
++TEST_F(SurfaceStack, scene_observer_notified_of_add_and_remove_input_visualization)
++{
++    using namespace ::testing;
++
++    MockSceneObserver observer;
++    mtd::StubRenderable r;
++
++    InSequence seq;
++    EXPECT_CALL(observer, scene_changed()).Times(2);
++
++    stack.add_observer(mt::fake_shared(observer));
++
++    stack.add_input_visualization(mt::fake_shared(r));
++    stack.remove_input_visualization(mt::fake_shared(r));
++}
++
++TEST_F(SurfaceStack, overlays_do_not_appear_in_input_enumeration)
++{
++    mtd::StubRenderable r;
++
++    stack.add_surface(stub_surface1, default_params.depth, default_params.input_mode);
++    stack.add_surface(stub_surface2, default_params.depth, default_params.input_mode);
++
++    // Configure surface1 and surface2 to appear in input enumeration.
++    stub_surface1->configure(mir_surface_attrib_visibility, MirSurfaceVisibility::mir_surface_visibility_exposed);
++    stub_surface2->configure(mir_surface_attrib_visibility, MirSurfaceVisibility::mir_surface_visibility_exposed);
++
++    stack.add_input_visualization(mt::fake_shared(r));
++
++    unsigned int observed_input_targets = 0;
++    stack.for_each([&observed_input_targets](std::shared_ptr<mi::Surface> const&)
++        {
++            observed_input_targets++;
++        });
++    EXPECT_EQ(2, observed_input_targets);
++}
++
++TEST_F(SurfaceStack, overlays_appear_at_top_of_renderlist)
++{
++    using namespace ::testing;
++
++    mtd::StubRenderable r;
++
++    stack.add_surface(stub_surface1, default_params.depth, default_params.input_mode);
++    stack.add_input_visualization(mt::fake_shared(r));
++    stack.add_surface(stub_surface2, default_params.depth, default_params.input_mode);
++
++    EXPECT_THAT(
++        stack.scene_elements_for(compositor_id),
++        ElementsAre(
++            SceneElementFor(stub_surface1),
++            SceneElementFor(stub_surface2),
++            SceneElementFor(mt::fake_shared(r))));
++}
++
++TEST_F(SurfaceStack, removed_overlays_are_removed)
++{
++    using namespace ::testing;
++
++    mtd::StubRenderable r;
++
++    stack.add_surface(stub_surface1, default_params.depth, default_params.input_mode);
++    stack.add_input_visualization(mt::fake_shared(r));
++    stack.add_surface(stub_surface2, default_params.depth, default_params.input_mode);
++
++    EXPECT_THAT(
++        stack.scene_elements_for(compositor_id),
++        ElementsAre(
++            SceneElementFor(stub_surface1),
++            SceneElementFor(stub_surface2),
++            SceneElementFor(mt::fake_shared(r))));
++
++    stack.remove_input_visualization(mt::fake_shared(r));
++
++    EXPECT_THAT(
++        stack.scene_elements_for(compositor_id),
++        ElementsAre(
++            SceneElementFor(stub_surface1),
++            SceneElementFor(stub_surface2)));
++}
++
++TEST_F(SurfaceStack, scene_observers_notified_of_generic_scene_change)
++{
++    MockSceneObserver o1, o2;
++
++    EXPECT_CALL(o1, scene_changed()).Times(1);
++    EXPECT_CALL(o2, scene_changed()).Times(1);
++
++    stack.add_observer(mt::fake_shared(o1));
++    stack.add_observer(mt::fake_shared(o2));
++
++    stack.emit_scene_changed();
++}
++
  TEST_F(SurfaceStack, only_enumerates_exposed_input_surfaces)
+ {
      using namespace ::testing;