From 4122cffc95a05ecc2a136ce30bf64f3492812443 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Thu, 11 Sep 2025 22:19:32 +0800 Subject: xcb window style flag. --- include/cru/platform/gui/xcb/UiApplication.h | 8 ++++++++ include/cru/platform/gui/xcb/Window.h | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'include/cru/platform/gui') diff --git a/include/cru/platform/gui/xcb/UiApplication.h b/include/cru/platform/gui/xcb/UiApplication.h index 2a9ea517..87fd1063 100644 --- a/include/cru/platform/gui/xcb/UiApplication.h +++ b/include/cru/platform/gui/xcb/UiApplication.h @@ -7,6 +7,8 @@ #include #include +#include +#include namespace cru::platform::gui::xcb { class XcbWindow; @@ -28,6 +30,11 @@ class XcbUiApplication : public XcbResource, public virtual IUiApplication { // This API is weird, but before we have correct screen API, we still use it. xcb_screen_t* GetFirstXcbScreen(); + xcb_atom_t GetOrCreateXcbAtom(std::string name); + xcb_atom_t GetXcbAtom_NET_WM_WINDOW_TYPE(); + xcb_atom_t GetXcbAtom_NET_WM_WINDOW_TYPE_NORMAL(); + xcb_atom_t GetXcbAtom_NET_WM_WINDOW_TYPE_UTILITY(); + public: int Run() override; @@ -81,6 +88,7 @@ class XcbUiApplication : public XcbResource, public virtual IUiApplication { xcb_connection_t* xcb_connection_; xcb_screen_t* screen_; + std::unordered_map xcb_atom_; cru::platform::unix::UnixEventLoop event_loop_; std::vector> quit_handlers_; diff --git a/include/cru/platform/gui/xcb/Window.h b/include/cru/platform/gui/xcb/Window.h index f9fbf735..43cd3b53 100644 --- a/include/cru/platform/gui/xcb/Window.h +++ b/include/cru/platform/gui/xcb/Window.h @@ -23,8 +23,8 @@ class XcbWindow : public XcbResource, public virtual INativeWindow { INativeWindow* GetParent() override; void SetParent(INativeWindow* parent) override; - virtual WindowStyleFlag GetStyleFlag() = 0; - virtual void SetStyleFlag(WindowStyleFlag flag) = 0; + WindowStyleFlag GetStyleFlag() override; + void SetStyleFlag(WindowStyleFlag flag) override; virtual String GetTitle() = 0; virtual void SetTitle(String title) = 0; @@ -88,11 +88,15 @@ class XcbWindow : public XcbResource, public virtual INativeWindow { void HandleEvent(xcb_generic_event_t* event); static std::optional GetEventWindow(xcb_generic_event_t* event); + void DoSetParent(xcb_window_t window); + void DoSetStyleFlags(xcb_window_t window); + private: XcbUiApplication* application_; std::optional xcb_window_; cairo_surface_t* cairo_surface_; Size current_size_; + WindowStyleFlag style_; XcbWindow* parent_; -- cgit v1.2.3