diff options
Diffstat (limited to 'Userland/Services/WindowServer/WindowManager.h')
| -rw-r--r-- | Userland/Services/WindowServer/WindowManager.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h index b489164607..b6ec0885f8 100644 --- a/Userland/Services/WindowServer/WindowManager.h +++ b/Userland/Services/WindowServer/WindowManager.h @@ -22,7 +22,7 @@ #include <WindowServer/KeymapSwitcher.h> #include <WindowServer/MenuManager.h> #include <WindowServer/ScreenLayout.h> -#include <WindowServer/WMClientConnection.h> +#include <WindowServer/WMConnectionFromClient.h> #include <WindowServer/WindowSwitcher.h> #include <WindowServer/WindowType.h> @@ -34,7 +34,7 @@ const int double_click_speed_min = 100; class Screen; class MouseEvent; class Window; -class ClientConnection; +class ConnectionFromClient; class WindowSwitcher; class Button; class DndOverlay; @@ -90,10 +90,10 @@ public: Gfx::IntRect tiled_window_rect(Window const&, WindowTileType tile_type = WindowTileType::Maximized, bool relative_to_window_screen = false) const; - ClientConnection const* dnd_client() const { return m_dnd_client.ptr(); } + ConnectionFromClient const* dnd_client() const { return m_dnd_client.ptr(); } Core::MimeData const& dnd_mime_data() const { return *m_dnd_mime_data; } - void start_dnd_drag(ClientConnection&, String const& text, Gfx::Bitmap const*, Core::MimeData const&); + void start_dnd_drag(ConnectionFromClient&, String const& text, Gfx::Bitmap const*, Core::MimeData const&); void end_dnd_drag(); Window* active_window() @@ -118,7 +118,7 @@ public: return m_current_window_stack->active_input_window(); } - ClientConnection const* active_client() const; + ConnectionFromClient const* active_client() const; Window* window_with_active_menu() { return m_window_with_active_menu; } Window const* window_with_active_menu() const { return m_window_with_active_menu; } @@ -179,7 +179,7 @@ public: void clear_resize_candidate(); ResizeDirection resize_direction_of_window(Window const&); - void greet_window_manager(WMClientConnection&); + void greet_window_manager(WMConnectionFromClient&); void tell_wms_window_state_changed(Window&); void tell_wms_window_icon_changed(Window&); void tell_wms_window_rect_changed(Window&); @@ -345,10 +345,10 @@ private: void for_each_window_manager(Callback); virtual void event(Core::Event&) override; - void tell_wm_about_window(WMClientConnection& conn, Window&); - void tell_wm_about_window_icon(WMClientConnection& conn, Window&); - void tell_wm_about_window_rect(WMClientConnection& conn, Window&); - void tell_wm_about_current_window_stack(WMClientConnection&); + void tell_wm_about_window(WMConnectionFromClient& conn, Window&); + void tell_wm_about_window_icon(WMConnectionFromClient& conn, Window&); + void tell_wm_about_window_rect(WMConnectionFromClient& conn, Window&); + void tell_wm_about_current_window_stack(WMConnectionFromClient&); bool pick_new_active_window(Window*); void do_move_to_front(Window&, bool, bool); @@ -449,7 +449,7 @@ private: RefPtr<Core::ConfigFile> m_config; OwnPtr<DndOverlay> m_dnd_overlay; - WeakPtr<ClientConnection> m_dnd_client; + WeakPtr<ConnectionFromClient> m_dnd_client; String m_dnd_text; RefPtr<Core::MimeData> m_dnd_mime_data; @@ -535,7 +535,7 @@ inline IterationDecision WindowManager::for_each_visible_window_from_front_to_ba template<typename Callback> void WindowManager::for_each_window_manager(Callback callback) { - auto& connections = WMClientConnection::s_connections; + auto& connections = WMConnectionFromClient::s_connections; // FIXME: this isn't really ordered... does it need to be? for (auto it = connections.begin(); it != connections.end(); ++it) { |