Minor cosmetics.

[universe.git] / simple_window.h

diff --git a/simple_window.h b/simple_window.h
index 81c3116..5981aef 100644 (file)
--- a/simple_window.h
+++ b/simple_window.h
@@ -14,6 +14,11 @@ using namespace std;
 #include <X11/Xutil.h>
 #include <X11/XKBlib.h>
 
 #include <X11/Xutil.h>
 #include <X11/XKBlib.h>
 

+#ifdef CAIRO_SUPPORT
+#include <cairo.h>
+#include <cairo-xlib.h>
+#endif
+

 class SimpleEvent {
 public:
 
 class SimpleEvent {
 public:
 


@@ -32,10 +37,17 @@ public:
 
 class SimpleWindow {
   Display *_display;
 
 class SimpleWindow {
   Display *_display;

+  int _screen;
+  Visual *_visual;

   Window _window;
   Pixmap _pixmap;
   GC _gc;
 
   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;
 protected:
   int _red_mask, _green_mask, _blue_mask;
   int _red_shift, _green_shift, _blue_shift;


@@ -62,6 +74,10 @@ public:
 
   virtual int file_descriptor();
   virtual SimpleEvent event();
 
   virtual int file_descriptor();
   virtual SimpleEvent event();

+
+#ifdef CAIRO_SUPPORT
+  virtual cairo_t *get_cairo_context_resource();
+#endif

 };
 
 #endif
 };
 
 #endif