Merge lp:~mir-team/unity-system-compositor/silo0 into lp:unity-system-compositor

[Gerry Boland]

Silo0 branch - for pocket desktop

[lp:~mir-team/unity-system-compositor/silo0]

244. By Kevin DuBois on 2015-08-04

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.

245. By Gerry Boland on 2015-08-04

Merge usc/0.1 and update changelog

246. By Kevin DuBois on 2015-08-11

Return immeditately if there is no default surface in the window resizing code.

Unmerged revisions

246. By Kevin DuBois on 2015-08-11

Return immeditately if there is no default surface in the window resizing code.

245. By Gerry Boland on 2015-08-04

Merge usc/0.1 and update changelog

244. By Kevin DuBois on 2015-08-04

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.

243. By Gerry Boland on 2015-08-04

Configure non-primary display to be rotated

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-16 21:45:22 +0000
+++ debian/changelog	2015-08-11 13:07:12 +0000
@@ -1,8 +1,30 @@
-unity-system-compositor (0.0.5+15.10.20150506.2-0ubuntu1) UNRELEASED; urgency=medium
-
+unity-system-compositor (0.1.0+15.10.20150728.1-0ubuntu1) wily; urgency=medium
+
+  [ Alexandros Frantzis ]
+  * Support different screen timeout values for notifications
+    (LP: #1426115)
+  * Enable and handle proximity events properly (LP: #1291455)
+  * Don't force gcc 4.9 when building the package (LP: #1478926)
+  * Introduce new versioning scheme
+
+  [ Alan Griffiths ]
+  * Port to mir SystemCompositorWindowManager
+  
+  [ Robert Ancell ]
+  * Depend on the new xmir package instead of the obsolete
+    xserver-xorg-xmir (LP: #1204505)
+
+ -- CI Train Bot <[e-mail]>  Tue, 28 Jul 2015 18:55:28 +0000
+
+unity-system-compositor (0.0.5+15.10.20150722-0ubuntu1) wily; urgency=medium
+
+  [ Kevin Gunn ]
   * Release in step with Mir 0.14 
 
- -- Kevin Gunn <[e-mail]>  Thu, 16 Jul 2015 15:14:22 -0500
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+ -- CI Train Bot <[e-mail]>  Wed, 22 Jul 2015 14:49:58 +0000
 
 unity-system-compositor (0.0.5+15.04.20150713-0ubuntu1) vivid; urgency=medium
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-07-15 13:48:30 +0000
+++ src/CMakeLists.txt	2015-08-11 13:07:12 +0000
@@ -16,6 +16,7 @@
 
 set(USC_SRCS
   asio_dm_connection.cpp
+  clone_display_configuration_policy.cpp
   dbus_connection_handle.cpp
   dbus_event_loop.cpp
   dbus_message_handle.cpp

=== added file 'src/clone_display_configuration_policy.cpp'
--- src/clone_display_configuration_policy.cpp	1970-01-01 00:00:00 +0000
+++ src/clone_display_configuration_policy.cpp	2015-08-11 13:07:12 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2015 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 warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, 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/>.
+ */
+
+#include "clone_display_configuration_policy.h"
+
+#include <mir/graphics/display_configuration.h>
+#include <cstdio>
+namespace mg = mir::graphics;
+
+CloneDisplayConfigurationPolicy::CloneDisplayConfigurationPolicy(
+        const std::shared_ptr<mir::graphics::DisplayConfigurationPolicy> &wrapped)
+   : wrapped{wrapped}
+{
+}
+
+void CloneDisplayConfigurationPolicy::apply_to(mir::graphics::DisplayConfiguration& conf)
+{
+    wrapped->apply_to(conf);
+
+    conf.for_each_output(
+                [&](mg::UserDisplayConfigurationOutput& displayConfigOutput) {
+        if (displayConfigOutput.id.as_value() > 0) { printf("Here\n");
+            displayConfigOutput.orientation = mir_orientation_left;
+        }
+    }
+    );
+
+    conf.for_each_output(
+                [&](const mg::DisplayConfigurationOutput displayConfigOutput) {
+        printf("Output %d: Orientation %d\n", displayConfigOutput.id.as_value(), displayConfigOutput.orientation);
+    }
+    );
+}

=== added file 'src/clone_display_configuration_policy.h'
--- src/clone_display_configuration_policy.h	1970-01-01 00:00:00 +0000
+++ src/clone_display_configuration_policy.h	2015-08-11 13:07:12 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2015 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 warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, 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/>.
+ */
+
+#ifndef CLONEDISPLAYCONFIGURATIONPOLICY_H
+#define CLONEDISPLAYCONFIGURATIONPOLICY_H
+
+#include <mir/graphics/display_configuration_policy.h>
+#include <memory>
+
+class CloneDisplayConfigurationPolicy : public mir::graphics::DisplayConfigurationPolicy
+{
+public:
+    CloneDisplayConfigurationPolicy(const std::shared_ptr<mir::graphics::DisplayConfigurationPolicy> &wrapped);
+
+    void apply_to(mir::graphics::DisplayConfiguration& conf) override;
+
+private:
+    const std::shared_ptr<mir::graphics::DisplayConfigurationPolicy> wrapped;
+};
+
+#endif // CLONEDISPLAYCONFIGURATIONPOLICY_H

=== modified file 'src/server.cpp'
--- src/server.cpp	2015-07-15 13:48:31 +0000
+++ src/server.cpp	2015-08-11 13:07:12 +0000
@@ -26,6 +26,7 @@
 #include "powerd_mediator.h"
 #include "unity_screen_service.h"
 #include "steady_clock.h"
+#include "clone_display_configuration_policy.h"
 
 #include <mir/input/cursor_listener.h>
 #include <mir/server_status_listener.h>
@@ -40,6 +41,7 @@
 namespace ms = mir::scene;
 namespace mf = mir::frontend;
 namespace mi = mir::input;
+namespace mg = mir::graphics;
 
 namespace
 {
@@ -152,6 +154,13 @@
              the_session_switcher());
        });
 
+    wrap_display_configuration_policy(
+    [](const std::shared_ptr<mg::DisplayConfigurationPolicy> &wrapped)
+        -> std::shared_ptr<mg::DisplayConfigurationPolicy>
+	    {
+    	    return std::make_shared<CloneDisplayConfigurationPolicy>(wrapped);
+    	});
+
     set_config_filename("unity-system-compositor.conf");
 
     apply_settings();

=== modified file 'src/window_manager.cpp'
--- src/window_manager.cpp	2015-06-11 16:55:36 +0000
+++ src/window_manager.cpp	2015-08-11 13:07:12 +0000
@@ -33,6 +33,7 @@
 #include "mir_toolkit/client_types.h"
 
 #include <iostream>
+#include <algorithm>
 
 namespace mf = mir::frontend;
 namespace ms = mir::scene;
@@ -96,6 +97,26 @@
     session_monitor{session_monitor}
 {
 }
+
+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();
+}
+
 void usc::WindowManager::on_session_added(std::shared_ptr<mir::scene::Session> const& session) const
 {
     std::cerr << "Opening session " << session->name() << std::endl;
@@ -103,6 +124,7 @@
     auto const usc_session = std::make_shared<UscSession>(session, *focus_controller);
 
     session_monitor->add(usc_session, session->process_id());
+    sessions.push_back(session);
 }
 
 void usc::WindowManager::on_session_removed(std::shared_ptr<mir::scene::Session> const& session) const
@@ -110,9 +132,43 @@
     std::cerr << "Closing session " << session->name() << std::endl;
 
     session_monitor->remove(session);
+
+    sessions.erase( std::remove(begin(sessions), end(sessions), session), end(sessions));
 }
 
 void usc::WindowManager::on_session_ready(std::shared_ptr<mir::scene::Session> const& session) const
 {
     session_monitor->mark_ready(session.get());
 }
+
+void usc::WindowManager::resize_scene_to_cloned_display_intersection()
+{
+    using namespace mir::geometry;
+    // Determine display intersection geometry - they should already be cloned and have
+    // orientation (i.e. both landscape)
+
+    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
+    // TODO: (kdub) have Mir provide an easier route for this operation
+    for (auto &session : sessions)
+    {
+        auto first = session->default_surface();
+        if (!first) return;
+        first->resize(intersection.size);
+        auto next = session->surface_after(first);
+        if (!next) return;
+        while (next != first)
+        {
+            next->resize(intersection.size);
+            next = session->surface_after(next);
+        }
+    }
+}

=== modified file 'src/window_manager.h'
--- src/window_manager.h	2015-06-11 16:51:42 +0000
+++ src/window_manager.h	2015-08-11 13:07:12 +0000
@@ -20,8 +20,12 @@
 #define USC_WINDOW_MANAGER_H_
 
 #include <mir/shell/system_compositor_window_manager.h>
+#include <mir/geometry/rectangle.h>
+#include <mir/geometry/size.h>
 #include "session_monitor.h"
 
+#include <vector>
+
 namespace mir
 {
 namespace scene { class PlacementStrategy; class SessionCoordinator; }
@@ -41,12 +45,21 @@
         std::shared_ptr<mir::scene::SessionCoordinator> const& session_coordinator,
         std::shared_ptr<SessionMonitor> const& session_switcher);
 
+    void add_display(mir::geometry::Rectangle const& area) override;
+    void remove_display(mir::geometry::Rectangle const& area) override;
+
 private:
+    void resize_scene_to_cloned_display_intersection();
     std::shared_ptr<SessionMonitor> const session_monitor;
 
     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;
+
+    mutable std::vector<std::shared_ptr<mir::scene::Session>> sessions;
+    std::vector<mir::geometry::Rectangle> rects;
+    mir::geometry::Size surface_size;
+    std::vector<std::shared_ptr<mir::scene::Surface>> mutable surfaces;
 };
 }