From 57763bb30b86737810bdd8458ba62b378481b994 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Thu, 25 Sep 2025 01:27:40 +0800 Subject: Impl xcb window set cursor. --- src/platform/gui/xcb/Window.cpp | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'src/platform/gui/xcb/Window.cpp') diff --git a/src/platform/gui/xcb/Window.cpp b/src/platform/gui/xcb/Window.cpp index 863738f1..4de7a6d3 100644 --- a/src/platform/gui/xcb/Window.cpp +++ b/src/platform/gui/xcb/Window.cpp @@ -3,11 +3,13 @@ #include "cru/base/Guard.h" #include "cru/platform/Check.h" #include "cru/platform/GraphicsBase.h" +#include "cru/platform/graphics/NullPainter.h" #include "cru/platform/graphics/Painter.h" #include "cru/platform/graphics/cairo/CairoPainter.h" #include "cru/platform/gui/Base.h" #include "cru/platform/gui/Keyboard.h" #include "cru/platform/gui/Window.h" +#include "cru/platform/gui/xcb/Cursor.h" #include "cru/platform/gui/xcb/Keyboard.h" #include "cru/platform/gui/xcb/UiApplication.h" @@ -274,7 +276,12 @@ bool XcbWindow::ReleaseMouse() { return true; } -void XcbWindow::SetCursor(std::shared_ptr cursor) { NotImplemented(); } +void XcbWindow::SetCursor(std::shared_ptr cursor) { + if (!xcb_window_) return; + auto xcb_cursor = CheckPlatform(cursor, GetPlatformId()); + cursor_ = xcb_cursor; + DoSetCursor(*xcb_window_, xcb_cursor.get()); +} void XcbWindow::SetToForeground() { SetVisibility(WindowVisibilityType::Show); @@ -291,7 +298,9 @@ void XcbWindow::RequestRepaint() { } std::unique_ptr XcbWindow::BeginPaint() { - assert(cairo_surface_); + if (!xcb_window_.has_value()) { + return std::make_unique(); + } auto factory = application_->GetCairoFactory(); cairo_t *cairo = cairo_create(cairo_surface_); @@ -377,6 +386,7 @@ xcb_window_t XcbWindow::DoCreateWindow() { DoSetStyleFlags(window); DoSetParent(window); + DoSetCursor(window, cursor_.get()); xcb_visualtype_t *visual_type; @@ -654,6 +664,13 @@ void XcbWindow::DoSetClientRect(xcb_window_t window, const Rect &rect) { values); } +void XcbWindow::DoSetCursor(xcb_window_t window, XcbCursor *cursor) { + std::uint32_t values[]{cursor ? cursor->GetXcbCursor() : XCB_CURSOR_NONE}; + xcb_change_window_attributes(application_->GetXcbConnection(), window, + XCB_CW_CURSOR, values); + application_->XcbFlush(); +} + void *XcbWindow::XcbGetProperty(xcb_window_t window, xcb_atom_t property, xcb_atom_t type, std::uint32_t offset, std::uint32_t length, -- cgit v1.2.3