X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=simple_window.h;h=5981aef929c7e4f22493fa5ad3f866c969f2fc62;hb=804de9eaa678ecf50ab0ed0fbef027fe6dbce414;hp=37218ebef0795bc5c839022a267211746a25e902;hpb=3caf13085a6ae1ae41d6f489c8b69206b0ffa48d;p=universe.git

diff --git a/simple_window.h b/simple_window.h
index 37218eb..5981aef 100644
--- a/simple_window.h
+++ b/simple_window.h
@@ -12,6 +12,12 @@ using namespace std;
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/XKBlib.h>
+
+#ifdef CAIRO_SUPPORT
+#include <cairo.h>
+#include <cairo-xlib.h>
+#endif
 
 class SimpleEvent {
 public:
@@ -31,10 +37,17 @@ public:
 
 class SimpleWindow {
   Display *_display;
+  int _screen;
+  Visual *_visual;
   Window _window;
   Pixmap _pixmap;
   GC _gc;
 
+#ifdef CAIRO_SUPPORT
+  cairo_t *_cairo_context;
+  cairo_surface_t *_cairo_surface;
+#endif
+
 protected:
   int _red_mask, _green_mask, _blue_mask;
   int _red_shift, _green_shift, _blue_shift;
@@ -61,6 +74,10 @@ public:
 
   virtual int file_descriptor();
   virtual SimpleEvent event();
+
+#ifdef CAIRO_SUPPORT
+  virtual cairo_t *get_cairo_context_resource();
+#endif
 };
 
 #endif