diff options
| -rw-r--r-- | include/cru/platform/gui/xcb/UiApplication.h | 15 | ||||
| -rw-r--r-- | include/cru/platform/gui/xcb/Window.h | 64 | ||||
| -rw-r--r-- | src/platform/gui/xcb/UiApplication.cpp | 34 |
3 files changed, 104 insertions, 9 deletions
diff --git a/include/cru/platform/gui/xcb/UiApplication.h b/include/cru/platform/gui/xcb/UiApplication.h index af1c40f4..fc20a4e2 100644 --- a/include/cru/platform/gui/xcb/UiApplication.h +++ b/include/cru/platform/gui/xcb/UiApplication.h @@ -8,6 +8,8 @@ #include <functional> namespace cru::platform::gui::xcb { +class XcbWindow; + class XcbUiApplication : public XcbResource, public virtual IUiApplication { public: XcbUiApplication(); @@ -17,12 +19,12 @@ class XcbUiApplication : public XcbResource, public virtual IUiApplication { int Run() override; - virtual void RequestQuit(int quit_code) = 0; + void RequestQuit(int quit_code) override; void AddOnQuitHandler(std::function<void()> handler) override; - virtual bool IsQuitOnAllWindowClosed() = 0; - virtual void SetQuitOnAllWindowClosed(bool quit_on_all_window_closed) = 0; + bool IsQuitOnAllWindowClosed() override; + void SetQuitOnAllWindowClosed(bool quit_on_all_window_closed) override; long long SetImmediate(std::function<void()> action) override; long long SetTimeout(std::chrono::milliseconds milliseconds, @@ -55,12 +57,17 @@ class XcbUiApplication : public XcbResource, public virtual IUiApplication { virtual std::optional<std::vector<String>> ShowOpenDialog( OpenDialogOptions options); + private: + void HandleXEvents(); + private: xcb_connection_t* xcb_; xcb_screen_t* screen_; cru::platform::unix::UnixEventLoop event_loop_; std::vector<std::function<void()>> quit_handlers_; - int exit_code_; + + bool is_quit_on_all_window_closed_; + std::vector<XcbWindow*> windows_; }; } // namespace cru::platform::gui::xcb diff --git a/include/cru/platform/gui/xcb/Window.h b/include/cru/platform/gui/xcb/Window.h index 94f5d350..8d5c629e 100644 --- a/include/cru/platform/gui/xcb/Window.h +++ b/include/cru/platform/gui/xcb/Window.h @@ -5,6 +5,68 @@ namespace cru::platform::gui::xcb { class XcbWindow : public XcbResource, public virtual INativeWindow { + public: + virtual void Close() = 0; + virtual INativeWindow* GetParent() = 0; + virtual void SetParent(INativeWindow* parent) = 0; + + virtual WindowStyleFlag GetStyleFlag() = 0; + virtual void SetStyleFlag(WindowStyleFlag flag) = 0; + + virtual String GetTitle() = 0; + virtual void SetTitle(String title) = 0; + + virtual WindowVisibilityType GetVisibility() = 0; + virtual void SetVisibility(WindowVisibilityType visibility) = 0; + + virtual Size GetClientSize() = 0; + virtual void SetClientSize(const Size& size) = 0; + + virtual Rect GetClientRect() = 0; + virtual void SetClientRect(const Rect& rect) = 0; + + // Get the rect of the window containing frame. + // The lefttop of the rect is relative to screen lefttop. + virtual Rect GetWindowRect() = 0; + + // Set the rect of the window containing frame. + // The lefttop of the rect is relative to screen lefttop. + virtual void SetWindowRect(const Rect& rect) = 0; + + virtual bool RequestFocus() = 0; + + // Relative to client lefttop. + virtual Point GetMousePosition() = 0; + + virtual bool CaptureMouse() = 0; + virtual bool ReleaseMouse() = 0; + + virtual void SetCursor(std::shared_ptr<ICursor> cursor) = 0; + + virtual void SetToForeground() = 0; + + virtual void RequestRepaint() = 0; + + // Remember to call EndDraw on return value and destroy it. + virtual std::unique_ptr<graphics::IPainter> BeginPaint() = 0; + + virtual IEvent<std::nullptr_t>* CreateEvent() = 0; + virtual IEvent<std::nullptr_t>* DestroyEvent() = 0; + virtual IEvent<std::nullptr_t>* PaintEvent() = 0; + + virtual IEvent<WindowVisibilityType>* VisibilityChangeEvent() = 0; + virtual IEvent<Size>* ResizeEvent() = 0; + virtual IEvent<FocusChangeType>* FocusEvent() = 0; + + virtual IEvent<MouseEnterLeaveType>* MouseEnterLeaveEvent() = 0; + virtual IEvent<Point>* MouseMoveEvent() = 0; + virtual IEvent<NativeMouseButtonEventArgs>* MouseDownEvent() = 0; + virtual IEvent<NativeMouseButtonEventArgs>* MouseUpEvent() = 0; + virtual IEvent<NativeMouseWheelEventArgs>* MouseWheelEvent() = 0; + virtual IEvent<NativeKeyEventArgs>* KeyDownEvent() = 0; + virtual IEvent<NativeKeyEventArgs>* KeyUpEvent() = 0; + + virtual IInputMethodContext* GetInputMethodContext() = 0; }; -} // namespace cru::platform::gui::x11 +} // namespace cru::platform::gui::xcb diff --git a/src/platform/gui/xcb/UiApplication.cpp b/src/platform/gui/xcb/UiApplication.cpp index 17111e0c..d64fc9da 100644 --- a/src/platform/gui/xcb/UiApplication.cpp +++ b/src/platform/gui/xcb/UiApplication.cpp @@ -1,13 +1,20 @@ #include <cru/platform/gui/xcb/UiApplication.h> +#include <poll.h> #include <xcb/xcb.h> +#include "cru/base/Base.h" namespace cru::platform::gui::xcb { -XcbUiApplication::XcbUiApplication() : exit_code_(0) { +XcbUiApplication::XcbUiApplication() { + is_quit_on_all_window_closed_ = false; + int screen_num; xcb_connection_t *connection = xcb_connect(NULL, &screen_num); this->CheckXcbConnectionError(); + event_loop_.SetPoll(xcb_get_file_descriptor(connection), POLLIN, + [this](auto) { HandleXEvents(); }); + const xcb_setup_t *setup = xcb_get_setup(connection); xcb_screen_iterator_t iter = xcb_setup_roots_iterator(setup); this->screen_ = iter.data; @@ -22,20 +29,32 @@ void XcbUiApplication::CheckXcbConnectionError() { } int XcbUiApplication::Run() { - - // TODO: A Big Implement. + auto exit_code = event_loop_.Run(); for (const auto &handler : this->quit_handlers_) { handler(); } - return exit_code_; + return exit_code; +} + +void XcbUiApplication::RequestQuit(int quit_code) { + event_loop_.RequestQuit(quit_code); } void XcbUiApplication::AddOnQuitHandler(std::function<void()> handler) { this->quit_handlers_.push_back(std::move(handler)); } +bool XcbUiApplication::IsQuitOnAllWindowClosed() { + return is_quit_on_all_window_closed_; +} + +void XcbUiApplication::SetQuitOnAllWindowClosed( + bool quit_on_all_window_closed) { + is_quit_on_all_window_closed_ = quit_on_all_window_closed; +} + long long XcbUiApplication::SetImmediate(std::function<void()> action) { return event_loop_.SetImmediate(std::move(action)); } @@ -53,4 +72,11 @@ long long XcbUiApplication::SetInterval(std::chrono::milliseconds milliseconds, void XcbUiApplication::CancelTimer(long long id) { return event_loop_.CancelTimer(static_cast<int>(id)); } + +void XcbUiApplication::HandleXEvents() { + xcb_generic_event_t *event; + while ((event = xcb_poll_for_event(xcb_))) { + NotImplemented(); + } +} } // namespace cru::platform::gui::xcb |