mirror of
				https://github.com/RGBCube/serenity
				synced 2025-10-31 19:22:45 +00:00 
			
		
		
		
	Userland: Rename WindowManagerServerConnection
Rename WindowManagerServerConnection=>ConnectionToWindowManagerServer. This was done with CLion's automatic rename feature.
This commit is contained in:
		
							parent
							
								
									d88da82e28
								
							
						
					
					
						commit
						af132fdbd1
					
				
					 12 changed files with 41 additions and 41 deletions
				
			
		|  | @ -7,8 +7,8 @@ | ||||||
| 
 | 
 | ||||||
| #include "KeymapStatusWindow.h" | #include "KeymapStatusWindow.h" | ||||||
| #include <LibCore/Process.h> | #include <LibCore/Process.h> | ||||||
|  | #include <LibGUI/ConnectionToWindowMangerServer.h> | ||||||
| #include <LibGUI/Painter.h> | #include <LibGUI/Painter.h> | ||||||
| #include <LibGUI/WindowManagerServerConnection.h> |  | ||||||
| #include <LibKeyboard/CharacterMap.h> | #include <LibKeyboard/CharacterMap.h> | ||||||
| 
 | 
 | ||||||
| void KeymapStatusWidget::mousedown_event(GUI::MouseEvent& event) | void KeymapStatusWidget::mousedown_event(GUI::MouseEvent& event) | ||||||
|  |  | ||||||
|  | @ -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/WindowManagerServerConnection.h> | #include <LibGUI/ConnectionToWindowMangerServer.h> | ||||||
| #include <LibMain/Main.h> | #include <LibMain/Main.h> | ||||||
| #include <WindowServer/Window.h> | #include <WindowServer/Window.h> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -6,10 +6,10 @@ | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| #include "DesktopStatusWindow.h" | #include "DesktopStatusWindow.h" | ||||||
|  | #include <LibGUI/ConnectionToWindowMangerServer.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> | ||||||
| #include <LibGUI/WindowManagerServerConnection.h> |  | ||||||
| #include <LibGfx/Palette.h> | #include <LibGfx/Palette.h> | ||||||
| 
 | 
 | ||||||
| class DesktopStatusWidget : public GUI::Widget { | class DesktopStatusWidget : public GUI::Widget { | ||||||
|  | @ -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::WindowManagerServerConnection::the().async_set_workspace(row, col); |             GUI::ConnectionToWindowMangerServer::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::WindowManagerServerConnection::the().async_set_workspace(row, col); |         GUI::ConnectionToWindowMangerServer::the().async_set_workspace(row, col); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     unsigned current_row() const { return m_current_row; } |     unsigned current_row() const { return m_current_row; } | ||||||
|  |  | ||||||
|  | @ -7,8 +7,8 @@ | ||||||
| #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/Painter.h> | #include <LibGUI/Painter.h> | ||||||
| #include <LibGUI/WindowManagerServerConnection.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::WindowManagerServerConnection::the(); |     GUI::ConnectionToWindowMangerServer::the(); | ||||||
| 
 | 
 | ||||||
|     TRY(Core::System::pledge("stdio recvfd sendfd rpath")); |     TRY(Core::System::pledge("stdio recvfd sendfd rpath")); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -9,10 +9,10 @@ | ||||||
| #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/ListView.h> | #include <LibGUI/ListView.h> | ||||||
| #include <LibGUI/SettingsWindow.h> | #include <LibGUI/SettingsWindow.h> | ||||||
| #include <LibGUI/TextEditor.h> | #include <LibGUI/TextEditor.h> | ||||||
| #include <LibGUI/WindowManagerServerConnection.h> |  | ||||||
| 
 | 
 | ||||||
| class KeyboardSettingsWidget final : public GUI::SettingsWindow::Tab { | class KeyboardSettingsWidget final : public GUI::SettingsWindow::Tab { | ||||||
|     C_OBJECT(KeyboardSettingsWidget) |     C_OBJECT(KeyboardSettingsWidget) | ||||||
|  |  | ||||||
|  | @ -113,7 +113,7 @@ set(SOURCES | ||||||
|     Widget.cpp |     Widget.cpp | ||||||
|     Window.cpp |     Window.cpp | ||||||
|     WindowServerConnection.cpp |     WindowServerConnection.cpp | ||||||
|     WindowManagerServerConnection.cpp |         ConnectionToWindowMangerServer.cpp | ||||||
|     Wizards/WizardDialog.cpp |     Wizards/WizardDialog.cpp | ||||||
|     Wizards/AbstractWizardPage.cpp |     Wizards/AbstractWizardPage.cpp | ||||||
|     Wizards/CoverWizardPage.cpp |     Wizards/CoverWizardPage.cpp | ||||||
|  |  | ||||||
|  | @ -4,21 +4,21 @@ | ||||||
|  * SPDX-License-Identifier: BSD-2-Clause |  * SPDX-License-Identifier: BSD-2-Clause | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
|  | #include <LibGUI/ConnectionToWindowMangerServer.h> | ||||||
| #include <LibGUI/Event.h> | #include <LibGUI/Event.h> | ||||||
| #include <LibGUI/Window.h> | #include <LibGUI/Window.h> | ||||||
| #include <LibGUI/WindowManagerServerConnection.h> |  | ||||||
| 
 | 
 | ||||||
| namespace GUI { | namespace GUI { | ||||||
| 
 | 
 | ||||||
| WindowManagerServerConnection& WindowManagerServerConnection::the() | ConnectionToWindowMangerServer& ConnectionToWindowMangerServer::the() | ||||||
| { | { | ||||||
|     static RefPtr<WindowManagerServerConnection> s_connection = nullptr; |     static RefPtr<ConnectionToWindowMangerServer> s_connection = nullptr; | ||||||
|     if (!s_connection) |     if (!s_connection) | ||||||
|         s_connection = WindowManagerServerConnection::try_create().release_value_but_fixme_should_propagate_errors(); |         s_connection = ConnectionToWindowMangerServer::try_create().release_value_but_fixme_should_propagate_errors(); | ||||||
|     return *s_connection; |     return *s_connection; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void WindowManagerServerConnection::window_state_changed(i32 wm_id, i32 client_id, i32 window_id, | void ConnectionToWindowMangerServer::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 WindowManagerServerConnection::window_state_changed(i32 wm_id, i32 client_i | ||||||
|         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 WindowManagerServerConnection::applet_area_size_changed(i32 wm_id, const Gfx::IntSize& size) | void ConnectionToWindowMangerServer::applet_area_size_changed(i32 wm_id, const Gfx::IntSize& 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 WindowManagerServerConnection::window_rect_changed(i32 wm_id, i32 client_id, i32 window_id, Gfx::IntRect const& rect) | void ConnectionToWindowMangerServer::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 WindowManagerServerConnection::window_icon_bitmap_changed(i32 wm_id, i32 client_id, i32 window_id, Gfx::ShareableBitmap const& bitmap) | void ConnectionToWindowMangerServer::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 WindowManagerServerConnection::window_removed(i32 wm_id, i32 client_id, i32 window_id) | void ConnectionToWindowMangerServer::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 WindowManagerServerConnection::super_key_pressed(i32 wm_id) | void ConnectionToWindowMangerServer::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 WindowManagerServerConnection::super_space_key_pressed(i32 wm_id) | void ConnectionToWindowMangerServer::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 WindowManagerServerConnection::super_digit_key_pressed(i32 wm_id, u8 digit) | void ConnectionToWindowMangerServer::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 WindowManagerServerConnection::workspace_changed(i32 wm_id, u32 row, u32 column) | void ConnectionToWindowMangerServer::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 WindowManagerServerConnection::keymap_changed(i32 wm_id, String const& keymap) | void ConnectionToWindowMangerServer::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)); | ||||||
|  | @ -13,16 +13,16 @@ | ||||||
| 
 | 
 | ||||||
| namespace GUI { | namespace GUI { | ||||||
| 
 | 
 | ||||||
| class WindowManagerServerConnection final | class ConnectionToWindowMangerServer final | ||||||
|     : public IPC::ConnectionToServer<WindowManagerClientEndpoint, WindowManagerServerEndpoint> |     : public IPC::ConnectionToServer<WindowManagerClientEndpoint, WindowManagerServerEndpoint> | ||||||
|     , public WindowManagerClientEndpoint { |     , public WindowManagerClientEndpoint { | ||||||
|     IPC_CLIENT_CONNECTION(WindowManagerServerConnection, "/tmp/portal/wm") |     IPC_CLIENT_CONNECTION(ConnectionToWindowMangerServer, "/tmp/portal/wm") | ||||||
| 
 | 
 | ||||||
| public: | public: | ||||||
|     static WindowManagerServerConnection& the(); |     static ConnectionToWindowMangerServer& the(); | ||||||
| 
 | 
 | ||||||
| private: | private: | ||||||
|     WindowManagerServerConnection(NonnullOwnPtr<Core::Stream::LocalSocket> socket) |     ConnectionToWindowMangerServer(NonnullOwnPtr<Core::Stream::LocalSocket> socket) | ||||||
|         : IPC::ConnectionToServer<WindowManagerClientEndpoint, WindowManagerServerEndpoint>(*this, move(socket)) |         : IPC::ConnectionToServer<WindowManagerClientEndpoint, WindowManagerServerEndpoint>(*this, move(socket)) | ||||||
|     { |     { | ||||||
|     } |     } | ||||||
|  | @ -14,6 +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/Desktop.h> | #include <LibGUI/Desktop.h> | ||||||
| #include <LibGUI/Event.h> | #include <LibGUI/Event.h> | ||||||
| #include <LibGUI/MenuItem.h> | #include <LibGUI/MenuItem.h> | ||||||
|  | @ -21,7 +22,6 @@ | ||||||
| #include <LibGUI/Painter.h> | #include <LibGUI/Painter.h> | ||||||
| #include <LibGUI/Widget.h> | #include <LibGUI/Widget.h> | ||||||
| #include <LibGUI/Window.h> | #include <LibGUI/Window.h> | ||||||
| #include <LibGUI/WindowManagerServerConnection.h> |  | ||||||
| #include <LibGUI/WindowServerConnection.h> | #include <LibGUI/WindowServerConnection.h> | ||||||
| #include <LibGfx/Bitmap.h> | #include <LibGfx/Bitmap.h> | ||||||
| #include <fcntl.h> | #include <fcntl.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::WindowManagerServerConnection::the().async_set_event_mask(event_mask); |     GUI::ConnectionToWindowMangerServer::the().async_set_event_mask(event_mask); | ||||||
|     GUI::WindowManagerServerConnection::the().async_set_manager_window(m_window_id); |     GUI::ConnectionToWindowMangerServer::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 | ||||||
|  |  | ||||||
|  | @ -7,8 +7,8 @@ | ||||||
| #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/Painter.h> | #include <LibGUI/Painter.h> | ||||||
| #include <LibGUI/WindowManagerServerConnection.h> |  | ||||||
| #include <LibGUI/WindowServerConnection.h> | #include <LibGUI/WindowServerConnection.h> | ||||||
| #include <LibGfx/Font.h> | #include <LibGfx/Font.h> | ||||||
| #include <LibGfx/Palette.h> | #include <LibGfx/Palette.h> | ||||||
|  | @ -25,7 +25,7 @@ TaskbarButton::~TaskbarButton() | ||||||
| 
 | 
 | ||||||
| void TaskbarButton::context_menu_event(GUI::ContextMenuEvent&) | void TaskbarButton::context_menu_event(GUI::ContextMenuEvent&) | ||||||
| { | { | ||||||
|     GUI::WindowManagerServerConnection::the().async_popup_window_menu( |     GUI::ConnectionToWindowMangerServer::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()); | ||||||
|  | @ -33,7 +33,7 @@ void TaskbarButton::context_menu_event(GUI::ContextMenuEvent&) | ||||||
| 
 | 
 | ||||||
| void TaskbarButton::update_taskbar_rect() | void TaskbarButton::update_taskbar_rect() | ||||||
| { | { | ||||||
|     GUI::WindowManagerServerConnection::the().async_set_window_taskbar_rect( |     GUI::ConnectionToWindowMangerServer::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()); | ||||||
|  | @ -41,7 +41,7 @@ void TaskbarButton::update_taskbar_rect() | ||||||
| 
 | 
 | ||||||
| void TaskbarButton::clear_taskbar_rect() | void TaskbarButton::clear_taskbar_rect() | ||||||
| { | { | ||||||
|     GUI::WindowManagerServerConnection::the().async_set_window_taskbar_rect( |     GUI::ConnectionToWindowMangerServer::the().async_set_window_taskbar_rect( | ||||||
|         m_identifier.client_id(), |         m_identifier.client_id(), | ||||||
|         m_identifier.window_id(), |         m_identifier.window_id(), | ||||||
|         {}); |         {}); | ||||||
|  |  | ||||||
|  | @ -13,13 +13,13 @@ | ||||||
| #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/Desktop.h> | #include <LibGUI/Desktop.h> | ||||||
| #include <LibGUI/Frame.h> | #include <LibGUI/Frame.h> | ||||||
| #include <LibGUI/Icon.h> | #include <LibGUI/Icon.h> | ||||||
| #include <LibGUI/Menu.h> | #include <LibGUI/Menu.h> | ||||||
| #include <LibGUI/Painter.h> | #include <LibGUI/Painter.h> | ||||||
| #include <LibGUI/Window.h> | #include <LibGUI/Window.h> | ||||||
| #include <LibGUI/WindowManagerServerConnection.h> |  | ||||||
| #include <LibGUI/WindowServerConnection.h> | #include <LibGUI/WindowServerConnection.h> | ||||||
| #include <LibGfx/FontDatabase.h> | #include <LibGfx/FontDatabase.h> | ||||||
| #include <LibGfx/Palette.h> | #include <LibGfx/Palette.h> | ||||||
|  | @ -105,7 +105,7 @@ TaskbarWindow::~TaskbarWindow() | ||||||
| 
 | 
 | ||||||
| void TaskbarWindow::show_desktop_button_clicked(unsigned) | void TaskbarWindow::show_desktop_button_clicked(unsigned) | ||||||
| { | { | ||||||
|     GUI::WindowManagerServerConnection::the().async_toggle_show_desktop(); |     GUI::ConnectionToWindowMangerServer::the().async_toggle_show_desktop(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void TaskbarWindow::on_screen_rects_change(const Vector<Gfx::IntRect, 4>& rects, size_t main_screen_index) | void TaskbarWindow::on_screen_rects_change(const Vector<Gfx::IntRect, 4>& rects, size_t main_screen_index) | ||||||
|  | @ -124,7 +124,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::WindowManagerServerConnection::the().async_set_applet_area_position(new_rect.location()); |     GUI::ConnectionToWindowMangerServer::the().async_set_applet_area_position(new_rect.location()); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| NonnullRefPtr<GUI::Button> TaskbarWindow::create_button(const WindowIdentifier& identifier) | NonnullRefPtr<GUI::Button> TaskbarWindow::create_button(const WindowIdentifier& identifier) | ||||||
|  | @ -151,9 +151,9 @@ void TaskbarWindow::add_window_button(::Window& window, const WindowIdentifier& | ||||||
|         // 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::WindowManagerServerConnection::the().async_set_active_window(identifier.client_id(), identifier.window_id()); |             GUI::ConnectionToWindowMangerServer::the().async_set_active_window(identifier.client_id(), identifier.window_id()); | ||||||
|         } else { |         } else { | ||||||
|             GUI::WindowManagerServerConnection::the().async_set_window_minimized(identifier.client_id(), identifier.window_id(), true); |             GUI::ConnectionToWindowMangerServer::the().async_set_window_minimized(identifier.client_id(), identifier.window_id(), true); | ||||||
|         } |         } | ||||||
|     }; |     }; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -20,8 +20,8 @@ | ||||||
| #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/Menu.h> | #include <LibGUI/Menu.h> | ||||||
| #include <LibGUI/WindowManagerServerConnection.h> |  | ||||||
| #include <LibGUI/WindowServerConnection.h> | #include <LibGUI/WindowServerConnection.h> | ||||||
| #include <LibMain/Main.h> | #include <LibMain/Main.h> | ||||||
| #include <WindowServer/Window.h> | #include <WindowServer/Window.h> | ||||||
|  | @ -49,7 +49,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::WindowManagerServerConnection::the(); |     GUI::ConnectionToWindowMangerServer::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")); | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Itamar
						Itamar