LibGUI+WindowServer: Rename window "override cursor" to just "cursor"

Let's just say each window has a cursor, there's not really overriding
going on.

Applications/HexEditor/HexEditor.cpp

@@ -274,12 +274,12 @@ void HexEditor::mousemove_event(GUI::MouseEvent& event)
     auto text_end_x = text_start_x + (bytes_per_row() * character_width());
     auto text_end_y = text_start_y + 5 + (total_rows() * line_height());
 
-    window()->set_override_cursor(Gfx::StandardCursor::None);
+    window()->set_cursor(Gfx::StandardCursor::None);
     if ((absolute_x >= hex_start_x && absolute_x <= hex_end_x
             && absolute_y >= hex_start_y && absolute_y <= hex_end_y)
         || (absolute_x >= text_start_x && absolute_x <= text_end_x
             && absolute_y >= text_start_y && absolute_y <= text_end_y)) {
-        window()->set_override_cursor(Gfx::StandardCursor::IBeam);
+        window()->set_cursor(Gfx::StandardCursor::IBeam);
     }
 
     if (m_in_drag_select) {
@@ -585,5 +585,5 @@ void HexEditor::paint_event(GUI::PaintEvent& event)
 void HexEditor::leave_event(Core::Event&)
 {
     ASSERT(window());
-    window()->set_override_cursor(Gfx::StandardCursor::None);
+    window()->set_cursor(Gfx::StandardCursor::None);
 }

Applications/KeyboardMapper/KeyButton.cpp

@@ -81,16 +81,16 @@ void KeyButton::mousemove_event(GUI::MouseEvent& event)
     Gfx::IntRect c = { rect().x() + 7, rect().y() + 4, rect().width() - 14, rect().height() - 14 };
 
     if (c.contains(event.position())) {
-        window()->set_override_cursor(Gfx::StandardCursor::Hand);
+        window()->set_cursor(Gfx::StandardCursor::Hand);
         return;
     }
-    window()->set_override_cursor(Gfx::StandardCursor::Arrow);
+    window()->set_cursor(Gfx::StandardCursor::Arrow);
 
     AbstractButton::mousemove_event(event);
 }
 
 void KeyButton::leave_event(Core::Event& event)
 {
-    window()->set_override_cursor(Gfx::StandardCursor::Arrow);
+    window()->set_cursor(Gfx::StandardCursor::Arrow);
     AbstractButton::leave_event(event);
 }

Applications/PixelPaint/MoveTool.cpp

@@ -52,7 +52,7 @@ void MoveTool::on_mousedown(Layer& layer, GUI::MouseEvent& event, GUI::MouseEven
     m_layer_being_moved = layer;
     m_event_origin = image_event.position();
     m_layer_origin = layer.location();
-    m_editor->window()->set_override_cursor(Gfx::StandardCursor::Move);
+    m_editor->window()->set_cursor(Gfx::StandardCursor::Move);
 }
 
 void MoveTool::on_mousemove(Layer&, GUI::MouseEvent&, GUI::MouseEvent& image_event)
@@ -69,7 +69,7 @@ void MoveTool::on_mouseup(Layer&, GUI::MouseEvent& event, GUI::MouseEvent&)
     if (event.button() != GUI::MouseButton::Left)
         return;
     m_layer_being_moved = nullptr;
-    m_editor->window()->set_override_cursor(Gfx::StandardCursor::None);
+    m_editor->window()->set_cursor(Gfx::StandardCursor::None);
 }
 
 void MoveTool::on_keydown(GUI::KeyEvent& event)

Demos/WidgetGallery/main.cpp

@@ -515,59 +515,59 @@ int main(int argc, char** argv)
     auto& radio_cursor_none = cursor_group_box.add<GUI::RadioButton>("None");
     radio_cursor_none.set_checked(true);
     radio_cursor_none.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::None);
+        window->set_cursor(Gfx::StandardCursor::None);
     };
     auto& radio_cursor_arrow = cursor_group_box.add<GUI::RadioButton>("Arrow");
     radio_cursor_arrow.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::Arrow);
+        window->set_cursor(Gfx::StandardCursor::Arrow);
     };
     auto& radio_cursor_i_beam = cursor_group_box.add<GUI::RadioButton>("IBeam");
     radio_cursor_i_beam.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::IBeam);
+        window->set_cursor(Gfx::StandardCursor::IBeam);
     };
     auto& radio_cursor_resize_horizontal = cursor_group_box.add<GUI::RadioButton>("ResizeHorizontal");
     radio_cursor_resize_horizontal.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::ResizeHorizontal);
+        window->set_cursor(Gfx::StandardCursor::ResizeHorizontal);
     };
     auto& radio_cursor_resize_vertical = cursor_group_box.add<GUI::RadioButton>("ResizeVertical");
     radio_cursor_resize_vertical.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::ResizeVertical);
+        window->set_cursor(Gfx::StandardCursor::ResizeVertical);
     };
     auto& radio_cursor_resize_diagonal_tlbr = cursor_group_box.add<GUI::RadioButton>("ResizeDiagonalTLBR");
     radio_cursor_resize_diagonal_tlbr.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::ResizeDiagonalTLBR);
+        window->set_cursor(Gfx::StandardCursor::ResizeDiagonalTLBR);
     };
     auto& radio_cursor_resize_diagonal_bltr = cursor_group_box.add<GUI::RadioButton>("ResizeDiagonalBLTR");
     radio_cursor_resize_diagonal_bltr.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::ResizeDiagonalBLTR);
+        window->set_cursor(Gfx::StandardCursor::ResizeDiagonalBLTR);
     };
     auto& radio_cursor_resize_column = cursor_group_box.add<GUI::RadioButton>("ResizeColumn");
     radio_cursor_resize_column.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::ResizeColumn);
+        window->set_cursor(Gfx::StandardCursor::ResizeColumn);
     };
     auto& radio_cursor_resize_row = cursor_group_box.add<GUI::RadioButton>("ResizeRow");
     radio_cursor_resize_row.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::ResizeRow);
+        window->set_cursor(Gfx::StandardCursor::ResizeRow);
     };
     auto& radio_cursor_hand = cursor_group_box.add<GUI::RadioButton>("Hand");
     radio_cursor_hand.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::Hand);
+        window->set_cursor(Gfx::StandardCursor::Hand);
     };
     auto& radio_cursor_help = cursor_group_box.add<GUI::RadioButton>("Help");
     radio_cursor_help.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::Help);
+        window->set_cursor(Gfx::StandardCursor::Help);
     };
     auto& radio_cursor_drag = cursor_group_box.add<GUI::RadioButton>("Drag");
     radio_cursor_drag.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::Drag);
+        window->set_cursor(Gfx::StandardCursor::Drag);
     };
     auto& radio_cursor_move = cursor_group_box.add<GUI::RadioButton>("Move");
     radio_cursor_move.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::Move);
+        window->set_cursor(Gfx::StandardCursor::Move);
     };
     auto& radio_cursor_wait = cursor_group_box.add<GUI::RadioButton>("Wait");
     radio_cursor_wait.on_checked = [&](bool) {
-        window->set_override_cursor(Gfx::StandardCursor::Wait);
+        window->set_cursor(Gfx::StandardCursor::Wait);
     };
 
     app->set_menubar(move(menubar));

DevTools/HackStudio/Editor.cpp

@@ -209,9 +209,9 @@ void Editor::mousemove_event(GUI::MouseEvent& event)
     auto ruler_line_rect = ruler_content_rect(text_position.line());
     auto hovering_lines_ruler = (event.position().x() < ruler_line_rect.width());
     if (hovering_lines_ruler && !is_in_drag_select())
-        window()->set_override_cursor(Gfx::StandardCursor::Arrow);
+        window()->set_cursor(Gfx::StandardCursor::Arrow);
     else if (m_hovering_editor)
-        window()->set_override_cursor(m_hovering_link && m_holding_ctrl ? Gfx::StandardCursor::Hand : Gfx::StandardCursor::IBeam);
+        window()->set_cursor(m_hovering_link && m_holding_ctrl ? Gfx::StandardCursor::Hand : Gfx::StandardCursor::IBeam);
 
     for (auto& span : document().spans()) {
         if (span.range.contains(m_previous_text_position) && !span.range.contains(text_position)) {

DevTools/VisualBuilder/VBForm.cpp

@@ -497,22 +497,22 @@ void VBForm::set_cursor_type_from_grabber(Direction grabber)
     switch (grabber) {
     case Direction::Up:
     case Direction::Down:
-        window()->set_override_cursor(Gfx::StandardCursor::ResizeVertical);
+        window()->set_cursor(Gfx::StandardCursor::ResizeVertical);
         break;
     case Direction::Left:
     case Direction::Right:
-        window()->set_override_cursor(Gfx::StandardCursor::ResizeHorizontal);
+        window()->set_cursor(Gfx::StandardCursor::ResizeHorizontal);
         break;
     case Direction::UpLeft:
     case Direction::DownRight:
-        window()->set_override_cursor(Gfx::StandardCursor::ResizeDiagonalTLBR);
+        window()->set_cursor(Gfx::StandardCursor::ResizeDiagonalTLBR);
         break;
     case Direction::UpRight:
     case Direction::DownLeft:
-        window()->set_override_cursor(Gfx::StandardCursor::ResizeDiagonalBLTR);
+        window()->set_cursor(Gfx::StandardCursor::ResizeDiagonalBLTR);
         break;
     case Direction::None:
-        window()->set_override_cursor(Gfx::StandardCursor::None);
+        window()->set_cursor(Gfx::StandardCursor::None);
         break;
     }
 

Libraries/LibGUI/ColorInput.cpp

@@ -100,11 +100,11 @@ void ColorInput::mouseup_event(MouseEvent& event)
 void ColorInput::mousemove_event(MouseEvent& event)
 {
     if (color_rect().contains(event.position())) {
-        window()->set_override_cursor(Gfx::StandardCursor::Hand);
+        window()->set_cursor(Gfx::StandardCursor::Hand);
         event.accept();
         return;
     } else {
-        window()->set_override_cursor(Gfx::StandardCursor::IBeam);
+        window()->set_cursor(Gfx::StandardCursor::IBeam);
     }
 
     TextEditor::mousemove_event(event);

Libraries/LibGUI/HeaderView.cpp

@@ -180,7 +180,7 @@ void HeaderView::mousemove_event(MouseEvent& event)
         bool found_hovered_header = false;
         for (int i = 0; i < section_count; ++i) {
             if (section_resize_grabbable_rect(i).contains(event.position())) {
-                window()->set_override_cursor(Gfx::StandardCursor::ResizeColumn);
+                window()->set_cursor(Gfx::StandardCursor::ResizeColumn);
                 set_hovered_section(-1);
                 return;
             }
@@ -192,7 +192,7 @@ void HeaderView::mousemove_event(MouseEvent& event)
         if (!found_hovered_header)
             set_hovered_section(-1);
     }
-    window()->set_override_cursor(Gfx::StandardCursor::None);
+    window()->set_cursor(Gfx::StandardCursor::None);
 }
 
 void HeaderView::mouseup_event(MouseEvent& event)
@@ -200,7 +200,7 @@ void HeaderView::mouseup_event(MouseEvent& event)
     if (event.button() == MouseButton::Left) {
         if (m_in_section_resize) {
             if (!section_resize_grabbable_rect(m_resizing_section).contains(event.position()))
-                window()->set_override_cursor(Gfx::StandardCursor::None);
+                window()->set_cursor(Gfx::StandardCursor::None);
             m_in_section_resize = false;
             return;
         }
@@ -337,7 +337,7 @@ void HeaderView::leave_event(Core::Event& event)
 {
     Widget::leave_event(event);
     set_hovered_section(-1);
-    window()->set_override_cursor(Gfx::StandardCursor::None);
+    window()->set_cursor(Gfx::StandardCursor::None);
 }
 
 Gfx::TextAlignment HeaderView::section_alignment(int section) const

Libraries/LibGUI/ResizeCorner.cpp

@@ -112,13 +112,13 @@ void ResizeCorner::mousedown_event(MouseEvent& event)
 
 void ResizeCorner::enter_event(Core::Event& event)
 {
-    window()->set_override_cursor(Gfx::StandardCursor::ResizeDiagonalTLBR);
+    window()->set_cursor(Gfx::StandardCursor::ResizeDiagonalTLBR);
     Widget::enter_event(event);
 }
 
 void ResizeCorner::leave_event(Core::Event& event)
 {
-    window()->set_override_cursor(Gfx::StandardCursor::None);
+    window()->set_cursor(Gfx::StandardCursor::None);
     Widget::leave_event(event);
 }
 

Libraries/LibGUI/Splitter.cpp

@@ -62,12 +62,12 @@ void Splitter::override_cursor(bool do_override)
 {
     if (do_override) {
         if (!m_overriding_cursor) {
-            window()->set_override_cursor(m_orientation == Orientation::Horizontal ? Gfx::StandardCursor::ResizeColumn : Gfx::StandardCursor::ResizeRow);
+            window()->set_cursor(m_orientation == Orientation::Horizontal ? Gfx::StandardCursor::ResizeColumn : Gfx::StandardCursor::ResizeRow);
             m_overriding_cursor = true;
         }
     } else {
         if (m_overriding_cursor) {
-            window()->set_override_cursor(Gfx::StandardCursor::None);
+            window()->set_cursor(Gfx::StandardCursor::None);
             m_overriding_cursor = false;
         }
     }
@@ -198,7 +198,7 @@ void Splitter::mouseup_event(MouseEvent& event)
     m_first_resizee = nullptr;
     m_second_resizee = nullptr;
     if (!rect().contains(event.position()))
-        window()->set_override_cursor(Gfx::StandardCursor::None);
+        window()->set_cursor(Gfx::StandardCursor::None);
 }
 
 }

Libraries/LibGUI/TextEditor.cpp

@@ -1343,7 +1343,7 @@ void TextEditor::enter_event(Core::Event&)
 {
     ASSERT(window());
     if (!is_displayonly())
-        window()->set_override_cursor(Gfx::StandardCursor::IBeam);
+        window()->set_cursor(Gfx::StandardCursor::IBeam);
 
     m_automatic_selection_scroll_timer->stop();
 }
@@ -1351,7 +1351,7 @@ void TextEditor::enter_event(Core::Event&)
 void TextEditor::leave_event(Core::Event&)
 {
     ASSERT(window());
-    window()->set_override_cursor(Gfx::StandardCursor::None);
+    window()->set_cursor(Gfx::StandardCursor::None);
 
     if (m_in_drag_select)
         m_automatic_selection_scroll_timer->start();

Libraries/LibGUI/Window.cpp

@@ -93,7 +93,7 @@ void Window::show()
 
     auto* parent_window = find_parent_window();
 
-    m_override_cursor = Gfx::StandardCursor::None;
+    m_cursor = Gfx::StandardCursor::None;
     auto response = WindowServerConnection::the().send_sync<Messages::WindowServer::CreateWindow>(
         m_rect_when_windowless,
         !m_moved_by_client,
@@ -138,7 +138,7 @@ void Window::server_did_destroy()
     m_pending_paint_event_rects.clear();
     m_back_bitmap = nullptr;
     m_front_bitmap = nullptr;
-    m_override_cursor = Gfx::StandardCursor::None;
+    m_cursor = Gfx::StandardCursor::None;
 }
 
 void Window::hide()
@@ -226,25 +226,25 @@ void Window::set_window_type(WindowType window_type)
     m_window_type = window_type;
 }
 
-void Window::set_override_cursor(Gfx::StandardCursor cursor)
+void Window::set_cursor(Gfx::StandardCursor cursor)
 {
     if (!is_visible())
         return;
-    if (!m_custom_cursor && m_override_cursor == cursor)
+    if (!m_custom_cursor && m_cursor == cursor)
         return;
-    WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowOverrideCursor>(m_window_id, (u32)cursor);
-    m_override_cursor = cursor;
+    WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowCursor>(m_window_id, (u32)cursor);
+    m_cursor = cursor;
     m_custom_cursor = nullptr;
 }
 
-void Window::set_override_cursor(const Gfx::Bitmap& cursor)
+void Window::set_cursor(const Gfx::Bitmap& cursor)
 {
     if (!is_visible())
         return;
     if (&cursor == m_custom_cursor.ptr())
         return;
     m_custom_cursor = &cursor;
-    WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowCustomOverrideCursor>(m_window_id, m_custom_cursor->to_shareable_bitmap(WindowServerConnection::the().server_pid()));
+    WindowServerConnection::the().send_sync<Messages::WindowServer::SetWindowCustomCursor>(m_window_id, m_custom_cursor->to_shareable_bitmap(WindowServerConnection::the().server_pid()));
 }
 
 void Window::handle_drop_event(DropEvent& event)

Libraries/LibGUI/Window.h

@@ -168,8 +168,8 @@ public:
     void set_no_resize_aspect_ratio() { set_resize_aspect_ratio({}); }
     void set_resize_aspect_ratio(const Optional<Gfx::IntSize>& ratio);
 
-    void set_override_cursor(Gfx::StandardCursor);
-    void set_override_cursor(const Gfx::Bitmap&);
+    void set_cursor(Gfx::StandardCursor);
+    void set_cursor(const Gfx::Bitmap&);
 
     void set_icon(const Gfx::Bitmap*);
     void apply_icon();
@@ -241,7 +241,7 @@ private:
     Gfx::IntSize m_base_size;
     Color m_background_color { Color::WarmGray };
     WindowType m_window_type { WindowType::Normal };
-    Gfx::StandardCursor m_override_cursor { Gfx::StandardCursor::None };
+    Gfx::StandardCursor m_cursor { Gfx::StandardCursor::None };
     bool m_is_active { false };
     bool m_is_active_input { false };
     bool m_has_alpha_channel { false };

Libraries/LibVT/TerminalWidget.cpp

@@ -629,9 +629,9 @@ void TerminalWidget::mousemove_event(GUI::MouseEvent& event)
             m_hovered_href = {};
         }
         if (!m_hovered_href.is_empty())
-            window()->set_override_cursor(Gfx::StandardCursor::Hand);
+            window()->set_cursor(Gfx::StandardCursor::Hand);
         else
-            window()->set_override_cursor(Gfx::StandardCursor::None);
+            window()->set_cursor(Gfx::StandardCursor::None);
         update();
     }
 
@@ -667,7 +667,7 @@ void TerminalWidget::mousemove_event(GUI::MouseEvent& event)
 
 void TerminalWidget::leave_event(Core::Event&)
 {
-    window()->set_override_cursor(Gfx::StandardCursor::None);
+    window()->set_cursor(Gfx::StandardCursor::None);
     bool should_update = !m_hovered_href.is_empty();
     m_hovered_href = {};
     m_hovered_href_id = {};

Libraries/LibWeb/InProcessWebView.cpp

@@ -153,7 +153,7 @@ void InProcessWebView::page_did_change_selection()
 void InProcessWebView::page_did_request_cursor_change(Gfx::StandardCursor cursor)
 {
     if (window())
-        window()->set_override_cursor(cursor);
+        window()->set_cursor(cursor);
 }
 
 void InProcessWebView::page_did_request_context_menu(const Gfx::IntPoint& content_position)
@@ -358,7 +358,7 @@ void InProcessWebView::load_html(const StringView& html, const URL& url)
 bool InProcessWebView::load(const URL& url)
 {
     if (window())
-        window()->set_override_cursor(Gfx::StandardCursor::None);
+        window()->set_cursor(Gfx::StandardCursor::None);
 
     return page().main_frame().loader().load(url, FrameLoader::Type::Navigation);
 }
@@ -378,7 +378,7 @@ LayoutDocument* InProcessWebView::layout_root()
 void InProcessWebView::page_did_request_scroll_into_view(const Gfx::IntRect& rect)
 {
     scroll_into_view(rect, true, true);
-    window()->set_override_cursor(Gfx::StandardCursor::None);
+    window()->set_cursor(Gfx::StandardCursor::None);
 }
 
 void InProcessWebView::load_empty_document()

Libraries/LibWeb/OutOfProcessWebView.cpp

@@ -138,7 +138,7 @@ void OutOfProcessWebView::notify_server_did_request_scroll_into_view(Badge<WebCo
 void OutOfProcessWebView::notify_server_did_hover_link(Badge<WebContentClient>, const URL& url)
 {
     if (window())
-        window()->set_override_cursor(Gfx::StandardCursor::Hand);
+        window()->set_cursor(Gfx::StandardCursor::Hand);
     if (on_link_hover)
         on_link_hover(url);
 }
@@ -146,7 +146,7 @@ void OutOfProcessWebView::notify_server_did_hover_link(Badge<WebContentClient>,
 void OutOfProcessWebView::notify_server_did_unhover_link(Badge<WebContentClient>)
 {
     if (window())
-        window()->set_override_cursor(Gfx::StandardCursor::None);
+        window()->set_cursor(Gfx::StandardCursor::None);
     if (on_link_hover)
         on_link_hover({});
 }

Services/WindowServer/ClientConnection.cpp

@@ -602,36 +602,36 @@ OwnPtr<Messages::WindowServer::SetGlobalCursorTrackingResponse> ClientConnection
     return make<Messages::WindowServer::SetGlobalCursorTrackingResponse>();
 }
 
-OwnPtr<Messages::WindowServer::SetWindowOverrideCursorResponse> ClientConnection::handle(const Messages::WindowServer::SetWindowOverrideCursor& message)
+OwnPtr<Messages::WindowServer::SetWindowCursorResponse> ClientConnection::handle(const Messages::WindowServer::SetWindowCursor& message)
 {
     auto it = m_windows.find(message.window_id());
     if (it == m_windows.end()) {
-        did_misbehave("SetWindowOverrideCursor: Bad window ID");
+        did_misbehave("SetWindowCursor: Bad window ID");
         return nullptr;
     }
     auto& window = *(*it).value;
-    window.set_override_cursor(Cursor::create((Gfx::StandardCursor)message.cursor_type()));
+    window.set_cursor(Cursor::create((Gfx::StandardCursor)message.cursor_type()));
     Compositor::the().invalidate_cursor();
-    return make<Messages::WindowServer::SetWindowOverrideCursorResponse>();
+    return make<Messages::WindowServer::SetWindowCursorResponse>();
 }
 
-OwnPtr<Messages::WindowServer::SetWindowCustomOverrideCursorResponse> ClientConnection::handle(const Messages::WindowServer::SetWindowCustomOverrideCursor& message)
+OwnPtr<Messages::WindowServer::SetWindowCustomCursorResponse> ClientConnection::handle(const Messages::WindowServer::SetWindowCustomCursor& message)
 {
     auto it = m_windows.find(message.window_id());
     if (it == m_windows.end()) {
-        did_misbehave("SetWindowCustomOverrideCursor: Bad window ID");
+        did_misbehave("SetWindowCustomCursor: Bad window ID");
         return nullptr;
     }
 
     auto& window = *(*it).value;
     if (!message.cursor().is_valid()) {
-        did_misbehave("SetWindowCustomOverrideCursor: Bad cursor");
+        did_misbehave("SetWindowCustomCursor: Bad cursor");
         return nullptr;
     }
 
-    window.set_override_cursor(Cursor::create(*message.cursor().bitmap()));
+    window.set_cursor(Cursor::create(*message.cursor().bitmap()));
     Compositor::the().invalidate_cursor();
-    return make<Messages::WindowServer::SetWindowCustomOverrideCursorResponse>();
+    return make<Messages::WindowServer::SetWindowCustomCursorResponse>();
 }
 
 OwnPtr<Messages::WindowServer::SetWindowHasAlphaChannelResponse> ClientConnection::handle(const Messages::WindowServer::SetWindowHasAlphaChannel& message)
@@ -880,7 +880,7 @@ void ClientConnection::set_unresponsive(bool unresponsive)
         auto& window = *it.value;
         window.invalidate();
         if (unresponsive)
-            window.set_override_cursor(WindowManager::the().wait_cursor());
+            window.set_cursor(WindowManager::the().wait_cursor());
     }
     Compositor::the().invalidate_cursor();
 }

Services/WindowServer/ClientConnection.h

@@ -127,8 +127,8 @@ private:
     virtual OwnPtr<Messages::WindowServer::SetWallpaperModeResponse> handle(const Messages::WindowServer::SetWallpaperMode&) override;
     virtual OwnPtr<Messages::WindowServer::GetWallpaperResponse> handle(const Messages::WindowServer::GetWallpaper&) override;
     virtual OwnPtr<Messages::WindowServer::SetResolutionResponse> handle(const Messages::WindowServer::SetResolution&) override;
-    virtual OwnPtr<Messages::WindowServer::SetWindowOverrideCursorResponse> handle(const Messages::WindowServer::SetWindowOverrideCursor&) override;
-    virtual OwnPtr<Messages::WindowServer::SetWindowCustomOverrideCursorResponse> handle(const Messages::WindowServer::SetWindowCustomOverrideCursor&) override;
+    virtual OwnPtr<Messages::WindowServer::SetWindowCursorResponse> handle(const Messages::WindowServer::SetWindowCursor&) override;
+    virtual OwnPtr<Messages::WindowServer::SetWindowCustomCursorResponse> handle(const Messages::WindowServer::SetWindowCustomCursor&) override;
     virtual OwnPtr<Messages::WindowServer::PopupMenuResponse> handle(const Messages::WindowServer::PopupMenu&) override;
     virtual OwnPtr<Messages::WindowServer::DismissMenuResponse> handle(const Messages::WindowServer::DismissMenu&) override;
     virtual OwnPtr<Messages::WindowServer::SetWindowIconBitmapResponse> handle(const Messages::WindowServer::SetWindowIconBitmap&) override;

Services/WindowServer/Window.h

@@ -218,8 +218,8 @@ public:
 
     void set_default_icon();
 
-    const Cursor* override_cursor() const { return m_override_cursor.ptr(); }
-    void set_override_cursor(RefPtr<Cursor>&& cursor) { m_override_cursor = move(cursor); }
+    const Cursor* cursor() const { return m_cursor.ptr(); }
+    void set_cursor(RefPtr<Cursor> cursor) { m_cursor = move(cursor); }
 
     void request_update(const Gfx::IntRect&, bool ignore_occlusion = false);
     Gfx::DisjointRectSet take_pending_paint_rects() { return move(m_pending_paint_rects); }
@@ -340,7 +340,7 @@ private:
     Gfx::IntSize m_size_increment;
     Gfx::IntSize m_base_size;
     NonnullRefPtr<Gfx::Bitmap> m_icon;
-    RefPtr<Cursor> m_override_cursor;
+    RefPtr<Cursor> m_cursor;
     WindowFrame m_frame;
     unsigned m_wm_event_mask { 0 };
     Gfx::DisjointRectSet m_pending_paint_rects;

Services/WindowServer/WindowManager.cpp

@@ -1304,8 +1304,8 @@ const Cursor& WindowManager::active_cursor() const
         }
     }
 
-    if (m_hovered_window && m_hovered_window->override_cursor())
-        return *m_hovered_window->override_cursor();
+    if (m_hovered_window && m_hovered_window->cursor())
+        return *m_hovered_window->cursor();
 
     return *m_arrow_cursor;
 }

Services/WindowServer/WindowServer.ipc

@@ -91,8 +91,8 @@ endpoint WindowServer = 2
     SetWindowIconBitmap(i32 window_id, Gfx::ShareableBitmap icon) => ()
 
     GetWallpaper() => (String path)
-    SetWindowOverrideCursor(i32 window_id, i32 cursor_type) => ()
-    SetWindowCustomOverrideCursor(i32 window_id, Gfx::ShareableBitmap cursor) => ()
+    SetWindowCursor(i32 window_id, i32 cursor_type) => ()
+    SetWindowCustomCursor(i32 window_id, Gfx::ShareableBitmap cursor) => ()
 
     StartDrag([UTF8] String text, String data_type, String data, i32 bitmap_id, Gfx::IntSize bitmap_size) => (bool started)