RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-17 07:17:35 +00:00
Code Issues Activity Actions

LibGUI: Fix typo in ConnectionToWindowManagerServer

Browse source
This commit is contained in:
Olivier De Cannière 2022-06-01 13:41:34 +02:00 • committed by Andreas Kling
parent 524f4be5af
commit 6c202ee4a9
12 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applets/Keymap/KeymapStatusWindow.cpp
View file

@ -6,7 +6,7 @@
*/ */
#include "KeymapStatusWindow.h" #include "KeymapStatusWindow.h"
#include <LibGUI/ConnectionToWindowMangerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGUI/Process.h> #include <LibGUI/Process.h>
#include <LibKeyboard/CharacterMap.h> #include <LibKeyboard/CharacterMap.h>

2
Userland/Applets/Keymap/main.cpp
View file

@ -7,7 +7,7 @@
#include "KeymapStatusWindow.h" #include "KeymapStatusWindow.h"
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/ConnectionToWindowMangerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <WindowServer/Window.h> #include <WindowServer/Window.h>

6
Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp
View file

@ -6,7 +6,7 @@
*/ */
#include "DesktopStatusWindow.h" #include "DesktopStatusWindow.h"
#include <LibGUI/ConnectionToWindowMangerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/Desktop.h> #include <LibGUI/Desktop.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
@ -63,7 +63,7 @@ public:
// Handle case where divider is clicked. // Handle case where divider is clicked.
if (rect_for_desktop(row, col).contains(event.position())) 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 virtual void mousewheel_event(GUI::MouseEvent& event) override
@ -82,7 +82,7 @@ public:
else else
row = abs((int)row + direction) % vrows; 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; } unsigned current_row() const { return m_current_row; }

4
Userland/Applets/WorkspacePicker/main.cpp
View file

@ -7,7 +7,7 @@
#include "DesktopStatusWindow.h" #include "DesktopStatusWindow.h"
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/ConnectionToWindowMangerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <WindowServer/Window.h> #include <WindowServer/Window.h>
@ -19,7 +19,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app = TRY(GUI::Application::try_create(arguments)); auto app = TRY(GUI::Application::try_create(arguments));
// We need to obtain the WM connection here as well before the pledge shortening. // 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")); TRY(Core::System::pledge("stdio recvfd sendfd rpath"));

2
Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.h
View file

@ -9,7 +9,7 @@
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGUI/Button.h> #include <LibGUI/Button.h>
#include <LibGUI/CheckBox.h> #include <LibGUI/CheckBox.h>
#include <LibGUI/ConnectionToWindowMangerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/ListView.h> #include <LibGUI/ListView.h>
#include <LibGUI/SettingsWindow.h> #include <LibGUI/SettingsWindow.h>
#include <LibGUI/TextEditor.h> #include <LibGUI/TextEditor.h>

2
Userland/Libraries/LibGUI/CMakeLists.txt
View file

@ -115,7 +115,7 @@ set(SOURCES
Widget.cpp Widget.cpp
Window.cpp Window.cpp
ConnectionToWindowServer.cpp ConnectionToWindowServer.cpp
ConnectionToWindowMangerServer.cpp ConnectionToWindowManagerServer.cpp
Wizards/WizardDialog.cpp Wizards/WizardDialog.cpp
Wizards/AbstractWizardPage.cpp Wizards/AbstractWizardPage.cpp
Wizards/CoverWizardPage.cpp Wizards/CoverWizardPage.cpp

28
Userland/Libraries/LibGUI/ConnectionToWindowMangerServer.cpp → Userland/Libraries/LibGUI/ConnectionToWindowManagerServer.cpp
View file

@ -4,21 +4,21 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGUI/ConnectionToWindowMangerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/Event.h> #include <LibGUI/Event.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
namespace GUI { namespace GUI {
ConnectionToWindowMangerServer& ConnectionToWindowMangerServer::the() ConnectionToWindowManagerServer& ConnectionToWindowManagerServer::the()
{ {
static RefPtr<ConnectionToWindowMangerServer> s_connection = nullptr; static RefPtr<ConnectionToWindowManagerServer> s_connection = nullptr;
if (!s_connection) 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; 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, 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, bool is_active, bool is_minimized, bool is_modal, bool is_frameless, i32 window_type,
String const& title, Gfx::IntRect const& rect, Optional<i32> const& progress) String const& title, Gfx::IntRect const& rect, Optional<i32> const& progress)
@ -27,56 +27,56 @@ void ConnectionToWindowMangerServer::window_state_changed(i32 wm_id, i32 client_
Core::EventLoop::current().post_event(*window, make<WMWindowStateChangedEvent>(client_id, window_id, parent_client_id, parent_window_id, title, rect, workspace_row, workspace_column, is_active, is_modal, static_cast<WindowType>(window_type), is_minimized, is_frameless, progress)); Core::EventLoop::current().post_event(*window, make<WMWindowStateChangedEvent>(client_id, window_id, parent_client_id, parent_window_id, title, rect, workspace_row, workspace_column, is_active, is_modal, static_cast<WindowType>(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)) if (auto* window = Window::from_window_id(wm_id))
Core::EventLoop::current().post_event(*window, make<WMAppletAreaSizeChangedEvent>(size)); Core::EventLoop::current().post_event(*window, make<WMAppletAreaSizeChangedEvent>(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)) if (auto* window = Window::from_window_id(wm_id))
Core::EventLoop::current().post_event(*window, make<WMWindowRectChangedEvent>(client_id, window_id, rect)); Core::EventLoop::current().post_event(*window, make<WMWindowRectChangedEvent>(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)) { if (auto* window = Window::from_window_id(wm_id)) {
Core::EventLoop::current().post_event(*window, make<WMWindowIconBitmapChangedEvent>(client_id, window_id, bitmap.bitmap())); Core::EventLoop::current().post_event(*window, make<WMWindowIconBitmapChangedEvent>(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)) if (auto* window = Window::from_window_id(wm_id))
Core::EventLoop::current().post_event(*window, make<WMWindowRemovedEvent>(client_id, window_id)); Core::EventLoop::current().post_event(*window, make<WMWindowRemovedEvent>(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)) if (auto* window = Window::from_window_id(wm_id))
Core::EventLoop::current().post_event(*window, make<WMSuperKeyPressedEvent>(wm_id)); Core::EventLoop::current().post_event(*window, make<WMSuperKeyPressedEvent>(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)) if (auto* window = Window::from_window_id(wm_id))
Core::EventLoop::current().post_event(*window, make<WMSuperSpaceKeyPressedEvent>(wm_id)); Core::EventLoop::current().post_event(*window, make<WMSuperSpaceKeyPressedEvent>(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)) if (auto* window = Window::from_window_id(wm_id))
Core::EventLoop::current().post_event(*window, make<WMSuperDigitKeyPressedEvent>(wm_id, digit)); Core::EventLoop::current().post_event(*window, make<WMSuperDigitKeyPressedEvent>(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)) if (auto* window = Window::from_window_id(wm_id))
Core::EventLoop::current().post_event(*window, make<WMWorkspaceChangedEvent>(wm_id, row, column)); Core::EventLoop::current().post_event(*window, make<WMWorkspaceChangedEvent>(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)) if (auto* window = Window::from_window_id(wm_id))
Core::EventLoop::current().post_event(*window, make<WMKeymapChangedEvent>(wm_id, keymap)); Core::EventLoop::current().post_event(*window, make<WMKeymapChangedEvent>(wm_id, keymap));

8
Userland/Libraries/LibGUI/ConnectionToWindowMangerServer.h → Userland/Libraries/LibGUI/ConnectionToWindowManagerServer.h
View file

@ -13,16 +13,16 @@
namespace GUI { namespace GUI {
class ConnectionToWindowMangerServer final class ConnectionToWindowManagerServer final
: public IPC::ConnectionToServer<WindowManagerClientEndpoint, WindowManagerServerEndpoint> : public IPC::ConnectionToServer<WindowManagerClientEndpoint, WindowManagerServerEndpoint>
, public WindowManagerClientEndpoint { , public WindowManagerClientEndpoint {
IPC_CLIENT_CONNECTION(ConnectionToWindowMangerServer, "/tmp/portal/wm") IPC_CLIENT_CONNECTION(ConnectionToWindowManagerServer, "/tmp/portal/wm")
public: public:
static ConnectionToWindowMangerServer& the(); static ConnectionToWindowManagerServer& the();
private: private:
ConnectionToWindowMangerServer(NonnullOwnPtr<Core::Stream::LocalSocket> socket) ConnectionToWindowManagerServer(NonnullOwnPtr<Core::Stream::LocalSocket> socket)
: IPC::ConnectionToServer<WindowManagerClientEndpoint, WindowManagerServerEndpoint>(*this, move(socket)) : IPC::ConnectionToServer<WindowManagerClientEndpoint, WindowManagerServerEndpoint>(*this, move(socket))
{ {
} }

6
Userland/Libraries/LibGUI/Window.cpp
View file

@ -14,7 +14,7 @@
#include <LibCore/MimeData.h> #include <LibCore/MimeData.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/ConnectionToWindowMangerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/ConnectionToWindowServer.h> #include <LibGUI/ConnectionToWindowServer.h>
#include <LibGUI/Desktop.h> #include <LibGUI/Desktop.h>
#include <LibGUI/Event.h> #include <LibGUI/Event.h>
@ -320,8 +320,8 @@ void Window::set_window_type(WindowType window_type)
void Window::make_window_manager(unsigned event_mask) void Window::make_window_manager(unsigned event_mask)
{ {
GUI::ConnectionToWindowMangerServer::the().async_set_event_mask(event_mask); GUI::ConnectionToWindowManagerServer::the().async_set_event_mask(event_mask);
GUI::ConnectionToWindowMangerServer::the().async_set_manager_window(m_window_id); GUI::ConnectionToWindowManagerServer::the().async_set_manager_window(m_window_id);
} }
bool Window::are_cursors_the_same(AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> const& left, AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> const& right) const bool Window::are_cursors_the_same(AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> const& left, AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> const& right) const

8
Userland/Services/Taskbar/TaskbarButton.cpp
View file

@ -7,7 +7,7 @@
#include "TaskbarButton.h" #include "TaskbarButton.h"
#include "WindowList.h" #include "WindowList.h"
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/ConnectionToWindowMangerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/ConnectionToWindowServer.h> #include <LibGUI/ConnectionToWindowServer.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGfx/Font/Font.h> #include <LibGfx/Font/Font.h>
@ -21,7 +21,7 @@ TaskbarButton::TaskbarButton(WindowIdentifier const& identifier)
void TaskbarButton::context_menu_event(GUI::ContextMenuEvent&) 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.client_id(),
m_identifier.window_id(), m_identifier.window_id(),
screen_relative_rect().location()); screen_relative_rect().location());
@ -29,7 +29,7 @@ void TaskbarButton::context_menu_event(GUI::ContextMenuEvent&)
void TaskbarButton::update_taskbar_rect() 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.client_id(),
m_identifier.window_id(), m_identifier.window_id(),
screen_relative_rect()); screen_relative_rect());
@ -37,7 +37,7 @@ void TaskbarButton::update_taskbar_rect()
void TaskbarButton::clear_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.client_id(),
m_identifier.window_id(), m_identifier.window_id(),
{}); {});

10
Userland/Services/Taskbar/TaskbarWindow.cpp
View file

@ -13,7 +13,7 @@
#include <LibCore/StandardPaths.h> #include <LibCore/StandardPaths.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h> #include <LibGUI/Button.h>
#include <LibGUI/ConnectionToWindowMangerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/ConnectionToWindowServer.h> #include <LibGUI/ConnectionToWindowServer.h>
#include <LibGUI/Desktop.h> #include <LibGUI/Desktop.h>
#include <LibGUI/Frame.h> #include <LibGUI/Frame.h>
@ -110,7 +110,7 @@ void TaskbarWindow::config_string_did_change(String const& domain, String const&
void TaskbarWindow::show_desktop_button_clicked(unsigned) 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<Gfx::IntRect, 4> const& rects, size_t main_screen_index) void TaskbarWindow::on_screen_rects_change(Vector<Gfx::IntRect, 4> const& rects, size_t main_screen_index)
@ -129,7 +129,7 @@ void TaskbarWindow::update_applet_area()
return; return;
main_widget()->do_layout(); main_widget()->do_layout();
auto new_rect = Gfx::IntRect({}, m_applet_area_size).centered_within(m_applet_area_container->screen_relative_rect()); 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<GUI::Button> TaskbarWindow::create_button(WindowIdentifier const& identifier) NonnullRefPtr<GUI::Button> 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 // false because window is the modal window's owner (which is not
// active) // active)
if (window->is_minimized() || !button->is_checked()) { 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 { } 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);
} }
}; };
} }

4
Userland/Services/Taskbar/main.cpp
View file

@ -17,7 +17,7 @@
#include <LibDesktop/Launcher.h> #include <LibDesktop/Launcher.h>
#include <LibGUI/ActionGroup.h> #include <LibGUI/ActionGroup.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/ConnectionToWindowMangerServer.h> #include <LibGUI/ConnectionToWindowManagerServer.h>
#include <LibGUI/ConnectionToWindowServer.h> #include <LibGUI/ConnectionToWindowServer.h>
#include <LibGUI/Menu.h> #include <LibGUI/Menu.h>
#include <LibGUI/Process.h> #include <LibGUI/Process.h>
@ -56,7 +56,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath unix")); TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath unix"));
GUI::ConnectionToWindowMangerServer::the(); GUI::ConnectionToWindowManagerServer::the();
Desktop::Launcher::ensure_connection(); Desktop::Launcher::ensure_connection();
TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath")); TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath"));