Demonstrate using the window decoration strategy (#3459)

canonical · Jul 8, 2024 · 96738e0 · 96738e0
2 parents c751ed7 + 965736d
commit 96738e0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/examples/miral-shell/shell_main.cpp b/examples/miral-shell/shell_main.cpp
@@ -27,13 +27,38 @@
 #include <miral/internal_client.h>
 #include <miral/command_line_option.h>
 #include <miral/cursor_theme.h>
+#include <miral/decorations.h>
 #include <miral/keymap.h>
 #include <miral/toolkit_event.h>
 #include <miral/x11_support.h>
 #include <miral/wayland_extensions.h>
 
 #include <xkbcommon/xkbcommon-keysyms.h>
 
+#include <cstring>
+
+namespace
+{
+struct ConfigureDecorations
+{
+    miral::Decorations const decorations{[]
+        {
+            if (auto const strategy = getenv("MIRAL_SHELL_DECORATIONS"))
+            {
+                if (strcmp(strategy, "always-ssd") == 0) return miral::Decorations::always_ssd();
+                if (strcmp(strategy, "prefer-ssd") == 0) return miral::Decorations::prefer_ssd();
+                if (strcmp(strategy, "always-csd") == 0) return miral::Decorations::always_csd();
+            }
+            return miral::Decorations::prefer_csd();
+        }()};
+
+    void operator()(mir::Server& s) const
+    {
+        decorations(s);
+    }
+};
+}
+
 int main(int argc, char const* argv[])
 {
     using namespace miral;
@@ -113,6 +138,7 @@ int main(int argc, char const* argv[])
             CursorTheme{"default:DMZ-White"},
             WaylandExtensions{},
             X11Support{},
+            ConfigureDecorations{},
             window_managers,
             display_configuration_options,
             external_client_launcher,

diff --git a/src/server/frontend_wayland/wayland_default_configuration.cpp b/src/server/frontend_wayland/wayland_default_configuration.cpp
@@ -319,7 +319,8 @@ auto mf::get_standard_extensions() -> std::vector<std::string>
         mw::TextInputManagerV1::interface_name,
         mw::TextInputManagerV2::interface_name,
         mw::TextInputManagerV3::interface_name,
-        mw::MirShellV1::interface_name};
+        mw::MirShellV1::interface_name,
+        mw::XdgDecorationManagerV1::interface_name};
 }
 
 auto mf::get_supported_extensions() -> std::vector<std::string>