Merge lp:~alan-griffiths/mir/tiling-after-display-reconfig into lp:mir

[Alan Griffiths]

Fix the worst of the retiling bugs when the a display is unplugged

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:4270
https://mir-jenkins.ubuntu.com/job/mir-ci/3694/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5066/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5302
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5290
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5290
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5290
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5110/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5110/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5110/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3694/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4270
https://mir-jenkins.ubuntu.com/job/mir-ci/3697/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5069
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5305
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5293
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5293
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5293
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5113/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5113/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5113/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5113/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5113/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5113/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5113/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5113/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3697/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/miral-shell/tiling_window_manager.cpp'
--- examples/miral-shell/tiling_window_manager.cpp	2017-08-21 15:58:34 +0000
+++ examples/miral-shell/tiling_window_manager.cpp	2017-09-26 20:21:37 +0000
@@ -529,20 +529,26 @@
 
             if (!window_info.parent())
             {
-                auto const new_pos = window.top_left() + (new_tile.top_left - old_tile.top_left);
-                auto const offset = new_pos - new_tile.top_left;
-
-                // For now just scale if was filling width/height of tile
-                auto const old_size = window.size();
-                auto const scaled_width  = old_size.width  == old_tile.size.width  ? new_tile.size.width  : old_size.width;
-                auto const scaled_height = old_size.height == old_tile.size.height ? new_tile.size.height : old_size.height;
-
-                auto width  = std::min(new_tile.size.width.as_int()  - offset.dx.as_int(), scaled_width.as_int());
-                auto height = std::min(new_tile.size.height.as_int() - offset.dy.as_int(), scaled_height.as_int());
+                auto offset_in_tile = window.top_left() - old_tile.top_left;
+                offset_in_tile.dx = std::min(offset_in_tile.dx, as_displacement(new_tile.size).dx);
+                offset_in_tile.dy = std::min(offset_in_tile.dy, as_displacement(new_tile.size).dy);
+
+                Rectangle new_placement{new_tile.top_left + offset_in_tile, window.size()};
+
+                if (window.size().width == old_tile.size.width)
+                    new_placement.size.width = new_tile.size.width;
+
+                if (window.size().height == old_tile.size.height)
+                    new_placement.size.height = new_tile.size.height;
+
+                if (!new_placement.overlaps(new_tile))
+                    new_placement.top_left = new_tile.top_left;
+
+                new_placement = new_placement.intersection_with(new_tile);
 
                 WindowSpecification modifications;
-                modifications.top_left() = new_pos;
-                modifications.size() = {width, height};
+                modifications.top_left() = new_placement.top_left;
+                modifications.size() = new_placement.size;
                 tools.modify_window(window_info, modifications);
             }
         }
@@ -652,12 +658,10 @@
     dirty_displays = true;
 }
 
-#include <iostream>
 void TilingWindowManagerPolicy::advise_output_update(const Output& updated, const Output& original)
 {
     if (!equivalent_display_area(updated, original))
     {
-        std::cout << "Original: " << original.extents() << "new: " << updated.extents() << '\n';
         live_displays.remove(original.extents());
         live_displays.add(updated.extents());
 

=== modified file 'src/miral/display_configuration_listeners.cpp'
--- src/miral/display_configuration_listeners.cpp	2017-08-21 14:18:55 +0000
+++ src/miral/display_configuration_listeners.cpp	2017-09-26 20:21:37 +0000
@@ -83,7 +83,8 @@
             {
             Output o{output};
 
-            if (!o.connected() || !o.valid()) return;
+            if (!o.valid() || !o.used() || !o.connected() || o.power_mode() != mir_power_mode_on)
+                return;
 
             auto op = find_if(
                 begin(active_outputs), end(active_outputs), [&](Output const& oo)