Merge lp:~alan-griffiths/miral/deconflate-output-from-display into lp:miral

[Alan Griffiths]

Correct some conflation of the display and the outputs it includes

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

PASSED: Continuous integration, rev:573
https://mir-jenkins.ubuntu.com/job/miral-ci/58/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-miral/90
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5009
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4998
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4998
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4998
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/94
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/94/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/94
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/94/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/94
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/94/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/94
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/94/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/94
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/94/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/94
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/94/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

review: Approve

=== modified file 'debian/libmiral2.symbols'
--- debian/libmiral2.symbols	2017-07-26 10:52:45 +0000
+++ debian/libmiral2.symbols	2017-07-28 13:57:06 +0000
@@ -395,3 +395,4 @@
  (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.4.0
  MIRAL_1.5.0@MIRAL_1.5.0 1.5.0
  (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.5.0
+ (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.5.0
 \ No newline at end of file
 
=== modified file 'include/miral/window_manager_tools.h'
--- include/miral/window_manager_tools.h	2017-03-23 11:25:25 +0000
+++ include/miral/window_manager_tools.h	2017-07-28 13:57:06 +0000
@@ -160,8 +160,8 @@
     /// Find the topmost window at the cursor
     auto window_at(mir::geometry::Point cursor) const -> Window;
 
-    /// Find the active display area
-    auto active_display() -> mir::geometry::Rectangle const;
+    /// Find the active output area
+    auto active_output() -> mir::geometry::Rectangle const;
 
     /// Raise window and all its children
     void raise_tree(Window const& root);
 
=== modified file 'miral-shell/floating_window_manager.cpp'
--- miral-shell/floating_window_manager.cpp	2017-07-28 13:43:24 +0000
+++ miral-shell/floating_window_manager.cpp	2017-07-28 13:57:06 +0000
@@ -468,7 +468,7 @@
     {
         if (auto active_window = tools.active_window())
         {
-            auto active_display = tools.active_display();
+            auto active_output = tools.active_output();
             auto& window_info = tools.info_for(active_window);
             WindowSpecification modifications;
 
@@ -477,13 +477,13 @@
             case KEY_LEFT:
                 modifications.state() = mir_window_state_vertmaximized;
                 tools.place_and_size_for_state(modifications, window_info);
-                modifications.top_left() = active_display.top_left + title_bar_height;
+                modifications.top_left() = active_output.top_left + title_bar_height;
                 break;
 
             case KEY_RIGHT:
                 modifications.state() = mir_window_state_vertmaximized;
                 tools.place_and_size_for_state(modifications, window_info);
-                modifications.top_left() = active_display.top_right() -
+                modifications.top_left() = active_output.top_right() -
                     as_displacement({active_window.size().width, 0}) + title_bar_height;
                 break;
 
@@ -491,14 +491,14 @@
                 modifications.state() = mir_window_state_horizmaximized;
                 tools.place_and_size_for_state(modifications, window_info);
 
-                modifications.top_left() = active_display.top_left + title_bar_height;
+                modifications.top_left() = active_output.top_left + title_bar_height;
                 break;
 
             case KEY_DOWN:
                 modifications.state() = mir_window_state_horizmaximized;
                 tools.place_and_size_for_state(modifications, window_info);
 
-                modifications.top_left() = active_display.bottom_right() - as_displacement(
+                modifications.top_left() = active_output.bottom_right() - as_displacement(
                     modifications.size().is_set() ? modifications.size().value() : active_window.size());
                 break;
 
 
=== modified file 'miral-shell/tiling_window_manager.cpp'
--- miral-shell/tiling_window_manager.cpp	2017-07-24 15:30:22 +0000
+++ miral-shell/tiling_window_manager.cpp	2017-07-28 13:57:06 +0000
@@ -457,13 +457,13 @@
         { return spinner.session() != info.application() && tile_for(info).contains(position);});
 }
 
-void TilingWindowManagerPolicy::update_tiles(Rectangles const& displays)
+void TilingWindowManagerPolicy::update_tiles(Rectangles const& outputs)
 {
     auto const tile_count = tiles.count();
 
-    if (tile_count < 1 || displays.size() < 1) return;
+    if (tile_count < 1 || outputs.size() < 1) return;
 
-    auto const bounding_rect = displays.bounding_rectangle();
+    auto const bounding_rect = outputs.bounding_rectangle();
 
     auto const total_width  = bounding_rect.size.width.as_int();
     auto const total_height = bounding_rect.size.height.as_int();
@@ -674,7 +674,7 @@
 {
     if (dirty_displays)
     {
-        // Need to acquire lock before accessing displays & dirty_tiles
+        // Need to acquire lock before accessing outputs & dirty_tiles
         tools.invoke_under_lock([this]
             {
                 displays = live_displays;
 
=== modified file 'miral-shell/tiling_window_manager.h'
--- miral-shell/tiling_window_manager.h	2017-03-06 09:26:44 +0000
+++ miral-shell/tiling_window_manager.h	2017-07-28 13:57:06 +0000
@@ -95,7 +95,7 @@
 
     miral::Application application_under(Point position);
 
-    void update_tiles(Rectangles const& displays);
+    void update_tiles(Rectangles const& outputs);
     void update_surfaces(miral::ApplicationInfo& info, Rectangle const& old_tile, Rectangle const& new_tile);
 
     auto transform_set_state(MirWindowState value) -> MirWindowState;
 
=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2017-07-28 08:54:30 +0000
+++ miral/basic_window_manager.cpp	2017-07-28 13:57:06 +0000
@@ -727,7 +727,7 @@
     return surface_at ? info_for(surface_at).window() : Window{};
 }
 
-auto miral::BasicWindowManager::active_display()
+auto miral::BasicWindowManager::active_output()
 -> geometry::Rectangle const
 {
     geometry::Rectangle result;
@@ -739,13 +739,13 @@
         auto const surface_rect = surface->input_bounds();
         int max_overlap_area = -1;
 
-        for (auto const& display : displays)
+        for (auto const& output : outputs)
         {
-            auto const intersection = surface_rect.intersection_with(display).size;
+            auto const intersection = surface_rect.intersection_with(output).size;
             if (intersection.width.as_int()*intersection.height.as_int() > max_overlap_area)
             {
                 max_overlap_area = intersection.width.as_int()*intersection.height.as_int();
-                result = display;
+                result = output;
             }
         }
         return result;
@@ -757,20 +757,20 @@
     //    available.
 
     // 3. Otherwise, the display that contains the pointer, if there is one.
-    for (auto const& display : displays)
+    for (auto const& output : outputs)
     {
-        if (display.contains(cursor))
+        if (output.contains(cursor))
         {
             // Ignore the (unspecified) possiblity of overlapping displays
-            return display;
+            return output;
         }
     }
 
     // 4. Otherwise, the primary display, if there is one (for example, the laptop display).
 
     // 5. Otherwise, the first display.
-    if (displays.size())
-        result = *displays.begin();
+    if (outputs.size())
+        result = *outputs.begin();
 
     return result;
 }
@@ -1042,7 +1042,7 @@
             return;
     }
 
-    auto const display_area = displays.bounding_rectangle();
+    auto const display_area = outputs.bounding_rectangle();
     auto const window = window_info.window();
 
     auto restore_rect = window_info.restore_rect();
@@ -1450,7 +1450,7 @@
     if (!parameters.state().is_set())
         parameters.state() = mir_window_state_restored;
 
-    auto const active_display_area = active_display();
+    auto const active_output_area = active_output();
     auto const height = parameters.size().value().height.as_int();
 
     bool positioned = false;
@@ -1525,35 +1525,35 @@
 
     if (!positioned)
     {
-        auto centred = active_display_area.top_left
-                       + 0.5*(as_displacement(active_display_area.size) - as_displacement(parameters.size().value()))
-                       - DeltaY{(active_display_area.size.height.as_int()-height)/6};
+        auto centred = active_output_area.top_left
+                       + 0.5*(as_displacement(active_output_area.size) - as_displacement(parameters.size().value()))
+                       - DeltaY{(active_output_area.size.height.as_int()-height)/6};
 
         switch (parameters.state().value())
         {
         case mir_window_state_fullscreen:
         case mir_window_state_maximized:
-            parameters.top_left() = active_display_area.top_left;
-            parameters.size() = active_display_area.size;
+            parameters.top_left() = active_output_area.top_left;
+            parameters.size() = active_output_area.size;
             break;
 
         case mir_window_state_vertmaximized:
-            centred.y = active_display_area.top_left.y;
+            centred.y = active_output_area.top_left.y;
             parameters.top_left() = centred;
-            parameters.size() = Size{parameters.size().value().width, active_display_area.size.height};
+            parameters.size() = Size{parameters.size().value().width, active_output_area.size.height};
             break;
 
         case mir_window_state_horizmaximized:
-            centred.x = active_display_area.top_left.x;
+            centred.x = active_output_area.top_left.x;
             parameters.top_left() = centred;
-            parameters.size() = Size{active_display_area.size.width, parameters.size().value().height};
+            parameters.size() = Size{active_output_area.size.width, parameters.size().value().height};
             break;
 
         default:
             parameters.top_left() = centred;
         }
 
-        auto const display_area = displays.bounding_rectangle();
+        auto const display_area = outputs.bounding_rectangle();
 
         if (parameters.top_left().value().y < display_area.top_left.y)
             parameters.top_left() = Point{parameters.top_left().value().x, display_area.top_left.y};
@@ -1750,7 +1750,7 @@
 -> mir::optional_value<Rectangle>
 {
     auto const hints = parameters.placement_hints().value();
-    auto const active_display_area = active_display();
+    auto const active_output_area = active_output();
     auto const win_gravity = parameters.window_placement_gravity().value();
 
     if (parameters.size().is_set())
@@ -1775,7 +1775,7 @@
             auto result = constrain_to(parent, anchor_for(aux_rect, rect_gravity) + offset) +
                 offset_for(size, win_gravity);
 
-            if (active_display_area.contains(Rectangle{result, size}))
+            if (active_output_area.contains(Rectangle{result, size}))
                 return Rectangle{result, size};
 
             if (!default_result.is_set())
@@ -1787,7 +1787,7 @@
             auto result = constrain_to(parent, anchor_for(aux_rect, flip_x(rect_gravity)) + flip_x(offset)) +
                 offset_for(size, flip_x(win_gravity));
 
-            if (active_display_area.contains(Rectangle{result, size}))
+            if (active_output_area.contains(Rectangle{result, size}))
                 return Rectangle{result, size};
         }
 
@@ -1796,7 +1796,7 @@
             auto result = constrain_to(parent, anchor_for(aux_rect, flip_y(rect_gravity)) + flip_y(offset)) +
                 offset_for(size, flip_y(win_gravity));
 
-            if (active_display_area.contains(Rectangle{result, size}))
+            if (active_output_area.contains(Rectangle{result, size}))
                 return Rectangle{result, size};
         }
 
@@ -1805,7 +1805,7 @@
             auto result = constrain_to(parent, anchor_for(aux_rect, flip_x(flip_y(rect_gravity))) + flip_x(flip_y(offset))) +
                 offset_for(size, flip_x(flip_y(win_gravity)));
 
-            if (active_display_area.contains(Rectangle{result, size}))
+            if (active_output_area.contains(Rectangle{result, size}))
                 return Rectangle{result, size};
         }
     }
@@ -1817,8 +1817,8 @@
 
         if (hints & mir_placement_hints_slide_x)
         {
-            auto const left_overhang  = result.x - active_display_area.top_left.x;
-            auto const right_overhang = (result + as_displacement(size)).x - active_display_area.top_right().x;
+            auto const left_overhang  = result.x - active_output_area.top_left.x;
+            auto const right_overhang = (result + as_displacement(size)).x - active_output_area.top_right().x;
 
             if (left_overhang < DeltaX{0})
                 result -= left_overhang;
@@ -1828,8 +1828,8 @@
 
         if (hints & mir_placement_hints_slide_y)
         {
-            auto const top_overhang  = result.y - active_display_area.top_left.y;
-            auto const bot_overhang = (result + as_displacement(size)).y - active_display_area.bottom_left().y;
+            auto const top_overhang  = result.y - active_output_area.top_left.y;
+            auto const bot_overhang = (result + as_displacement(size)).y - active_output_area.bottom_left().y;
 
             if (top_overhang < DeltaY{0})
                 result -= top_overhang;
@@ -1837,7 +1837,7 @@
                 result -= bot_overhang;
         }
 
-        if (active_display_area.contains(Rectangle{result, size}))
+        if (active_output_area.contains(Rectangle{result, size}))
             return Rectangle{result, size};
     }
 
@@ -1848,8 +1848,8 @@
 
         if (hints & mir_placement_hints_resize_x)
         {
-            auto const left_overhang  = result.x - active_display_area.top_left.x;
-            auto const right_overhang = (result + as_displacement(size)).x - active_display_area.top_right().x;
+            auto const left_overhang  = result.x - active_output_area.top_left.x;
+            auto const right_overhang = (result + as_displacement(size)).x - active_output_area.top_right().x;
 
             if (left_overhang < DeltaX{0})
             {
@@ -1865,8 +1865,8 @@
 
         if (hints & mir_placement_hints_resize_y)
         {
-            auto const top_overhang  = result.y - active_display_area.top_left.y;
-            auto const bot_overhang = (result + as_displacement(size)).y - active_display_area.bottom_left().y;
+            auto const top_overhang  = result.y - active_output_area.top_left.y;
+            auto const bot_overhang = (result + as_displacement(size)).y - active_output_area.bottom_left().y;
 
             if (top_overhang < DeltaY{0})
             {
@@ -1880,7 +1880,7 @@
             }
         }
 
-        if (active_display_area.contains(Rectangle{result, size}))
+        if (active_output_area.contains(Rectangle{result, size}))
             return Rectangle{result, size};
     }
 
@@ -2149,7 +2149,7 @@
 void miral::BasicWindowManager::add_display_for_testing(mir::geometry::Rectangle const& area)
 {
     Locker lock{this};
-    displays.add(area);
+    outputs.add(area);
 
     update_windows_for_outputs();
 }
@@ -2157,7 +2157,7 @@
 void miral::BasicWindowManager::advise_output_create(miral::Output const& output)
 {
     Locker lock{this};
-    displays.add(output.extents());
+    outputs.add(output.extents());
 
     update_windows_for_outputs();
 }
@@ -2165,8 +2165,8 @@
 void miral::BasicWindowManager::advise_output_update(miral::Output const& updated, miral::Output const& original)
 {
     Locker lock{this};
-    displays.remove(original.extents());
-    displays.add(updated.extents());
+    outputs.remove(original.extents());
+    outputs.add(updated.extents());
 
     update_windows_for_outputs();
 }
@@ -2174,7 +2174,7 @@
 void miral::BasicWindowManager::advise_output_delete(miral::Output const& output)
 {
     Locker lock{this};
-    displays.remove(output.extents());
+    outputs.remove(output.extents());
 
     update_windows_for_outputs();
 }
@@ -2192,10 +2192,10 @@
         }
     }
 
-    if (displays.size() == 0)
+    if (outputs.size() == 0)
         return;
 
-    auto const display_area = displays.bounding_rectangle();
+    auto const display_area = outputs.bounding_rectangle();
 
     for (auto const& window : maximized_surfaces)
     {
 
=== modified file 'miral/basic_window_manager.h'
--- miral/basic_window_manager.h	2017-07-28 08:54:30 +0000
+++ miral/basic_window_manager.h	2017-07-28 13:57:06 +0000
@@ -176,7 +176,7 @@
 
     auto window_at(mir::geometry::Point cursor) const -> Window override;
 
-    auto active_display() -> mir::geometry::Rectangle const override;
+    auto active_output() -> mir::geometry::Rectangle const override;
 
     void raise_tree(Window const& root) override;
     void start_drag_and_drop(WindowInfo& window_info, std::vector<uint8_t> const& handle) override;
@@ -216,7 +216,7 @@
     std::mutex mutex;
     SessionInfoMap app_info;
     SurfaceInfoMap window_info;
-    mir::geometry::Rectangles displays;
+    mir::geometry::Rectangles outputs;
     mir::geometry::Point cursor;
     uint64_t last_input_event_timestamp{0};
 #if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
 
=== modified file 'miral/symbols.map'
--- miral/symbols.map	2017-07-26 10:44:19 +0000
+++ miral/symbols.map	2017-07-28 13:57:06 +0000
@@ -429,6 +429,7 @@
     miral::WindowManagementPolicyAddendum3::?WindowManagementPolicyAddendum3*;
     miral::WindowManagementPolicyAddendum3::WindowManagementPolicyAddendum3*;
     miral::WindowManagementPolicyAddendum3::operator*;
+    miral::WindowManagerTools::active_output*;
     non-virtual?thunk?to?miral::WindowManagementPolicyAddendum3::?WindowManagementPolicyAddendum3*;
     typeinfo?for?miral::WindowManagementPolicyAddendum3;
     vtable?for?miral::WindowManagementPolicyAddendum3;
 
=== modified file 'miral/window_management_trace.cpp'
--- miral/window_management_trace.cpp	2017-03-21 17:55:31 +0000
+++ miral/window_management_trace.cpp	2017-07-28 13:57:06 +0000
@@ -448,10 +448,10 @@
 }
 MIRAL_TRACE_EXCEPTION
 
-auto miral::WindowManagementTrace::active_display() -> mir::geometry::Rectangle const
+auto miral::WindowManagementTrace::active_output() -> mir::geometry::Rectangle const
 try {
     log_input();
-    auto result = wrapped.active_display();
+    auto result = wrapped.active_output();
     std::stringstream out;
     out << result;
     mir::log_info("%s -> ", __func__, out.str().c_str());
 
=== modified file 'miral/window_management_trace.h'
--- miral/window_management_trace.h	2017-03-21 17:55:31 +0000
+++ miral/window_management_trace.h	2017-07-28 13:57:06 +0000
@@ -54,7 +54,7 @@
     virtual auto active_window() const -> Window override;
     virtual auto select_active_window(Window const& hint) -> Window override;
     virtual auto window_at(mir::geometry::Point cursor) const -> Window override;
-    virtual auto active_display() -> mir::geometry::Rectangle const override;
+    virtual auto active_output() -> mir::geometry::Rectangle const override;
     virtual auto info_for_window_id(std::string const& id) const -> WindowInfo& override;
     virtual auto id_for_window(Window const& window) const -> std::string override;
     virtual void place_and_size_for_state(WindowSpecification& modifications, WindowInfo const& window_info) const override;
 
=== modified file 'miral/window_manager_tools.cpp'
--- miral/window_manager_tools.cpp	2017-03-21 17:55:31 +0000
+++ miral/window_manager_tools.cpp	2017-07-28 13:57:06 +0000
@@ -18,6 +18,7 @@
 
 #include "miral/window_manager_tools.h"
 #include "window_manager_tools_implementation.h"
+#include "both_versions.h"
 
 miral::WindowManagerTools::WindowManagerTools(WindowManagerToolsImplementation* tools) :
     tools{tools}
@@ -77,8 +78,11 @@
 auto miral::WindowManagerTools::window_at(mir::geometry::Point cursor) const -> Window
 { return tools->window_at(cursor); }
 
-auto miral::WindowManagerTools::active_display() -> mir::geometry::Rectangle const
-{ return tools->active_display(); }
+MIRAL_FAKE_OLD_SYMBOL(
+    _ZN5miral18WindowManagerTools14active_displayEv,
+    _ZN5miral18WindowManagerTools13active_outputEv)
+auto miral::WindowManagerTools::active_output() -> mir::geometry::Rectangle const
+{ return tools->active_output(); }
 
 void miral::WindowManagerTools::raise_tree(Window const& root)
 { tools->raise_tree(root); }
 
=== modified file 'miral/window_manager_tools_implementation.h'
--- miral/window_manager_tools_implementation.h	2017-03-21 17:55:31 +0000
+++ miral/window_manager_tools_implementation.h	2017-07-28 13:57:06 +0000
@@ -65,7 +65,7 @@
     virtual void focus_next_within_application() = 0;
     virtual void focus_prev_within_application() = 0;
     virtual auto window_at(mir::geometry::Point cursor) const -> Window = 0;
-    virtual auto active_display() -> mir::geometry::Rectangle const = 0;
+    virtual auto active_output() -> mir::geometry::Rectangle const = 0;
     virtual void raise_tree(Window const& root) = 0;
     virtual void start_drag_and_drop(WindowInfo& window_info, std::vector<uint8_t> const& handle) = 0;
     virtual void end_drag_and_drop() = 0;