From dedcbaf6772150b0b3d95c7b96ed0820311f2d39 Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Tue, 1 Mar 2022 10:29:47 +0100 Subject: [PATCH 01/14] Change window title from initialized to parameter --- src/platforms/x11/graphics/display.cpp | 11 +++++++---- src/platforms/x11/graphics/display.h | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/platforms/x11/graphics/display.cpp b/src/platforms/x11/graphics/display.cpp index 14692b1cc0..35cadcf755 100644 --- a/src/platforms/x11/graphics/display.cpp +++ b/src/platforms/x11/graphics/display.cpp @@ -81,7 +81,8 @@ class XGLContext : public mir::renderer::gl::Context mgx::X11Window::X11Window(mx::X11Resources* x11_resources, EGLDisplay egl_dpy, geom::Size const size, - EGLConfig const egl_cfg) + EGLConfig const egl_cfg, + std::string title) : x11_resources{x11_resources} { auto const conn = x11_resources->conn.get(); @@ -111,8 +112,9 @@ mgx::X11Window::X11Window(mx::X11Resources* x11_resources, // Enable the WM_DELETE_WINDOW protocol for the window (causes a client message to be sent when window is closed) conn->change_property(win, x11_resources->WM_PROTOCOLS, XCB_ATOM_ATOM, 32, 1, &x11_resources->WM_DELETE_WINDOW); - // Set the window title - std::string title{"Mir on X"}; + // Set the window title if null + if (title.empty()) + title = "Mir on X"; // Include hostname in title when X-forwarding if (getenv("SSH_CONNECTION")) @@ -166,7 +168,8 @@ mgx::Display::Display(std::shared_ptr const& x11_resources x11_resources.get(), shared_egl.display(), actual_size, - shared_egl.config()); + shared_egl.config(), + "Mir On X"); auto red_mask = window->red_mask(); auto pf = (red_mask == 0xFF0000 ? mir_pixel_format_argb_8888 : diff --git a/src/platforms/x11/graphics/display.h b/src/platforms/x11/graphics/display.h index e960d590e0..ddafb0d127 100644 --- a/src/platforms/x11/graphics/display.h +++ b/src/platforms/x11/graphics/display.h @@ -55,7 +55,8 @@ class X11Window X11Window(mir::X::X11Resources* x11_resources, EGLDisplay egl_dpy, geometry::Size const size, - EGLConfig const egl_cfg); + EGLConfig const egl_cfg, + std::string title); ~X11Window(); operator xcb_window_t() const; From 97cc1a6b079d8347b988cf021ff91d1806356f8e Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Tue, 1 Mar 2022 18:54:02 +0100 Subject: [PATCH 02/14] Allow for empty title --- src/platforms/x11/graphics/display.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/platforms/x11/graphics/display.cpp b/src/platforms/x11/graphics/display.cpp index 35cadcf755..44756223cc 100644 --- a/src/platforms/x11/graphics/display.cpp +++ b/src/platforms/x11/graphics/display.cpp @@ -112,10 +112,6 @@ mgx::X11Window::X11Window(mx::X11Resources* x11_resources, // Enable the WM_DELETE_WINDOW protocol for the window (causes a client message to be sent when window is closed) conn->change_property(win, x11_resources->WM_PROTOCOLS, XCB_ATOM_ATOM, 32, 1, &x11_resources->WM_DELETE_WINDOW); - // Set the window title if null - if (title.empty()) - title = "Mir on X"; - // Include hostname in title when X-forwarding if (getenv("SSH_CONNECTION")) { From 9979c93ac87c49d2399f37ba77c35b97adb5a7e9 Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Wed, 2 Mar 2022 12:31:28 +0100 Subject: [PATCH 03/14] Change title to string* --- src/platforms/x11/graphics/display.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/platforms/x11/graphics/display.h b/src/platforms/x11/graphics/display.h index ddafb0d127..aeb9b4da08 100644 --- a/src/platforms/x11/graphics/display.h +++ b/src/platforms/x11/graphics/display.h @@ -53,10 +53,10 @@ class X11Window { public: X11Window(mir::X::X11Resources* x11_resources, + std::string* title, EGLDisplay egl_dpy, geometry::Size const size, - EGLConfig const egl_cfg, - std::string title); + EGLConfig const egl_cfg); ~X11Window(); operator xcb_window_t() const; @@ -64,6 +64,7 @@ class X11Window private: mir::X::X11Resources* const x11_resources; + std::string* const title; xcb_window_t win; unsigned long r_mask; }; From 98e9212093dab4db62c20a683aa9ef79133098a9 Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Wed, 2 Mar 2022 12:33:05 +0100 Subject: [PATCH 04/14] Add title to Display --- src/platforms/x11/graphics/display.cpp | 5 +++-- src/platforms/x11/graphics/display.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/platforms/x11/graphics/display.cpp b/src/platforms/x11/graphics/display.cpp index 44756223cc..5c45613b30 100644 --- a/src/platforms/x11/graphics/display.cpp +++ b/src/platforms/x11/graphics/display.cpp @@ -144,6 +144,7 @@ unsigned long mgx::X11Window::red_mask() const } mgx::Display::Display(std::shared_ptr const& x11_resources, + std::shared_ptr const& title, std::vector const& requested_sizes, std::shared_ptr const& initial_conf_policy, std::shared_ptr const& gl_config, @@ -162,10 +163,10 @@ mgx::Display::Display(std::shared_ptr const& x11_resources auto actual_size = requested_size.size; auto window = std::make_unique( x11_resources.get(), + title.get(), shared_egl.display(), actual_size, - shared_egl.config(), - "Mir On X"); + shared_egl.config()); auto red_mask = window->red_mask(); auto pf = (red_mask == 0xFF0000 ? mir_pixel_format_argb_8888 : diff --git a/src/platforms/x11/graphics/display.h b/src/platforms/x11/graphics/display.h index aeb9b4da08..15f548752c 100644 --- a/src/platforms/x11/graphics/display.h +++ b/src/platforms/x11/graphics/display.h @@ -73,6 +73,7 @@ class Display : public graphics::Display { public: explicit Display(std::shared_ptr const& x11_resources, + std::shared_ptr const& title, std::vector const& requested_size, std::shared_ptr const& initial_conf_policy, std::shared_ptr const& gl_config, From 750c8849e17a967c42c4ade4903d79996c423642 Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Wed, 2 Mar 2022 12:33:25 +0100 Subject: [PATCH 05/14] Add title to X11Window --- src/platforms/x11/graphics/display.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/platforms/x11/graphics/display.cpp b/src/platforms/x11/graphics/display.cpp index 5c45613b30..966360d0c4 100644 --- a/src/platforms/x11/graphics/display.cpp +++ b/src/platforms/x11/graphics/display.cpp @@ -79,11 +79,12 @@ class XGLContext : public mir::renderer::gl::Context } mgx::X11Window::X11Window(mx::X11Resources* x11_resources, + std::string* title, EGLDisplay egl_dpy, geom::Size const size, - EGLConfig const egl_cfg, - std::string title) - : x11_resources{x11_resources} + EGLConfig const egl_cfg) + : x11_resources{x11_resources}, + title{title} { auto const conn = x11_resources->conn.get(); @@ -118,12 +119,12 @@ mgx::X11Window::X11Window(mx::X11Resources* x11_resources, char buffer[128] = { '\0' }; if (gethostname(buffer, sizeof buffer - 1) == 0) { - title += " - "; - title += buffer; + *title += " - "; + *title += buffer; } } - conn->change_property(win, x11_resources->_NET_WM_NAME, x11_resources->UTF8_STRING, 8, title.size(), title.c_str()); + conn->change_property(win, x11_resources->_NET_WM_NAME, x11_resources->UTF8_STRING, 8, title->size(), title->c_str()); conn->map_window(win); } From d43a95bd121a5a20373dc955806b9b5776221f2e Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Wed, 2 Mar 2022 12:34:00 +0100 Subject: [PATCH 06/14] Add title to platform --- src/platforms/x11/graphics/platform.cpp | 4 +++- src/platforms/x11/graphics/platform.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/platforms/x11/graphics/platform.cpp b/src/platforms/x11/graphics/platform.cpp index ee228cac78..a2c2b1ff00 100644 --- a/src/platforms/x11/graphics/platform.cpp +++ b/src/platforms/x11/graphics/platform.cpp @@ -108,9 +108,11 @@ auto mgx::Platform::parse_output_sizes(std::string output_sizes) -> std::vector< } mgx::Platform::Platform(std::shared_ptr const& x11_resources, + std::shared_ptr const& title, std::vector output_sizes, std::shared_ptr const& report) : x11_resources{x11_resources}, + title{title}, report{report}, output_sizes{move(output_sizes)} { @@ -128,5 +130,5 @@ mir::UniqueModulePtr mgx::Platform::create_display( std::shared_ptr const& initial_conf_policy, std::shared_ptr const& gl_config) { - return make_module_ptr(x11_resources, output_sizes, initial_conf_policy, gl_config, report); + return make_module_ptr(x11_resources, title, output_sizes, initial_conf_policy, gl_config, report); } diff --git a/src/platforms/x11/graphics/platform.h b/src/platforms/x11/graphics/platform.h index 63c94038cc..8eadec30b3 100644 --- a/src/platforms/x11/graphics/platform.h +++ b/src/platforms/x11/graphics/platform.h @@ -61,6 +61,7 @@ class Platform : public graphics::DisplayPlatform static auto parse_output_sizes(std::string output_sizes) -> std::vector; explicit Platform(std::shared_ptr const& x11_resources, + std::shared_ptr const& title, std::vector output_sizes, std::shared_ptr const& report); ~Platform() = default; @@ -71,6 +72,7 @@ class Platform : public graphics::DisplayPlatform std::shared_ptr const& gl_config) override; private: std::shared_ptr const x11_resources; + std::shared_ptr const title; std::shared_ptr const report; std::vector const output_sizes; }; From 8e73e4eb1c2a7feb39ffe17563a7c74a802b9305 Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Wed, 2 Mar 2022 12:34:43 +0100 Subject: [PATCH 07/14] Create x11 window title option --- src/platforms/x11/graphics/graphics.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/platforms/x11/graphics/graphics.cpp b/src/platforms/x11/graphics/graphics.cpp index 09719b05a6..ecf493bb9d 100644 --- a/src/platforms/x11/graphics/graphics.cpp +++ b/src/platforms/x11/graphics/graphics.cpp @@ -38,6 +38,7 @@ namespace geom = mir::geometry; namespace { char const* x11_displays_option_name{"x11-output"}; +char const* x11_window_title_option_name{"x11-window-title"}; } mir::UniqueModulePtr create_display_platform( @@ -57,9 +58,11 @@ mir::UniqueModulePtr create_display_platform( } auto output_sizes = mgx::Platform::parse_output_sizes(options->get(x11_displays_option_name)); + auto const title = options->get(x11_window_title_option_name); return mir::make_module_ptr( std::move(x11_resources), + std::move(std::make_shared(title)), move(output_sizes), report ); @@ -82,6 +85,12 @@ void add_graphics_platform_options(boost::program_options::options_description& boost::program_options::value()->default_value("1280x1024"), "[mir-on-X specific] Colon separated list of WIDTHxHEIGHT sizes for \"output\" windows." " ^SCALE may also be appended to any output"); + + mir::assert_entry_point_signature(&add_graphics_platform_options); + config.add_options() + (x11_window_title_option_name, + boost::program_options::value()->default_value("Mir on X"), + "[mir-on-X specific] Title for the banner of the generated X11 window"); } mg::PlatformPriority probe_graphics_platform() From 774fe5afd8ea44278cf3ae3de61e8c456158dbbc Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Wed, 2 Mar 2022 12:35:18 +0100 Subject: [PATCH 08/14] Add title to unit tests --- tests/unit-tests/platforms/x11/test_display.cpp | 1 + tests/unit-tests/platforms/x11/test_display_generic.cpp | 1 + tests/unit-tests/platforms/x11/test_platform.cpp | 2 ++ 3 files changed, 4 insertions(+) diff --git a/tests/unit-tests/platforms/x11/test_display.cpp b/tests/unit-tests/platforms/x11/test_display.cpp index e73abab5ae..6680c63f48 100644 --- a/tests/unit-tests/platforms/x11/test_display.cpp +++ b/tests/unit-tests/platforms/x11/test_display.cpp @@ -103,6 +103,7 @@ class X11DisplayTest : public ::testing::Test { return std::make_shared( mt::fake_shared(x11_resources), + std::make_shared("Mir on X"), sizes, mt::fake_shared(null_display_configuration_policy), mt::fake_shared(mock_gl_config), diff --git a/tests/unit-tests/platforms/x11/test_display_generic.cpp b/tests/unit-tests/platforms/x11/test_display_generic.cpp index 446c9b495c..46aac70554 100644 --- a/tests/unit-tests/platforms/x11/test_display_generic.cpp +++ b/tests/unit-tests/platforms/x11/test_display_generic.cpp @@ -91,6 +91,7 @@ class DisplayTestGeneric : public ::testing::Test { auto const platform = std::make_shared( std::make_shared(), + std::make_shared("Mir on X"), std::vector{{{1280, 1024}}}, std::make_shared()); return platform->create_display( diff --git a/tests/unit-tests/platforms/x11/test_platform.cpp b/tests/unit-tests/platforms/x11/test_platform.cpp index b2548751e8..7fec000933 100644 --- a/tests/unit-tests/platforms/x11/test_platform.cpp +++ b/tests/unit-tests/platforms/x11/test_platform.cpp @@ -69,6 +69,7 @@ class X11GraphicsPlatformTest : public ::testing::Test { return std::make_shared( std::make_shared(), + std::make_shared("Mir on X"), std::vector{{{1280, 1024}}}, std::make_shared()); } @@ -88,6 +89,7 @@ TEST_F(X11GraphicsPlatformTest, failure_to_open_x11_display_results_in_an_error) { std::make_shared( nullptr, + std::make_shared("Mir on X"), std::vector{{{1280, 1024}}}, std::make_shared()); }, std::exception); From b79ff68f455fca7fc0af088b7a0fd0833bf6b212 Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Wed, 2 Mar 2022 14:07:17 +0100 Subject: [PATCH 09/14] Change title to pass-by-value --- src/platforms/x11/graphics/display.cpp | 12 ++++++------ src/platforms/x11/graphics/display.h | 6 +++--- src/platforms/x11/graphics/graphics.cpp | 2 +- src/platforms/x11/graphics/platform.cpp | 2 +- src/platforms/x11/graphics/platform.h | 4 ++-- tests/unit-tests/platforms/x11/test_display.cpp | 2 +- .../platforms/x11/test_display_generic.cpp | 2 +- tests/unit-tests/platforms/x11/test_platform.cpp | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/platforms/x11/graphics/display.cpp b/src/platforms/x11/graphics/display.cpp index 966360d0c4..c1bfa593c0 100644 --- a/src/platforms/x11/graphics/display.cpp +++ b/src/platforms/x11/graphics/display.cpp @@ -79,7 +79,7 @@ class XGLContext : public mir::renderer::gl::Context } mgx::X11Window::X11Window(mx::X11Resources* x11_resources, - std::string* title, + std::string title, EGLDisplay egl_dpy, geom::Size const size, EGLConfig const egl_cfg) @@ -119,12 +119,12 @@ mgx::X11Window::X11Window(mx::X11Resources* x11_resources, char buffer[128] = { '\0' }; if (gethostname(buffer, sizeof buffer - 1) == 0) { - *title += " - "; - *title += buffer; + title += " - "; + title += buffer; } } - conn->change_property(win, x11_resources->_NET_WM_NAME, x11_resources->UTF8_STRING, 8, title->size(), title->c_str()); + conn->change_property(win, x11_resources->_NET_WM_NAME, x11_resources->UTF8_STRING, 8, title.size(), title.c_str()); conn->map_window(win); } @@ -145,7 +145,7 @@ unsigned long mgx::X11Window::red_mask() const } mgx::Display::Display(std::shared_ptr const& x11_resources, - std::shared_ptr const& title, + std::string const title, std::vector const& requested_sizes, std::shared_ptr const& initial_conf_policy, std::shared_ptr const& gl_config, @@ -164,7 +164,7 @@ mgx::Display::Display(std::shared_ptr const& x11_resources auto actual_size = requested_size.size; auto window = std::make_unique( x11_resources.get(), - title.get(), + title, shared_egl.display(), actual_size, shared_egl.config()); diff --git a/src/platforms/x11/graphics/display.h b/src/platforms/x11/graphics/display.h index 15f548752c..a63a3ef99f 100644 --- a/src/platforms/x11/graphics/display.h +++ b/src/platforms/x11/graphics/display.h @@ -53,7 +53,7 @@ class X11Window { public: X11Window(mir::X::X11Resources* x11_resources, - std::string* title, + std::string title, EGLDisplay egl_dpy, geometry::Size const size, EGLConfig const egl_cfg); @@ -64,7 +64,7 @@ class X11Window private: mir::X::X11Resources* const x11_resources; - std::string* const title; + std::string const title; xcb_window_t win; unsigned long r_mask; }; @@ -73,7 +73,7 @@ class Display : public graphics::Display { public: explicit Display(std::shared_ptr const& x11_resources, - std::shared_ptr const& title, + std::string const title, std::vector const& requested_size, std::shared_ptr const& initial_conf_policy, std::shared_ptr const& gl_config, diff --git a/src/platforms/x11/graphics/graphics.cpp b/src/platforms/x11/graphics/graphics.cpp index ecf493bb9d..40e0b6ed1b 100644 --- a/src/platforms/x11/graphics/graphics.cpp +++ b/src/platforms/x11/graphics/graphics.cpp @@ -62,7 +62,7 @@ mir::UniqueModulePtr create_display_platform( return mir::make_module_ptr( std::move(x11_resources), - std::move(std::make_shared(title)), + std::move(title), move(output_sizes), report ); diff --git a/src/platforms/x11/graphics/platform.cpp b/src/platforms/x11/graphics/platform.cpp index a2c2b1ff00..d23e6c15f6 100644 --- a/src/platforms/x11/graphics/platform.cpp +++ b/src/platforms/x11/graphics/platform.cpp @@ -108,7 +108,7 @@ auto mgx::Platform::parse_output_sizes(std::string output_sizes) -> std::vector< } mgx::Platform::Platform(std::shared_ptr const& x11_resources, - std::shared_ptr const& title, + std::string const title, std::vector output_sizes, std::shared_ptr const& report) : x11_resources{x11_resources}, diff --git a/src/platforms/x11/graphics/platform.h b/src/platforms/x11/graphics/platform.h index 8eadec30b3..18e3b0510e 100644 --- a/src/platforms/x11/graphics/platform.h +++ b/src/platforms/x11/graphics/platform.h @@ -61,7 +61,7 @@ class Platform : public graphics::DisplayPlatform static auto parse_output_sizes(std::string output_sizes) -> std::vector; explicit Platform(std::shared_ptr const& x11_resources, - std::shared_ptr const& title, + std::string const title, std::vector output_sizes, std::shared_ptr const& report); ~Platform() = default; @@ -72,7 +72,7 @@ class Platform : public graphics::DisplayPlatform std::shared_ptr const& gl_config) override; private: std::shared_ptr const x11_resources; - std::shared_ptr const title; + std::string const title; std::shared_ptr const report; std::vector const output_sizes; }; diff --git a/tests/unit-tests/platforms/x11/test_display.cpp b/tests/unit-tests/platforms/x11/test_display.cpp index 6680c63f48..d27304d6ad 100644 --- a/tests/unit-tests/platforms/x11/test_display.cpp +++ b/tests/unit-tests/platforms/x11/test_display.cpp @@ -103,7 +103,7 @@ class X11DisplayTest : public ::testing::Test { return std::make_shared( mt::fake_shared(x11_resources), - std::make_shared("Mir on X"), + std::string("Mir on X"), sizes, mt::fake_shared(null_display_configuration_policy), mt::fake_shared(mock_gl_config), diff --git a/tests/unit-tests/platforms/x11/test_display_generic.cpp b/tests/unit-tests/platforms/x11/test_display_generic.cpp index 46aac70554..5b93ca878d 100644 --- a/tests/unit-tests/platforms/x11/test_display_generic.cpp +++ b/tests/unit-tests/platforms/x11/test_display_generic.cpp @@ -91,7 +91,7 @@ class DisplayTestGeneric : public ::testing::Test { auto const platform = std::make_shared( std::make_shared(), - std::make_shared("Mir on X"), + std::string("Mir on X"), std::vector{{{1280, 1024}}}, std::make_shared()); return platform->create_display( diff --git a/tests/unit-tests/platforms/x11/test_platform.cpp b/tests/unit-tests/platforms/x11/test_platform.cpp index 7fec000933..1c2b4aa551 100644 --- a/tests/unit-tests/platforms/x11/test_platform.cpp +++ b/tests/unit-tests/platforms/x11/test_platform.cpp @@ -69,7 +69,7 @@ class X11GraphicsPlatformTest : public ::testing::Test { return std::make_shared( std::make_shared(), - std::make_shared("Mir on X"), + std::string("Mir on X"), std::vector{{{1280, 1024}}}, std::make_shared()); } @@ -89,7 +89,7 @@ TEST_F(X11GraphicsPlatformTest, failure_to_open_x11_display_results_in_an_error) { std::make_shared( nullptr, - std::make_shared("Mir on X"), + std::string("Mir on X"), std::vector{{{1280, 1024}}}, std::make_shared()); }, std::exception); From e14229778d7934633e0ba6998deb6e54d2dd343f Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Wed, 2 Mar 2022 14:07:39 +0100 Subject: [PATCH 10/14] Remove duplicite assert_entry_point_signature --- src/platforms/x11/graphics/graphics.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/platforms/x11/graphics/graphics.cpp b/src/platforms/x11/graphics/graphics.cpp index 40e0b6ed1b..1f1692657b 100644 --- a/src/platforms/x11/graphics/graphics.cpp +++ b/src/platforms/x11/graphics/graphics.cpp @@ -86,7 +86,6 @@ void add_graphics_platform_options(boost::program_options::options_description& "[mir-on-X specific] Colon separated list of WIDTHxHEIGHT sizes for \"output\" windows." " ^SCALE may also be appended to any output"); - mir::assert_entry_point_signature(&add_graphics_platform_options); config.add_options() (x11_window_title_option_name, boost::program_options::value()->default_value("Mir on X"), From 20313a497429a3f8a30d9912f9ad02327986b09f Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Wed, 2 Mar 2022 16:03:15 +0100 Subject: [PATCH 11/14] Remove unnecessary formatting --- src/platforms/x11/graphics/display.cpp | 3 +-- tests/unit-tests/platforms/x11/test_display_generic.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/platforms/x11/graphics/display.cpp b/src/platforms/x11/graphics/display.cpp index c1bfa593c0..9cb819787f 100644 --- a/src/platforms/x11/graphics/display.cpp +++ b/src/platforms/x11/graphics/display.cpp @@ -83,8 +83,7 @@ mgx::X11Window::X11Window(mx::X11Resources* x11_resources, EGLDisplay egl_dpy, geom::Size const size, EGLConfig const egl_cfg) - : x11_resources{x11_resources}, - title{title} + : x11_resources{x11_resources} { auto const conn = x11_resources->conn.get(); diff --git a/tests/unit-tests/platforms/x11/test_display_generic.cpp b/tests/unit-tests/platforms/x11/test_display_generic.cpp index 5b93ca878d..76452b6faa 100644 --- a/tests/unit-tests/platforms/x11/test_display_generic.cpp +++ b/tests/unit-tests/platforms/x11/test_display_generic.cpp @@ -91,7 +91,7 @@ class DisplayTestGeneric : public ::testing::Test { auto const platform = std::make_shared( std::make_shared(), - std::string("Mir on X"), + "Mir on X", std::vector{{{1280, 1024}}}, std::make_shared()); return platform->create_display( From a699b1348819f24bc25e3f109ddcd1f90854c6b1 Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Wed, 2 Mar 2022 16:03:41 +0100 Subject: [PATCH 12/14] Move instead of copy paramater --- src/platforms/x11/graphics/platform.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platforms/x11/graphics/platform.cpp b/src/platforms/x11/graphics/platform.cpp index d23e6c15f6..735e974d41 100644 --- a/src/platforms/x11/graphics/platform.cpp +++ b/src/platforms/x11/graphics/platform.cpp @@ -108,11 +108,11 @@ auto mgx::Platform::parse_output_sizes(std::string output_sizes) -> std::vector< } mgx::Platform::Platform(std::shared_ptr const& x11_resources, - std::string const title, + std::string title, std::vector output_sizes, std::shared_ptr const& report) : x11_resources{x11_resources}, - title{title}, + title{std::move(title)}, report{report}, output_sizes{move(output_sizes)} { From 1b5d3f376d17a847eba7c5650f4f2077bbd3fb76 Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Thu, 3 Mar 2022 09:11:02 +0100 Subject: [PATCH 13/14] Remove unnecessary formatting from tests --- tests/unit-tests/platforms/x11/test_display.cpp | 2 +- tests/unit-tests/platforms/x11/test_platform.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit-tests/platforms/x11/test_display.cpp b/tests/unit-tests/platforms/x11/test_display.cpp index d27304d6ad..e914224b31 100644 --- a/tests/unit-tests/platforms/x11/test_display.cpp +++ b/tests/unit-tests/platforms/x11/test_display.cpp @@ -103,7 +103,7 @@ class X11DisplayTest : public ::testing::Test { return std::make_shared( mt::fake_shared(x11_resources), - std::string("Mir on X"), + "Mir on X", sizes, mt::fake_shared(null_display_configuration_policy), mt::fake_shared(mock_gl_config), diff --git a/tests/unit-tests/platforms/x11/test_platform.cpp b/tests/unit-tests/platforms/x11/test_platform.cpp index 1c2b4aa551..8c9bf37ff7 100644 --- a/tests/unit-tests/platforms/x11/test_platform.cpp +++ b/tests/unit-tests/platforms/x11/test_platform.cpp @@ -69,7 +69,7 @@ class X11GraphicsPlatformTest : public ::testing::Test { return std::make_shared( std::make_shared(), - std::string("Mir on X"), + "Mir on X", std::vector{{{1280, 1024}}}, std::make_shared()); } @@ -89,7 +89,7 @@ TEST_F(X11GraphicsPlatformTest, failure_to_open_x11_display_results_in_an_error) { std::make_shared( nullptr, - std::string("Mir on X"), + "Mir on X", std::vector{{{1280, 1024}}}, std::make_shared()); }, std::exception); From 453cb00247ef24b101ab52229807628a33607931 Mon Sep 17 00:00:00 2001 From: Grayson Guarino Date: Thu, 3 Mar 2022 09:11:23 +0100 Subject: [PATCH 14/14] Remove unused member --- src/platforms/x11/graphics/display.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/platforms/x11/graphics/display.h b/src/platforms/x11/graphics/display.h index a63a3ef99f..13c8c22223 100644 --- a/src/platforms/x11/graphics/display.h +++ b/src/platforms/x11/graphics/display.h @@ -64,7 +64,6 @@ class X11Window private: mir::X::X11Resources* const x11_resources; - std::string const title; xcb_window_t win; unsigned long r_mask; };