Merge lp:~alan-griffiths/miral/miral-shell-intro-text into lp:miral

[Alan Griffiths]

[miral-shell] Use background on 1st monitor to show keyboard shortcuts

[lp:~alan-griffiths/miral/miral-shell-intro-text]

511. By Alan Griffiths on 2017-02-13

Better naming

512. By Alan Griffiths on 2017-02-14

merge lp:~alan-griffiths/miral/workspaces-example

513. By Alan Griffiths on 2017-02-14

merge lp:~alan-griffiths/miral/workspaces-example

514. By Alan Griffiths on 2017-02-15

merge lp:~alan-griffiths/miral/workspaces-example

515. By Alan Griffiths on 2017-02-15

merge lp:~alan-griffiths/miral/workspaces-example

516. By Alan Griffiths on 2017-02-16

Display helptext on all outputs

517. By Alan Griffiths on 2017-02-16

merge lp:~alan-griffiths/miral/workspaces-example

518. By Alan Griffiths on 2017-02-20

Remove intro text if display config changes

Unmerged revisions

518. By Alan Griffiths on 2017-02-20

Remove intro text if display config changes

517. By Alan Griffiths on 2017-02-16

merge lp:~alan-griffiths/miral/workspaces-example

516. By Alan Griffiths on 2017-02-16

Display helptext on all outputs

515. By Alan Griffiths on 2017-02-15

merge lp:~alan-griffiths/miral/workspaces-example

514. By Alan Griffiths on 2017-02-15

merge lp:~alan-griffiths/miral/workspaces-example

513. By Alan Griffiths on 2017-02-14

merge lp:~alan-griffiths/miral/workspaces-example

512. By Alan Griffiths on 2017-02-14

merge lp:~alan-griffiths/miral/workspaces-example

511. By Alan Griffiths on 2017-02-13

Better naming

510. By Alan Griffiths on 2017-02-13

Fix whitespace

509. By Alan Griffiths on 2017-02-13

merge lp:~alan-griffiths/miral/workspaces-example

=== added file 'include/mir/client/display_config.h'
--- include/mir/client/display_config.h	1970-01-01 00:00:00 +0000
+++ include/mir/client/display_config.h	2017-02-16 17:33:30 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2017 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: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_DISPLAY_CONFIG_H
+#define MIR_CLIENT_DISPLAY_CONFIG_H
+
+#include <mir_toolkit/mir_connection.h>
+#include <mir_toolkit/mir_display_configuration.h>
+
+#include <functional>
+#include <memory>
+
+namespace mir
+{
+/// Convenient C++ wrappers around the Mir toolkit API.
+///
+/// These wrappers are intentionally inline adapters: the compiled code depend directly on the Mir toolkit API.
+namespace client
+{
+class DisplayConfig
+{
+public:
+    DisplayConfig() = default;
+
+    explicit DisplayConfig(MirDisplayConfig* config) : self{config, deleter} {}
+
+    explicit DisplayConfig(MirConnection* connection) :
+        self{mir_connection_create_display_configuration(connection), deleter} {}
+
+    operator MirDisplayConfig*() { return self.get(); }
+
+    operator MirDisplayConfig const*() const { return self.get(); }
+
+    void reset() { self.reset(); }
+
+    void for_each_output(std::function<void(MirOutput const*)> const& enumerator) const
+    {
+        auto const count = mir_display_config_get_num_outputs(*this);
+
+        for (int i = 0; i != count; ++i)
+            enumerator(mir_display_config_get_output(*this, i));
+    }
+
+    void for_each_output(std::function<void(MirOutput*)> const& enumerator)
+    {
+        auto const count = mir_display_config_get_num_outputs(*this);
+
+        for (int i = 0; i != count; ++i)
+            enumerator(mir_display_config_get_mutable_output(*this, i));
+    }
+
+private:
+    static void deleter(MirDisplayConfig* config) { mir_display_config_release(config); }
+
+    std::shared_ptr <MirDisplayConfig> self;
+};
+}
+}
+
+#endif //MIR_CLIENT_DISPLAY_CONFIG_H
 
=== modified file 'miral-shell/CMakeLists.txt'
--- miral-shell/CMakeLists.txt	2016-12-14 11:22:57 +0000
+++ miral-shell/CMakeLists.txt	2017-02-16 17:33:30 +0000
@@ -45,7 +45,7 @@
     shell_main.cpp
     tiling_window_manager.cpp   tiling_window_manager.h
     titlebar_window_manager.cpp titlebar_window_manager.h
-    titlebar_provider.cpp       titlebar_provider.h
+    decoration_provider.cpp     decoration_provider.h
     titlebar_config.cpp         titlebar_config.h
 )
 
 
=== renamed file 'miral-shell/titlebar_provider.cpp' => 'miral-shell/decoration_provider.cpp'
--- miral-shell/titlebar_provider.cpp	2017-02-16 17:33:30 +0000
+++ miral-shell/decoration_provider.cpp	2017-02-16 17:33:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 Canonical Ltd.
+ * Copyright © 2016-2017 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,
@@ -16,9 +16,10 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "titlebar_provider.h"
+#include "decoration_provider.h"
 #include "titlebar_config.h"
 
+#include <mir/client/display_config.h>
 #include <mir/client/window_spec.h>
 
 #include <mir_toolkit/mir_buffer_stream.h>
@@ -37,8 +38,9 @@
 namespace
 {
 int const title_bar_height = 12;
+char const* const wallpaper_name = "wallpaper";
 
-void null_surface_callback(MirWindow*, void*) {}
+void null_window_callback(MirWindow*, void*) {}
 
 struct Printer
 {
@@ -48,6 +50,7 @@
     Printer& operator=(Printer const&) = delete;
 
     void print(MirGraphicsRegion const& region, std::string const& title, int const intensity);
+    void printhelp(MirGraphicsRegion const& region);
 
 private:
     std::wstring_convert<std::codecvt_utf16<wchar_t>> converter;
@@ -59,11 +62,7 @@
 
 void paint_surface(MirWindow* surface, std::string const& title, int const intensity)
 {
-#if MIR_CLIENT_VERSION <= MIR_VERSION_NUMBER(3, 4, 0)
-    MirBufferStream* buffer_stream = mir_surface_get_buffer_stream(surface);
-#else
     MirBufferStream* buffer_stream = mir_window_get_buffer_stream(surface);
-#endif
 
     // TODO sometimes buffer_stream is nullptr - find out why (and fix).
     // (Only observed when creating a lot of clients at once)
@@ -152,22 +151,114 @@
         base_y += glyph->advance.y >> 6;
     }
 }
+
+void Printer::printhelp(MirGraphicsRegion const& region)
+{
+    static char const* const helptext[] =
+        {
+            "Welcome to miral-shell",
+            "",
+            "Keyboard shortcuts:",
+            "",
+            "  o Switch apps: Alt-Tab, tap or click on the corresponding window",
+            "  o Switch window: Alt-`, tap or click on the corresponding window",
+            "",
+            "  o Move window: Alt-leftmousebutton drag (three finger drag)",
+            "  o Resize window: Alt-middle_button drag (three finger pinch)",
+            "",
+            "  o Maximize/restore current window (to display size). : Alt-F11",
+            "  o Maximize/restore current window (to display height): Shift-F11",
+            "  o Maximize/restore current window (to display width) : Ctrl-F11",
+            "",
+            "  o Switch workspace: Meta-Alt-[F1|F2|F3|F4]",
+            "  o Switch workspace taking active window: Meta-Ctrl-[F1|F2|F3|F4]",
+            "",
+            "  o To exit: Ctrl-Alt-BkSp",
+        };
+
+    int help_width = 0;
+    unsigned int help_height = 0;
+    unsigned int line_height = 0;
+
+    for (auto const* rawline : helptext)
+    {
+        int line_width = 0;
+
+        auto const line = converter.from_bytes(rawline);
+
+        auto const fwidth = std::min(region.width / 60, 20);
+
+        FT_Set_Pixel_Sizes(face, fwidth, 0);
+
+        for (auto const& ch : line)
+        {
+            FT_Load_Glyph(face, FT_Get_Char_Index(face, ch), FT_LOAD_DEFAULT);
+            auto const glyph = face->glyph;
+            FT_Render_Glyph(glyph, FT_RENDER_MODE_NORMAL);
+
+            line_width += glyph->advance.x >> 6;
+            line_height = std::max(line_height, glyph->bitmap.rows + glyph->bitmap.rows/2);
+        }
+
+        if (help_width < line_width) help_width = line_width;
+        help_height += line_height;
+    }
+
+    int base_y = (region.height - help_height)/2;
+
+    for (auto const* rawline : helptext)
+    {
+        int base_x = (region.width - help_width)/2;
+
+        auto const line = converter.from_bytes(rawline);
+
+        for (auto const& ch : line)
+        {
+            FT_Load_Glyph(face, FT_Get_Char_Index(face, ch), FT_LOAD_DEFAULT);
+            auto const glyph = face->glyph;
+            FT_Render_Glyph(glyph, FT_RENDER_MODE_NORMAL);
+
+            auto const& bitmap = glyph->bitmap;
+            auto const x = base_x + glyph->bitmap_left;
+
+            if (static_cast<int>(x + bitmap.width) <= region.width)
+            {
+                unsigned char* src = bitmap.buffer;
+
+                auto const y = base_y - glyph->bitmap_top;
+                char* dest = region.vaddr + y * region.stride + 4 * x;
+
+                for (auto row = 0u; row != bitmap.rows; ++row)
+                {
+                    for (auto col = 0u; col != 4 * bitmap.width; ++col)
+                        dest[col] |= src[col / 4]/2;
+
+                    src += bitmap.pitch;
+                    dest += region.stride;
+                }
+            }
+
+            base_x += glyph->advance.x >> 6;
+        }
+        base_y += line_height;
+    }
+}
 }
 
 using namespace mir::client;
 using namespace mir::geometry;
 
-TitlebarProvider::TitlebarProvider(miral::WindowManagerTools const& tools) : tools{tools}
+DecorationProvider::DecorationProvider(miral::WindowManagerTools const& tools) : tools{tools}
 {
 
 }
 
-TitlebarProvider::~TitlebarProvider()
+DecorationProvider::~DecorationProvider()
 {
     stop();
 }
 
-void TitlebarProvider::stop()
+void DecorationProvider::stop()
 {
     enqueue_work([this]
         {
@@ -177,30 +268,75 @@
 
     enqueue_work([this]
         {
+            wallpaper.erase(begin(wallpaper), end(wallpaper));
             connection.reset();
             stop_work();
         });
 }
 
-void TitlebarProvider::operator()(mir::client::Connection connection)
+namespace
+{
+void render_pattern(MirGraphicsRegion* region, uint8_t const pattern[])
+{
+    char* row = region->vaddr;
+
+    for (int j = 0; j < region->height; j++)
+    {
+        uint32_t* pixel = (uint32_t*)row;
+
+        for (int i = 0; i < region->width; i++)
+            memcpy(pixel + i, pattern, sizeof pixel[i]);
+
+        row += region->stride;
+    }
+
+    static Printer printer;
+    printer.printhelp(*region);
+}
+}
+
+void DecorationProvider::operator()(Connection connection)
 {
     this->connection = connection;
+
+    DisplayConfig const display_conf{this->connection};
+
+    display_conf.for_each_output([this](MirOutput const* output)
+         {
+             wallpaper.push_back(
+                 WindowSpec::for_gloss(this->connection, 100, 100)
+                     .set_pixel_format(mir_pixel_format_xrgb_8888)
+                     .set_buffer_usage(mir_buffer_usage_software)
+                     .set_fullscreen_on_output(mir_output_get_id(output))
+                     .set_name(wallpaper_name).create_window());
+
+             MirGraphicsRegion graphics_region;
+             MirBufferStream* buffer_stream = mir_window_get_buffer_stream(wallpaper.back());
+
+             mir_buffer_stream_get_graphics_region(buffer_stream, &graphics_region);
+
+             static uint8_t const pattern[4] = { 0x00, 0x00, 0x00, 0x00 };
+
+             render_pattern(&graphics_region, pattern);
+             mir_buffer_stream_swap_buffers_sync(buffer_stream);
+         });
+
     start_work();
 }
 
-void TitlebarProvider::operator()(std::weak_ptr<mir::scene::Session> const& session)
+void DecorationProvider::operator()(std::weak_ptr<mir::scene::Session> const& session)
 {
     std::lock_guard<decltype(mutex)> lock{mutex};
     this->weak_session = session;
 }
 
-auto TitlebarProvider::session() const -> std::shared_ptr<mir::scene::Session>
+auto DecorationProvider::session() const -> std::shared_ptr<mir::scene::Session>
 {
     std::lock_guard<decltype(mutex)> lock{mutex};
     return weak_session.lock();
 }
 
-void TitlebarProvider::create_titlebar_for(miral::Window const& window)
+void DecorationProvider::create_titlebar_for(miral::Window const& window)
 {
     enqueue_work([this, window]
         {
@@ -220,7 +356,7 @@
         });
 }
 
-void TitlebarProvider::paint_titlebar_for(miral::WindowInfo const& info, int intensity)
+void DecorationProvider::paint_titlebar_for(miral::WindowInfo const& info, int intensity)
 {
     if (auto data = find_titlebar_data(info.window()))
     {
@@ -240,7 +376,7 @@
     }
 }
 
-void TitlebarProvider::destroy_titlebar_for(miral::Window const& window)
+void DecorationProvider::destroy_titlebar_for(miral::Window const& window)
 {
     if (auto data = find_titlebar_data(window))
     {
@@ -248,11 +384,7 @@
         {
             enqueue_work([surface]
                  {
-#if MIR_CLIENT_VERSION <= MIR_VERSION_NUMBER(3, 4, 0)
-                     mir_surface_release(surface, &null_surface_callback, nullptr);
-#else
-                     mir_window_release(surface, &null_surface_callback, nullptr);
-#endif
+                     mir_window_release(surface, &null_window_callback, nullptr);
                  });
         }
 
@@ -264,7 +396,7 @@
     }
 }
 
-void TitlebarProvider::resize_titlebar_for(miral::WindowInfo const& window_info, Size const& size)
+void DecorationProvider::resize_titlebar_for(miral::WindowInfo const& window_info, Size const& size)
 {
     auto const window = window_info.window();
 
@@ -279,9 +411,10 @@
     }
 }
 
-void TitlebarProvider::place_new_titlebar(miral::WindowSpecification& window_spec)
+void DecorationProvider::place_new_decoration(miral::WindowSpecification& window_spec)
 {
     auto const name = window_spec.name().value();
+    if (name == "wallpaper") return;
 
     std::lock_guard<decltype(mutex)> lock{mutex};
 
@@ -296,8 +429,10 @@
     window_spec.top_left() = parent_window.top_left() - Displacement{0, title_bar_height};
 }
 
-void TitlebarProvider::advise_new_titlebar(miral::WindowInfo const& window_info)
+void DecorationProvider::advise_new_titlebar(miral::WindowInfo const& window_info)
 {
+    if (window_info.name() == wallpaper_name) return;
+
     {
         std::lock_guard<decltype(mutex)> lock{mutex};
 
@@ -307,7 +442,7 @@
     tools.raise_tree(window_info.parent());
 }
 
-void TitlebarProvider::advise_state_change(miral::WindowInfo const& window_info, MirWindowState state)
+void DecorationProvider::advise_state_change(miral::WindowInfo const& window_info, MirWindowState state)
 {
     if (auto titlebar = find_titlebar_window(window_info.window()))
     {
@@ -332,7 +467,7 @@
     }
 }
 
-void TitlebarProvider::repaint_titlebar_for(miral::WindowInfo const& window_info)
+void DecorationProvider::repaint_titlebar_for(miral::WindowInfo const& window_info)
 {
     if (auto data = find_titlebar_data(window_info.window()))
     {
@@ -346,23 +481,19 @@
     }
 }
 
-TitlebarProvider::Data::~Data()
+DecorationProvider::Data::~Data()
 {
     if (auto surface = titlebar.exchange(nullptr))
-#if MIR_CLIENT_VERSION <= MIR_VERSION_NUMBER(3, 4, 0)
-        mir_surface_release(surface, &null_surface_callback, nullptr);
-#else
-        mir_window_release(surface, &null_surface_callback, nullptr);
-#endif
+        mir_window_release(surface, &null_window_callback, nullptr);
 }
 
-void TitlebarProvider::insert(MirWindow* surface, Data* data)
+void DecorationProvider::insert(MirWindow* surface, Data* data)
 {
     data->on_create(surface);
     data->titlebar = surface;
 }
 
-TitlebarProvider::Data* TitlebarProvider::find_titlebar_data(miral::Window const& window)
+DecorationProvider::Data* DecorationProvider::find_titlebar_data(miral::Window const& window)
 {
     std::lock_guard<decltype(mutex)> lock{mutex};
 
@@ -371,7 +502,7 @@
     return (find != window_to_titlebar.end()) ? &find->second : nullptr;
 }
 
-miral::Window TitlebarProvider::find_titlebar_window(miral::Window const& window) const
+miral::Window DecorationProvider::find_titlebar_window(miral::Window const& window) const
 {
     std::lock_guard<decltype(mutex)> lock{mutex};
 
@@ -380,6 +511,16 @@
     return (find != window_to_titlebar.end()) ? find->second.window : miral::Window{};
 }
 
+bool DecorationProvider::is_decoration(miral::Window const& window) const
+{
+    return window.application() == session();
+}
+
+bool DecorationProvider::is_titlebar(miral::WindowInfo const& window_info) const
+{
+    return window_info.window().application() == session() && window_info.name() != wallpaper_name;
+}
+
 Worker::~Worker()
 {
     if (worker.joinable()) worker.join();
 
=== renamed file 'miral-shell/titlebar_provider.h' => 'miral-shell/decoration_provider.h'
--- miral-shell/titlebar_provider.h	2017-02-16 17:33:30 +0000
+++ miral-shell/decoration_provider.h	2017-02-16 17:33:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 Canonical Ltd.
+ * Copyright © 2016-2017 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,
@@ -16,8 +16,8 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#ifndef MIRAL_SHELL_TITLEBAR_PROVIDER_H
-#define MIRAL_SHELL_TITLEBAR_PROVIDER_H
+#ifndef MIRAL_SHELL_DECORATION_PROVIDER_H
+#define MIRAL_SHELL_DECORATION_PROVIDER_H
 
 
 #include <miral/window_manager_tools.h>
@@ -29,6 +29,8 @@
 #include <map>
 #include <mutex>
 #include <mir/client/connection.h>
+#include <mir/client/window.h>
+
 #include <thread>
 #include <condition_variable>
 #include <queue>
@@ -54,11 +56,11 @@
     void do_work();
 };
 
-class TitlebarProvider : Worker
+class DecorationProvider : Worker
 {
 public:
-    TitlebarProvider(miral::WindowManagerTools const& tools);
-    ~TitlebarProvider();
+    DecorationProvider(miral::WindowManagerTools const& tools);
+    ~DecorationProvider();
 
     void operator()(mir::client::Connection connection);
     void operator()(std::weak_ptr<mir::scene::Session> const& session);
@@ -66,7 +68,7 @@
     auto session() const -> std::shared_ptr<mir::scene::Session>;
 
     void create_titlebar_for(miral::Window const& window);
-    void place_new_titlebar(miral::WindowSpecification& window_spec);
+    void place_new_decoration(miral::WindowSpecification& window_spec);
     void paint_titlebar_for(miral::WindowInfo const& window, int intensity);
     void destroy_titlebar_for(miral::Window const& window);
     void resize_titlebar_for(miral::WindowInfo const& window_info, mir::geometry::Size const& size);
@@ -75,6 +77,9 @@
 
     void stop();
 
+    bool is_decoration(miral::Window const& window) const;
+    bool is_titlebar(miral::WindowInfo const& window_info) const;
+
 private:
     struct Data
     {
@@ -92,6 +97,7 @@
     miral::WindowManagerTools tools;
     std::mutex mutable mutex;
     mir::client::Connection connection;
+    std::vector<mir::client::Window> wallpaper;
     std::weak_ptr<mir::scene::Session> weak_session;
 
     SurfaceMap window_to_titlebar;
@@ -104,4 +110,4 @@
 };
 
 
-#endif //MIRAL_SHELL_TITLEBAR_PROVIDER_H
+#endif //MIRAL_SHELL_DECORATION_PROVIDER_H
 
=== modified file 'miral-shell/titlebar_window_manager.cpp'
--- miral-shell/titlebar_window_manager.cpp	2017-02-16 17:33:30 +0000
+++ miral-shell/titlebar_window_manager.cpp	2017-02-16 17:33:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 Canonical Ltd.
+ * Copyright © 2016-2017 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,
@@ -17,7 +17,7 @@
  */
 
 #include "titlebar_window_manager.h"
-#include "titlebar_provider.h"
+#include "decoration_provider.h"
 
 #include <miral/application_info.h>
 #include <miral/internal_client.h>
@@ -78,9 +78,9 @@
     miral::InternalClientLauncher const& launcher) :
     CanonicalWindowManagerPolicy(tools),
     spinner{spinner},
-    titlebar_provider{std::make_unique<TitlebarProvider>(tools)}
+    decoration_provider{std::make_unique<DecorationProvider>(tools)}
 {
-    launcher.launch("decorations", *titlebar_provider);
+    launcher.launch("decorations", *decoration_provider);
 
     for (auto key : {KEY_F1, KEY_F2, KEY_F3, KEY_F4})
         key_to_workspace[key] = this->tools.create_workspace();
@@ -142,9 +142,9 @@
         {
             if (auto const possible_titlebar = tools.window_at(old_cursor))
             {
-                if (possible_titlebar.application() == titlebar_provider->session())
+                auto const& info = tools.info_for(possible_titlebar);
+                if (decoration_provider->is_titlebar(info))
                 {
-                    auto const& info = tools.info_for(possible_titlebar);
                     if (tools.select_active_window(info.parent()) == info.parent())
                         tools.drag_active_window(cursor - old_cursor);
                     consumes_event = true;
@@ -309,19 +309,16 @@
 {
     CanonicalWindowManagerPolicy::advise_new_window(window_info);
 
-    auto const application = window_info.window().application();
     auto const parent = window_info.parent();
 
-    auto const is_titlebar = application == titlebar_provider->session();
-
-    if (is_titlebar)
+    if (decoration_provider->is_titlebar(window_info))
     {
-        titlebar_provider->advise_new_titlebar(window_info);
+        decoration_provider->advise_new_titlebar(window_info);
 
         if (tools.active_window() == parent)
-            titlebar_provider->paint_titlebar_for(tools.info_for(parent), 0xFF);
+            decoration_provider->paint_titlebar_for(tools.info_for(parent), 0xFF);
         else
-            titlebar_provider->paint_titlebar_for(tools.info_for(parent), 0x3F);
+            decoration_provider->paint_titlebar_for(tools.info_for(parent), 0x3F);
     }
 
     if (!parent)
@@ -340,7 +337,7 @@
 void TitlebarWindowManagerPolicy::handle_window_ready(WindowInfo& window_info)
 {
     if (window_info.window().application() != spinner.session() && window_info.needs_titlebar(window_info.type()))
-        titlebar_provider->create_titlebar_for(window_info.window());
+        decoration_provider->create_titlebar_for(window_info.window());
 
     CanonicalWindowManagerPolicy::handle_window_ready(window_info);
 }
@@ -349,14 +346,14 @@
 {
     CanonicalWindowManagerPolicy::advise_focus_lost(info);
 
-    titlebar_provider->paint_titlebar_for(info, 0x3F);
+    decoration_provider->paint_titlebar_for(info, 0x3F);
 }
 
 void TitlebarWindowManagerPolicy::advise_focus_gained(WindowInfo const& info)
 {
     CanonicalWindowManagerPolicy::advise_focus_gained(info);
 
-    titlebar_provider->paint_titlebar_for(info, 0xFF);
+    decoration_provider->paint_titlebar_for(info, 0xFF);
 
     // Frig to force the spinner to the top
     if (auto const spinner_session = spinner.session())
@@ -372,21 +369,21 @@
 {
     CanonicalWindowManagerPolicy::advise_state_change(window_info, state);
 
-    titlebar_provider->advise_state_change(window_info, state);
+    decoration_provider->advise_state_change(window_info, state);
 }
 
 void TitlebarWindowManagerPolicy::advise_resize(WindowInfo const& window_info, Size const& new_size)
 {
     CanonicalWindowManagerPolicy::advise_resize(window_info, new_size);
 
-    titlebar_provider->resize_titlebar_for(window_info, new_size);
+    decoration_provider->resize_titlebar_for(window_info, new_size);
 }
 
 void TitlebarWindowManagerPolicy::advise_delete_window(WindowInfo const& window_info)
 {
     CanonicalWindowManagerPolicy::advise_delete_window(window_info);
 
-    titlebar_provider->destroy_titlebar_for(window_info.window());
+    decoration_provider->destroy_titlebar_for(window_info.window());
 }
 
 bool TitlebarWindowManagerPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
@@ -535,7 +532,7 @@
     if (action == mir_keyboard_action_down && scan_code == KEY_BACKSPACE &&
         (modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_ctrl)))
     {
-        titlebar_provider->stop();
+        decoration_provider->stop();
     }
 
     return false;
@@ -654,8 +651,8 @@
     if (parameters.state().value() != mir_window_state_fullscreen && needs_titlebar)
         parameters.top_left() = Point{parameters.top_left().value().x, parameters.top_left().value().y + DeltaY{title_bar_height}};
 
-    if (app_info.application() == titlebar_provider->session())
-        titlebar_provider->place_new_titlebar(parameters);
+    if (app_info.application() == decoration_provider->session())
+        decoration_provider->place_new_decoration(parameters);
 
     parameters.userdata() = std::make_shared<PolicyData>();
     return parameters;
@@ -697,8 +694,8 @@
 
     tools.for_each_window_in_workspace(active_workspace, [&](Window const& window)
         {
-            if (window.application() == titlebar_provider->session())
-                return; // titlebars are taken care of automatically
+            if (decoration_provider->is_decoration(window))
+                return; // decorations are taken care of automatically
 
             auto const& window_info = tools.info_for(window);
             auto& pdata = policy_data_for(window_info);
@@ -709,8 +706,8 @@
 
     tools.for_each_window_in_workspace(old_active, [&](Window const& window)
         {
-            if (window.application() == titlebar_provider->session())
-                return; // titlebars are taken care of automatically
+            if (decoration_provider->is_decoration(window))
+                return; // decorations are taken care of automatically
 
             auto const& window_info = tools.info_for(window);
             auto& pdata = policy_data_for(window_info);
 
=== modified file 'miral-shell/titlebar_window_manager.h'
--- miral-shell/titlebar_window_manager.h	2017-02-16 17:33:30 +0000
+++ miral-shell/titlebar_window_manager.h	2017-02-16 17:33:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 Canonical Ltd.
+ * Copyright © 2016-2017 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,
@@ -31,7 +31,7 @@
 
 using namespace mir::geometry;
 
-class TitlebarProvider;
+class DecorationProvider;
 
 class TitlebarWindowManagerPolicy : public miral::CanonicalWindowManagerPolicy, miral::WorkspacePolicy
 {
@@ -98,7 +98,7 @@
 
     SpinnerSplash const spinner;
 
-    std::unique_ptr<TitlebarProvider> const titlebar_provider;
+    std::unique_ptr<DecorationProvider> const decoration_provider;
 
     void end_resize();
 
 
=== modified file 'miral/CMakeLists.txt'
--- miral/CMakeLists.txt	2017-02-16 17:33:30 +0000
+++ miral/CMakeLists.txt	2017-02-16 17:33:30 +0000
@@ -55,6 +55,7 @@
                                         ${CMAKE_SOURCE_DIR}/include/mir/client/window_spec.h
                                         ${CMAKE_SOURCE_DIR}/include/mir/client/window_id.h
                                         ${CMAKE_SOURCE_DIR}/include/mir/client/connection.h
+                                        ${CMAKE_SOURCE_DIR}/include/mir/client/display_config.h
                                         ${CMAKE_SOURCE_DIR}/include/mir/client/window.h
                                         ${CMAKE_SOURCE_DIR}/include/mir/client/detail/mir_forward_compatibility.h
 )