diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp index 98f04f05d7..ca3ef0edba 100644 --- a/Userland/Services/WindowServer/WindowManager.cpp +++ b/Userland/Services/WindowServer/WindowManager.cpp @@ -747,7 +747,7 @@ void WindowManager::start_window_resize(Window& window, Gfx::IntPoint const& pos m_geometry_overlay->set_enabled(true); } - current_window_stack().set_active_input_tracking_window(nullptr); + current_window_stack().set_automatic_cursor_tracking_window(nullptr); window.invalidate(true, true); @@ -1207,7 +1207,7 @@ void WindowManager::deliver_mouse_event(Window& window, MouseEvent const& event, bool WindowManager::process_ongoing_active_input_mouse_event(MouseEvent const& event) { auto& window_stack = current_window_stack(); - auto* input_tracking_window = window_stack.active_input_tracking_window(); + auto* input_tracking_window = window_stack.automatic_cursor_tracking_window(); if (!input_tracking_window) return false; @@ -1220,7 +1220,7 @@ bool WindowManager::process_ongoing_active_input_mouse_event(MouseEvent const& e deliver_mouse_event(*input_tracking_window, event, true); if (event.type() == Event::MouseUp && event.buttons() == 0) - window_stack.set_active_input_tracking_window(nullptr); + window_stack.set_automatic_cursor_tracking_window(nullptr); return true; } @@ -1291,7 +1291,7 @@ void WindowManager::process_mouse_event_for_window(HitTestResult& result, MouseE } if (event.type() == Event::MouseDown) - current_window_stack().set_active_input_tracking_window(&window); + current_window_stack().set_automatic_cursor_tracking_window(&window); } void WindowManager::process_mouse_event(MouseEvent& event) @@ -1310,16 +1310,16 @@ void WindowManager::process_mouse_event(MouseEvent& event) conn.async_track_mouse_move(event.position()); } }); - // The active input tracking window is excluded here because we're sending the event to it + // The automatic cursor tracking window is excluded here because we're sending the event to it // in the next step. auto& window_stack = current_window_stack(); for_each_visible_window_from_front_to_back([&](Window& window) { - if (window.is_automatic_cursor_tracking() && &window != window_stack.active_input_tracking_window()) + if (window.is_automatic_cursor_tracking() && &window != window_stack.automatic_cursor_tracking_window()) deliver_mouse_event(window, event, false); return IterationDecision::Continue; }); - // 3. If there's an active input tracking window, all mouse events go there. + // 3. If there's an automatic cursor tracking window, all mouse events go there. // Tracking ends after all mouse buttons have been released. if (process_ongoing_active_input_mouse_event(event)) return; @@ -1615,7 +1615,7 @@ void WindowManager::process_key_event(KeyEvent& event) m_previous_event_was_super_keydown = true; } else if (m_previous_event_was_super_keydown) { m_previous_event_was_super_keydown = false; - if (!m_dnd_client && !current_window_stack().active_input_tracking_window() && event.type() == Event::KeyUp && event.key() == Key_Super) { + if (!m_dnd_client && !current_window_stack().automatic_cursor_tracking_window() && event.type() == Event::KeyUp && event.key() == Key_Super) { tell_wms_super_key_pressed(); return; } @@ -1891,7 +1891,7 @@ void WindowManager::set_active_window(Window* new_active_window, bool make_input if (auto* previously_active_window = window_stack.active_window()) { window_stack.set_active_window(nullptr); - window_stack.set_active_input_tracking_window(nullptr); + window_stack.set_automatic_cursor_tracking_window(nullptr); notify_previous_active_window(*previously_active_window); } @@ -2083,7 +2083,7 @@ void WindowManager::start_dnd_drag(ConnectionFromClient& client, String const& t m_dnd_overlay->set_enabled(true); m_dnd_mime_data = mime_data; Compositor::the().invalidate_cursor(); - current_window_stack().set_active_input_tracking_window(nullptr); + current_window_stack().set_automatic_cursor_tracking_window(nullptr); } void WindowManager::end_dnd_drag() @@ -2164,11 +2164,11 @@ void WindowManager::clear_theme_override() void WindowManager::did_popup_a_menu(Badge) { // Clear any ongoing input gesture - auto* active_input_tracking_window = current_window_stack().active_input_tracking_window(); - if (!active_input_tracking_window) + auto* automatic_cursor_tracking_window = current_window_stack().automatic_cursor_tracking_window(); + if (!automatic_cursor_tracking_window) return; - active_input_tracking_window->set_automatic_cursor_tracking_enabled(false); - current_window_stack().set_active_input_tracking_window(nullptr); + automatic_cursor_tracking_window->set_automatic_cursor_tracking_enabled(false); + current_window_stack().set_automatic_cursor_tracking_window(nullptr); } void WindowManager::minimize_windows(Window& window, bool minimized) diff --git a/Userland/Services/WindowServer/WindowStack.cpp b/Userland/Services/WindowServer/WindowStack.cpp index 22f5233d05..a080eef3c1 100644 --- a/Userland/Services/WindowServer/WindowStack.cpp +++ b/Userland/Services/WindowServer/WindowStack.cpp @@ -40,8 +40,8 @@ void WindowStack::remove(Window& window) m_active_window = nullptr; if (m_active_input_window == &window) m_active_input_window = nullptr; - if (m_active_input_tracking_window == &window) - m_active_input_tracking_window = nullptr; + if (m_automatic_cursor_tracking_window == &window) + m_automatic_cursor_tracking_window = nullptr; } void WindowStack::move_to_front(Window& window) @@ -102,7 +102,7 @@ void WindowStack::move_all_windows(WindowStack& new_window_stack, Vector hit_test(Gfx::IntPoint const&) const; @@ -84,7 +84,7 @@ public: private: WeakPtr m_active_window; WeakPtr m_active_input_window; - WeakPtr m_active_input_tracking_window; + WeakPtr m_automatic_cursor_tracking_window; Window::List m_windows; unsigned m_row { 0 };