xcb window painter.

2 files changed, 11 insertions, 3 deletions

diff --git a/include/cru/platform/gui/xcb/UiApplication.h b/include/cru/platform/gui/xcb/UiApplication.h
index 3fce8efa..2a9ea517 100644
--- a/include/cru/platform/gui/xcb/UiApplication.h
+++ b/include/cru/platform/gui/xcb/UiApplication.h
@@ -3,6 +3,7 @@
 #include "Base.h"
 
 #include <cru/base/platform/unix/EventLoop.h>
+#include <cru/platform/graphics/cairo/CairoGraphicsFactory.h>
 
 #include <xcb/xcb.h>
 #include <functional>
@@ -14,10 +15,13 @@ class XcbUiApplication : public XcbResource, public virtual IUiApplication {
   friend XcbWindow;
 
  public:
-  XcbUiApplication();
+  explicit XcbUiApplication(
+      graphics::cairo::CairoGraphicsFactory* cairo_factory = nullptr);
   ~XcbUiApplication();
 
  public:
+  graphics::cairo::CairoGraphicsFactory* GetCairoFactory();
+
   void CheckXcbConnectionError();
   xcb_connection_t* GetXcbConnection();
 
@@ -72,6 +76,9 @@ class XcbUiApplication : public XcbResource, public virtual IUiApplication {
   void UnregisterWindow(XcbWindow* window);
 
  private:
+  graphics::cairo::CairoGraphicsFactory* cairo_factory_;
+  bool release_cairo_factory_;
+
   xcb_connection_t* xcb_connection_;
   xcb_screen_t* screen_;
 
diff --git a/include/cru/platform/gui/xcb/Window.h b/include/cru/platform/gui/xcb/Window.h
index 62351645..e09fdbfb 100644
--- a/include/cru/platform/gui/xcb/Window.h
+++ b/include/cru/platform/gui/xcb/Window.h
@@ -3,6 +3,7 @@
 #include "../Window.h"
 #include "Base.h"
 
+#include <cairo.h>
 #include <xcb/xcb.h>
 #include <cstddef>
 #include <optional>
@@ -59,8 +60,7 @@ class XcbWindow : public XcbResource, public virtual INativeWindow {
 
   virtual void RequestRepaint() = 0;
 
-  // Remember to call EndDraw on return value and destroy it.
-  virtual std::unique_ptr<graphics::IPainter> BeginPaint() = 0;
+  std::unique_ptr<graphics::IPainter> BeginPaint() override;
 
   IEvent<std::nullptr_t>* CreateEvent() override;
   IEvent<std::nullptr_t>* DestroyEvent() override;
@@ -91,6 +91,7 @@ class XcbWindow : public XcbResource, public virtual INativeWindow {
  private:
   XcbUiApplication* application_;
   std::optional<xcb_window_t> xcb_window_;
+  cairo_surface_t *cairo_surface_;
   Size current_size_;
 
   Event<std::nullptr_t> create_event_;