diff --git a/Userland/Applets/Keymap/KeymapStatusWindow.cpp b/Userland/Applets/Keymap/KeymapStatusWindow.cpp index 850198682b..873a4ad468 100644 --- a/Userland/Applets/Keymap/KeymapStatusWindow.cpp +++ b/Userland/Applets/Keymap/KeymapStatusWindow.cpp @@ -6,7 +6,7 @@ */ #include "KeymapStatusWindow.h" -#include +#include #include #include #include diff --git a/Userland/Applets/Keymap/main.cpp b/Userland/Applets/Keymap/main.cpp index e22f27abc9..616e76f1ef 100644 --- a/Userland/Applets/Keymap/main.cpp +++ b/Userland/Applets/Keymap/main.cpp @@ -7,7 +7,7 @@ #include "KeymapStatusWindow.h" #include #include -#include +#include #include #include diff --git a/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp b/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp index 56b9e391e3..5577169b1f 100644 --- a/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp +++ b/Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp @@ -6,7 +6,7 @@ */ #include "DesktopStatusWindow.h" -#include +#include #include #include #include @@ -63,7 +63,7 @@ public: // Handle case where divider is clicked. if (rect_for_desktop(row, col).contains(event.position())) - GUI::ConnectionToWindowMangerServer::the().async_set_workspace(row, col); + GUI::ConnectionToWindowManagerServer::the().async_set_workspace(row, col); } virtual void mousewheel_event(GUI::MouseEvent& event) override @@ -82,7 +82,7 @@ public: else row = abs((int)row + direction) % vrows; - GUI::ConnectionToWindowMangerServer::the().async_set_workspace(row, col); + GUI::ConnectionToWindowManagerServer::the().async_set_workspace(row, col); } unsigned current_row() const { return m_current_row; } diff --git a/Userland/Applets/WorkspacePicker/main.cpp b/Userland/Applets/WorkspacePicker/main.cpp index 457d89b699..74454600c3 100644 --- a/Userland/Applets/WorkspacePicker/main.cpp +++ b/Userland/Applets/WorkspacePicker/main.cpp @@ -7,7 +7,7 @@ #include "DesktopStatusWindow.h" #include #include -#include +#include #include #include #include @@ -19,7 +19,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto app = TRY(GUI::Application::try_create(arguments)); // We need to obtain the WM connection here as well before the pledge shortening. - GUI::ConnectionToWindowMangerServer::the(); + GUI::ConnectionToWindowManagerServer::the(); TRY(Core::System::pledge("stdio recvfd sendfd rpath")); diff --git a/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.h b/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.h index 08ef8fd11d..1c22386c64 100644 --- a/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.h +++ b/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibGUI/CMakeLists.txt b/Userland/Libraries/LibGUI/CMakeLists.txt index 11c8c58905..b8e3599838 100644 --- a/Userland/Libraries/LibGUI/CMakeLists.txt +++ b/Userland/Libraries/LibGUI/CMakeLists.txt @@ -115,7 +115,7 @@ set(SOURCES Widget.cpp Window.cpp ConnectionToWindowServer.cpp - ConnectionToWindowMangerServer.cpp + ConnectionToWindowManagerServer.cpp Wizards/WizardDialog.cpp Wizards/AbstractWizardPage.cpp Wizards/CoverWizardPage.cpp diff --git a/Userland/Libraries/LibGUI/ConnectionToWindowMangerServer.cpp b/Userland/Libraries/LibGUI/ConnectionToWindowManagerServer.cpp similarity index 64% rename from Userland/Libraries/LibGUI/ConnectionToWindowMangerServer.cpp rename to Userland/Libraries/LibGUI/ConnectionToWindowManagerServer.cpp index e5b8e482d9..ddc099b2a9 100644 --- a/Userland/Libraries/LibGUI/ConnectionToWindowMangerServer.cpp +++ b/Userland/Libraries/LibGUI/ConnectionToWindowManagerServer.cpp @@ -4,21 +4,21 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include namespace GUI { -ConnectionToWindowMangerServer& ConnectionToWindowMangerServer::the() +ConnectionToWindowManagerServer& ConnectionToWindowManagerServer::the() { - static RefPtr s_connection = nullptr; + static RefPtr s_connection = nullptr; if (!s_connection) - s_connection = ConnectionToWindowMangerServer::try_create().release_value_but_fixme_should_propagate_errors(); + s_connection = ConnectionToWindowManagerServer::try_create().release_value_but_fixme_should_propagate_errors(); return *s_connection; } -void ConnectionToWindowMangerServer::window_state_changed(i32 wm_id, i32 client_id, i32 window_id, +void ConnectionToWindowManagerServer::window_state_changed(i32 wm_id, i32 client_id, i32 window_id, i32 parent_client_id, i32 parent_window_id, u32 workspace_row, u32 workspace_column, bool is_active, bool is_minimized, bool is_modal, bool is_frameless, i32 window_type, String const& title, Gfx::IntRect const& rect, Optional const& progress) @@ -27,56 +27,56 @@ void ConnectionToWindowMangerServer::window_state_changed(i32 wm_id, i32 client_ Core::EventLoop::current().post_event(*window, make(client_id, window_id, parent_client_id, parent_window_id, title, rect, workspace_row, workspace_column, is_active, is_modal, static_cast(window_type), is_minimized, is_frameless, progress)); } -void ConnectionToWindowMangerServer::applet_area_size_changed(i32 wm_id, Gfx::IntSize const& size) +void ConnectionToWindowManagerServer::applet_area_size_changed(i32 wm_id, Gfx::IntSize const& size) { if (auto* window = Window::from_window_id(wm_id)) Core::EventLoop::current().post_event(*window, make(size)); } -void ConnectionToWindowMangerServer::window_rect_changed(i32 wm_id, i32 client_id, i32 window_id, Gfx::IntRect const& rect) +void ConnectionToWindowManagerServer::window_rect_changed(i32 wm_id, i32 client_id, i32 window_id, Gfx::IntRect const& rect) { if (auto* window = Window::from_window_id(wm_id)) Core::EventLoop::current().post_event(*window, make(client_id, window_id, rect)); } -void ConnectionToWindowMangerServer::window_icon_bitmap_changed(i32 wm_id, i32 client_id, i32 window_id, Gfx::ShareableBitmap const& bitmap) +void ConnectionToWindowManagerServer::window_icon_bitmap_changed(i32 wm_id, i32 client_id, i32 window_id, Gfx::ShareableBitmap const& bitmap) { if (auto* window = Window::from_window_id(wm_id)) { Core::EventLoop::current().post_event(*window, make(client_id, window_id, bitmap.bitmap())); } } -void ConnectionToWindowMangerServer::window_removed(i32 wm_id, i32 client_id, i32 window_id) +void ConnectionToWindowManagerServer::window_removed(i32 wm_id, i32 client_id, i32 window_id) { if (auto* window = Window::from_window_id(wm_id)) Core::EventLoop::current().post_event(*window, make(client_id, window_id)); } -void ConnectionToWindowMangerServer::super_key_pressed(i32 wm_id) +void ConnectionToWindowManagerServer::super_key_pressed(i32 wm_id) { if (auto* window = Window::from_window_id(wm_id)) Core::EventLoop::current().post_event(*window, make(wm_id)); } -void ConnectionToWindowMangerServer::super_space_key_pressed(i32 wm_id) +void ConnectionToWindowManagerServer::super_space_key_pressed(i32 wm_id) { if (auto* window = Window::from_window_id(wm_id)) Core::EventLoop::current().post_event(*window, make(wm_id)); } -void ConnectionToWindowMangerServer::super_digit_key_pressed(i32 wm_id, u8 digit) +void ConnectionToWindowManagerServer::super_digit_key_pressed(i32 wm_id, u8 digit) { if (auto* window = Window::from_window_id(wm_id)) Core::EventLoop::current().post_event(*window, make(wm_id, digit)); } -void ConnectionToWindowMangerServer::workspace_changed(i32 wm_id, u32 row, u32 column) +void ConnectionToWindowManagerServer::workspace_changed(i32 wm_id, u32 row, u32 column) { if (auto* window = Window::from_window_id(wm_id)) Core::EventLoop::current().post_event(*window, make(wm_id, row, column)); } -void ConnectionToWindowMangerServer::keymap_changed(i32 wm_id, String const& keymap) +void ConnectionToWindowManagerServer::keymap_changed(i32 wm_id, String const& keymap) { if (auto* window = Window::from_window_id(wm_id)) Core::EventLoop::current().post_event(*window, make(wm_id, keymap)); diff --git a/Userland/Libraries/LibGUI/ConnectionToWindowMangerServer.h b/Userland/Libraries/LibGUI/ConnectionToWindowManagerServer.h similarity index 84% rename from Userland/Libraries/LibGUI/ConnectionToWindowMangerServer.h rename to Userland/Libraries/LibGUI/ConnectionToWindowManagerServer.h index 8df78222e3..05c6ae925f 100644 --- a/Userland/Libraries/LibGUI/ConnectionToWindowMangerServer.h +++ b/Userland/Libraries/LibGUI/ConnectionToWindowManagerServer.h @@ -13,16 +13,16 @@ namespace GUI { -class ConnectionToWindowMangerServer final +class ConnectionToWindowManagerServer final : public IPC::ConnectionToServer , public WindowManagerClientEndpoint { - IPC_CLIENT_CONNECTION(ConnectionToWindowMangerServer, "/tmp/portal/wm") + IPC_CLIENT_CONNECTION(ConnectionToWindowManagerServer, "/tmp/portal/wm") public: - static ConnectionToWindowMangerServer& the(); + static ConnectionToWindowManagerServer& the(); private: - ConnectionToWindowMangerServer(NonnullOwnPtr socket) + ConnectionToWindowManagerServer(NonnullOwnPtr socket) : IPC::ConnectionToServer(*this, move(socket)) { } diff --git a/Userland/Libraries/LibGUI/Window.cpp b/Userland/Libraries/LibGUI/Window.cpp index 2fbd271c3b..386e989d97 100644 --- a/Userland/Libraries/LibGUI/Window.cpp +++ b/Userland/Libraries/LibGUI/Window.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -320,8 +320,8 @@ void Window::set_window_type(WindowType window_type) void Window::make_window_manager(unsigned event_mask) { - GUI::ConnectionToWindowMangerServer::the().async_set_event_mask(event_mask); - GUI::ConnectionToWindowMangerServer::the().async_set_manager_window(m_window_id); + GUI::ConnectionToWindowManagerServer::the().async_set_event_mask(event_mask); + GUI::ConnectionToWindowManagerServer::the().async_set_manager_window(m_window_id); } bool Window::are_cursors_the_same(AK::Variant> const& left, AK::Variant> const& right) const diff --git a/Userland/Services/Taskbar/TaskbarButton.cpp b/Userland/Services/Taskbar/TaskbarButton.cpp index 38e1923686..1eade91323 100644 --- a/Userland/Services/Taskbar/TaskbarButton.cpp +++ b/Userland/Services/Taskbar/TaskbarButton.cpp @@ -7,7 +7,7 @@ #include "TaskbarButton.h" #include "WindowList.h" #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ TaskbarButton::TaskbarButton(WindowIdentifier const& identifier) void TaskbarButton::context_menu_event(GUI::ContextMenuEvent&) { - GUI::ConnectionToWindowMangerServer::the().async_popup_window_menu( + GUI::ConnectionToWindowManagerServer::the().async_popup_window_menu( m_identifier.client_id(), m_identifier.window_id(), screen_relative_rect().location()); @@ -29,7 +29,7 @@ void TaskbarButton::context_menu_event(GUI::ContextMenuEvent&) void TaskbarButton::update_taskbar_rect() { - GUI::ConnectionToWindowMangerServer::the().async_set_window_taskbar_rect( + GUI::ConnectionToWindowManagerServer::the().async_set_window_taskbar_rect( m_identifier.client_id(), m_identifier.window_id(), screen_relative_rect()); @@ -37,7 +37,7 @@ void TaskbarButton::update_taskbar_rect() void TaskbarButton::clear_taskbar_rect() { - GUI::ConnectionToWindowMangerServer::the().async_set_window_taskbar_rect( + GUI::ConnectionToWindowManagerServer::the().async_set_window_taskbar_rect( m_identifier.client_id(), m_identifier.window_id(), {}); diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp index cb060b4a61..cf0773b8bb 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.cpp +++ b/Userland/Services/Taskbar/TaskbarWindow.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -110,7 +110,7 @@ void TaskbarWindow::config_string_did_change(String const& domain, String const& void TaskbarWindow::show_desktop_button_clicked(unsigned) { - GUI::ConnectionToWindowMangerServer::the().async_toggle_show_desktop(); + GUI::ConnectionToWindowManagerServer::the().async_toggle_show_desktop(); } void TaskbarWindow::on_screen_rects_change(Vector const& rects, size_t main_screen_index) @@ -129,7 +129,7 @@ void TaskbarWindow::update_applet_area() return; main_widget()->do_layout(); auto new_rect = Gfx::IntRect({}, m_applet_area_size).centered_within(m_applet_area_container->screen_relative_rect()); - GUI::ConnectionToWindowMangerServer::the().async_set_applet_area_position(new_rect.location()); + GUI::ConnectionToWindowManagerServer::the().async_set_applet_area_position(new_rect.location()); } NonnullRefPtr TaskbarWindow::create_button(WindowIdentifier const& identifier) @@ -156,9 +156,9 @@ void TaskbarWindow::add_window_button(::Window& window, WindowIdentifier const& // false because window is the modal window's owner (which is not // active) if (window->is_minimized() || !button->is_checked()) { - GUI::ConnectionToWindowMangerServer::the().async_set_active_window(identifier.client_id(), identifier.window_id()); + GUI::ConnectionToWindowManagerServer::the().async_set_active_window(identifier.client_id(), identifier.window_id()); } else { - GUI::ConnectionToWindowMangerServer::the().async_set_window_minimized(identifier.client_id(), identifier.window_id(), true); + GUI::ConnectionToWindowManagerServer::the().async_set_window_minimized(identifier.client_id(), identifier.window_id(), true); } }; } diff --git a/Userland/Services/Taskbar/main.cpp b/Userland/Services/Taskbar/main.cpp index 5778cd9042..19720fde75 100644 --- a/Userland/Services/Taskbar/main.cpp +++ b/Userland/Services/Taskbar/main.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -56,7 +56,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath unix")); - GUI::ConnectionToWindowMangerServer::the(); + GUI::ConnectionToWindowManagerServer::the(); Desktop::Launcher::ensure_connection(); TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath"));