Merge lp:~kdub/unity-system-compositor/unblock-silo0 into lp:~mir-team/unity-system-compositor/toggle-cursor2

[Kevin DuBois]

upon Display changes, use information from WindowManager system to figure out the new dimensions. Also scan through the list of surfaces differently, as surface_after() will never return nullptr.

upon Display changes, use information from WindowManager system to figure out the new dimensions. Also scan through the list of surfaces differently, as surface_after() will never return nullptr.

Unmerged revisions

226. By Kevin DuBois on 2015-08-04

configure the display differently on screen changes

=== modified file 'src/server.cpp'
--- src/server.cpp	2015-07-31 14:11:27 +0000
+++ src/server.cpp	2015-08-04 17:53:42 +0000
@@ -138,7 +138,6 @@
        {
          return std::make_shared<WindowManager>(
              focus_controller,
-             the_display(),
              the_shell_display_layout(),
              the_session_coordinator(),
              the_session_switcher());

=== modified file 'src/window_manager.cpp'
--- src/window_manager.cpp	2015-07-31 14:11:27 +0000
+++ src/window_manager.cpp	2015-08-04 17:53:42 +0000
@@ -86,7 +86,6 @@
 
 usc::WindowManager::WindowManager(
     mir::shell::FocusController* focus_controller,
-    std::shared_ptr<mir::graphics::Display> const& display,
     std::shared_ptr<mir::shell::DisplayLayout> const& display_layout,
     std::shared_ptr<ms::SessionCoordinator> const& session_coordinator,
     std::shared_ptr<SessionMonitor> const& session_monitor) :
@@ -95,7 +94,6 @@
         display_layout,
         session_coordinator},
     session_monitor{session_monitor},
-    display{display},
     display_layout{display_layout}
 {
 }
@@ -126,11 +124,20 @@
 
 void usc::WindowManager::add_display(mir::geometry::Rectangle const& area)
 {
+    rects.push_back(area);
     resize_scene_to_cloned_display_intersection();
 }
 
 void usc::WindowManager::remove_display(mir::geometry::Rectangle const& area)
 {
+    for(auto it = rects.begin(); it != rects.end();)
+    {
+        if (*it == area)
+            it = rects.erase(it);
+        else
+            it++;
+    }
+
     resize_scene_to_cloned_display_intersection();
 }
 
@@ -140,26 +147,25 @@
     // Determine display intersection geometry - they should already be cloned and have
     // orientation (i.e. both landscape)
 
-    Size intersection{999999, 999999};
-    auto displayConfig = display->configuration();
-    displayConfig->for_each_output(
-                [&](mg::DisplayConfigurationOutput const& displayConfigOutput){
-        if (!displayConfigOutput.connected || !displayConfigOutput.used)
-            return;
-
-        Size size = displayConfigOutput.extents().size;
-        if (size.width < intersection.width)
-            intersection.width = size.width;
-        if (size.height < intersection.height)
-            intersection.height = size.height;
-    });
-
-    std::cout << "Intersection" << intersection.width << intersection.height << std::endl;
+    if (rects.empty())
+        return;
+
+    auto intersection = rects.front();
+    for (auto const& rect : rects)
+        intersection = intersection.intersection_with(rect);
+
+    std::cout << "Intersection: " << intersection << std::endl;
 
     // Now resize all surfaces in scene to this value
     for (auto &session : sessions)
-        for (auto s = session->default_surface(); s; s = session->surface_after(s))
+    {
+        auto first = session->default_surface();
+        first->resize(intersection.size);
+        auto next = session->surface_after(first);
+        while (next != first)
         {
-            s->resize(intersection);
+            next->resize(intersection.size);
+            next = session->surface_after(next);
         }
+    }
 }

=== modified file 'src/window_manager.h'
--- src/window_manager.h	2015-07-31 14:11:27 +0000
+++ src/window_manager.h	2015-08-04 17:53:42 +0000
@@ -20,8 +20,10 @@
 #define USC_WINDOW_MANAGER_H_
 
 #include <mir/shell/system_compositor_window_manager.h>
+#include "mir/geometry/rectangle.h"
 #include "session_monitor.h"
 #include <vector>
+#include <set>
 
 namespace mir
 {
@@ -39,7 +41,6 @@
 public:
     explicit WindowManager(
         mir::shell::FocusController* focus_controller,
-        std::shared_ptr<mir::graphics::Display> const& display,
         std::shared_ptr<mir::shell::DisplayLayout> const& display_layout,
         std::shared_ptr<mir::scene::SessionCoordinator> const& session_coordinator,
         std::shared_ptr<SessionMonitor> const& session_monitor);
@@ -57,6 +58,9 @@
     virtual void on_session_added(std::shared_ptr<mir::scene::Session> const& session) const;
     virtual void on_session_removed(std::shared_ptr<mir::scene::Session> const& session) const;
     virtual void on_session_ready(std::shared_ptr<mir::scene::Session> const& session) const;
+    std::vector<mir::geometry::Rectangle> rects;
+    mir::geometry::Size surface_size;
+    std::vector<std::shared_ptr<mir::scene::Surface>> mutable surfaces;
 };
 }