From 75756616f6ca8316595efc6be2655a3ef341091a Mon Sep 17 00:00:00 2001
From: Povilas Kanapickas <povilas@radix.lt>
Date: Thu, 13 Feb 2014 02:10:08 +0200
Subject: [PATCH 4/7] Wrap XCB device and XCB surface APIs

---
 cairomm/context.cc     |   9 ++-
 cairomm/filelist.am    |   4 ++
 cairomm/surface.cc     |   6 ++
 cairomm/xcb_device.cc  |  64 ++++++++++++++++++
 cairomm/xcb_device.h   | 112 ++++++++++++++++++++++++++++++
 cairomm/xcb_surface.cc |  86 +++++++++++++++++++++++
 cairomm/xcb_surface.h  | 180 +++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 460 insertions(+), 1 deletion(-)
 create mode 100644 cairomm/xcb_device.cc
 create mode 100644 cairomm/xcb_device.h
 create mode 100644 cairomm/xcb_surface.cc
 create mode 100644 cairomm/xcb_surface.h

diff --git a/cairomm/context.cc b/cairomm/context.cc
index bf70ef4..c9d1411 100644
--- a/cairomm/context.cc
+++ b/cairomm/context.cc
@@ -28,6 +28,7 @@
 #include <cairomm/surface.h>
 #include <cairomm/script_surface.h>
 #include <cairomm/scaledfont.h>
+#include <cairomm/xcb_surface.h>
 
 /* M_PI is defined in math.h in the case of Microsoft Visual C++ */
 #if defined(_MSC_VER)
@@ -852,11 +853,17 @@ RefPtr<Surface> get_surface_wrapper (cairo_surface_t* surface)
       return RefPtr<SvgSurface>(new SvgSurface(surface, false /* does not have reference */));
       break;
 #endif
+#if CAIRO_HAS_XCB_SURFACE
+    case CAIRO_SURFACE_TYPE_XCB:
+      return RefPtr<XcbSurface>(new XcbSurface(surface, false /* does not have reference */));
+      break;
+#endif
+
     // the following surfaces are not directly supported in cairomm yet
     case CAIRO_SURFACE_TYPE_DIRECTFB:
     case CAIRO_SURFACE_TYPE_OS2:
     case CAIRO_SURFACE_TYPE_BEOS:
-    case CAIRO_SURFACE_TYPE_XCB:
+
     default:
       return RefPtr<Surface>(new Surface(surface, false /* does not have reference */));
   }
diff --git a/cairomm/filelist.am b/cairomm/filelist.am
index ab26483..adbe3c5 100644
--- a/cairomm/filelist.am
+++ b/cairomm/filelist.am
@@ -22,6 +22,8 @@ cairomm_cc =				\
 	surface.cc			\
 	win32_font.cc			\
 	win32_surface.cc		\
+    xcb_device.cc      \
+    xcb_surface.cc      \
 	xlib_surface.cc
 
 cairomm_public_h =			\
@@ -45,6 +47,8 @@ cairomm_public_h =			\
 	types.h				\
 	win32_font.h			\
 	win32_surface.h			\
+    xcb_device.h       \
+    xcb_surface.h       \
 	xlib_surface.h
 
 cairomm_private_h =			\
diff --git a/cairomm/surface.cc b/cairomm/surface.cc
index 5697295..89ddade 100644
--- a/cairomm/surface.cc
+++ b/cairomm/surface.cc
@@ -18,6 +18,7 @@
 
 #include <cairomm/surface.h>
 #include <cairomm/script.h>
+#include <cairomm/xcb_device.h>
 #include <cairomm/private.h>
 
 namespace Cairo
@@ -255,6 +256,11 @@ RefPtr<Device> Surface::get_device()
       return RefPtr<Script>(new Script(d, true /* has reference */));
       break;
 #endif
+#if CAIRO_HAS_XCB_SURFACE
+    case CAIRO_SURFACE_TYPE_XCB:
+      return RefPtr<XcbDevice>(new XcbDevice(d, true /* has reference */));
+      break;
+#endif
     default:
       return RefPtr<Device>(new Device(d, true /* has reference */));
   }
diff --git a/cairomm/xcb_device.cc b/cairomm/xcb_device.cc
new file mode 100644
index 0000000..6418358
--- /dev/null
+++ b/cairomm/xcb_device.cc
@@ -0,0 +1,64 @@
+/* Copyright (C) 2014 The cairomm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <cairomm/xcb_device.h>
+#include <cairomm/private.h>
+
+namespace Cairo {
+
+#ifdef CAIRO_HAS_XCB_SURFACE
+
+XcbDevice::XcbDevice(cairo_device_t* cobject, bool has_reference) :
+  Device(cobject, has_reference)
+{}
+
+XcbDevice::~XcbDevice()
+{
+  // device is destroyed in base class
+}
+
+xcb_connection_t* XcbDevice::get_connection() const
+{
+  return cairo_xcb_device_get_connection(m_cobject);
+}
+
+void XcbDevice::debug_cap_xrender_version(int major_version, int minor_version)
+{
+  cairo_xcb_device_debug_cap_xrender_version(m_cobject, major_version,
+                                             minor_version);
+}
+
+void XcbDevice::debug_cap_xshm_version(int major_version, int minor_version)
+{
+  cairo_xcb_device_debug_cap_xshm_version(m_cobject, major_version,
+                                          minor_version);
+}
+
+int XcbDevice::debug_get_precision() const
+{
+  return cairo_xcb_device_debug_get_precision(m_cobject);
+}
+
+void XcbDevice::debug_set_precision(int precision)
+{
+  cairo_xcb_device_debug_set_precision(m_cobject, precision);
+}
+
+#endif // CAIRO_HAS_XCB_SURFACE
+
+} //namespace Cairo
diff --git a/cairomm/xcb_device.h b/cairomm/xcb_device.h
new file mode 100644
index 0000000..ea341b9
--- /dev/null
+++ b/cairomm/xcb_device.h
@@ -0,0 +1,112 @@
+/* Copyright (C) 2014 The cairomm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __CAIROMM_XCB_DEVICE_H
+#define __CAIROMM_XCB_DEVICE_H
+
+#include <cairomm/device.h>
+
+#if CAIRO_HAS_XCB_SURFACE
+#include <cairo-xcb.h>
+#endif
+
+namespace Cairo {
+
+#ifdef CAIRO_HAS_XCB_SURFACE
+
+/**
+ * An XCB device
+ *
+ * @since 1.12
+ */
+class XcbDevice : public Device {
+public:
+
+  /**
+   * Create a C++ wrapper for the C instance. This C++ instance should then be
+   * given to a RefPtr.
+   *
+   * @param cobject The C instance.
+   * @param has_reference whether we already have a reference. Otherwise, the
+   * constructor will take an extra reference.
+   *
+   * @since 1.12
+   */
+  explicit XcbDevice(cairo_device_t* cobject, bool has_reference = false);
+  virtual ~XcbDevice();
+
+  /**
+   * Returns the connection for the XCB device.
+   *
+   * @since 1.12
+   */
+  xcb_connection_t* get_connection() const;
+
+  /**
+   * Restricts all future XCB surfaces for this devices to the specified
+   * version of the RENDER extension. This function exists solely for debugging
+   * purpose. It let's you find out how Cairomm would behave with an older
+   * version of the RENDER extension.
+   *
+   * Use the special values -1 and -1 for disabling the RENDER extension.
+   *
+   * @param major_version major version to restrict to
+   * @param minor_version minor version to restrict to
+   *
+   * @since 1.12
+   */
+  void debug_cap_xrender_version(int major_version, int minor_version);
+
+  /**
+   * Restricts all future XCB surfaces for this devices to the specified
+   * version of the SHM extension. This function exists solely for debugging
+   * purpose. It let's you find out how cairo would behave with an older
+   * version of the SHM extension.
+   *
+   * Use the special values -1 and -1 for disabling the SHM extension.
+   *
+   * @param major_version major version to restrict to
+   * @param minor_version minor version to restrict to
+   *
+   * @since 1.12
+   */
+  void debug_cap_xshm_version(int major_version, int minor_version);
+
+  /**
+   * Returns the Xrender precision mode.
+   *
+   * @since 1.12
+   */
+  int debug_get_precision() const;
+
+  /**
+   * The Render extension supports two modes of precision when rendering
+   * trapezoids. Set the precision to the desired mode.
+   *
+   * @since 1.12
+   */
+  void debug_set_precision(int precision);
+
+};
+
+#endif // CAIRO_HAS_XCB_SURFACE
+
+} // namespace Cairo
+
+#endif //__CAIROMM_XCB_SURFACE_H
+
diff --git a/cairomm/xcb_surface.cc b/cairomm/xcb_surface.cc
new file mode 100644
index 0000000..81957d7
--- /dev/null
+++ b/cairomm/xcb_surface.cc
@@ -0,0 +1,86 @@
+/* Copyright (C) 2014 The cairomm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <cairomm/xcb_surface.h>
+#include <cairomm/private.h>
+
+namespace Cairo {
+
+#ifdef CAIRO_HAS_XCB_SURFACE
+
+XcbSurface::XcbSurface(cairo_surface_t* cobject, bool has_reference) :
+  Surface(cobject, has_reference)
+{}
+
+XcbSurface::~XcbSurface()
+{
+  // surface is destroyed in base class
+}
+
+void XcbSurface::set_size(int width, int height)
+{
+  cairo_xcb_surface_set_size(m_cobject, width, height);
+  check_status_and_throw_exception(cairo_surface_status(m_cobject));
+}
+
+void XcbSurface::set_drawable(xcb_drawable_t drawable, int width, int height)
+{
+  cairo_xcb_surface_set_drawable(m_cobject, drawable, width, height);
+  check_status_and_throw_exception(cairo_surface_status(m_cobject));
+}
+
+RefPtr<XcbSurface> XcbSurface::create(xcb_connection_t *connection,
+                                      xcb_drawable_t drawable,
+                                      xcb_visualtype_t *visual,
+                                      int width, int height)
+{
+  cairo_surface_t* cobject = cairo_xcb_surface_create(connection, drawable,
+                                                      visual, width, height);
+  check_status_and_throw_exception(cairo_surface_status(cobject));
+  return RefPtr<XcbSurface>(new XcbSurface(cobject, true /* has reference */));
+}
+
+RefPtr<XcbSurface> XcbSurface::create_for_bitmap(xcb_connection_t *connection,
+                                                 xcb_screen_t *screen,
+                                                 xcb_pixmap_t bitmap,
+                                                 int width, int height)
+{
+  cairo_surface_t* cobject =
+        cairo_xcb_surface_create_for_bitmap(connection, screen, bitmap,
+                                            width, height);
+  check_status_and_throw_exception(cairo_surface_status(cobject));
+  return RefPtr<XcbSurface>(new XcbSurface(cobject, true /* has reference */));
+}
+
+RefPtr<XcbSurface>
+  XcbSurface::create_with_xrender_format(xcb_connection_t *connection,
+                                         xcb_screen_t *screen,
+                                         xcb_drawable_t drawable,
+                                         xcb_render_pictforminfo_t *format,
+                                         int width, int height)
+{
+  cairo_surface_t* cobject =
+        cairo_xcb_surface_create_with_xrender_format(connection, screen, drawable,
+                                                     format, width, height);
+  check_status_and_throw_exception(cairo_surface_status(cobject));
+  return RefPtr<XcbSurface>(new XcbSurface(cobject, true /* has reference */));
+}
+
+#endif // CAIRO_HAS_XCB_SURFACE
+
+} //namespace Cairo
diff --git a/cairomm/xcb_surface.h b/cairomm/xcb_surface.h
new file mode 100644
index 0000000..a1ff2ad
--- /dev/null
+++ b/cairomm/xcb_surface.h
@@ -0,0 +1,180 @@
+/* Copyright (C) 2014 The cairomm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __CAIROMM_XCB_SURFACE_H
+#define __CAIROMM_XCB_SURFACE_H
+
+#include <cairomm/surface.h>
+
+#if CAIRO_HAS_XCB_SURFACE
+#include <cairo-xcb.h>
+#endif
+
+namespace Cairo {
+
+#ifdef CAIRO_HAS_XCB_SURFACE
+
+/**
+ * Creates an XCB surface that draws to the given drawable. The way that colors
+ * are represented in the drawable is specified by the provided visual.
+ *
+ * @note If drawable is a Window, then the function
+ * XcbSurface::set_size() must be called whenever the size of the window
+ * changes.
+ *
+ * When drawable is a Window containing child windows then drawing to the
+ * created surface will be clipped by those child windows. When the created
+ * surface is used as a source, the contents of the children will be included.
+ *
+ * @since 1.12
+ */
+class XcbSurface : public Surface {
+public:
+
+  /**
+   * Create a C++ wrapper for the C instance. This C++ instance should then be
+   * given to a RefPtr.
+   *
+   * @param cobject The C instance.
+   * @param has_reference whether we already have a reference. Otherwise, the
+   * constructor will take an extra reference.
+   *
+   * @since 1.12
+   */
+  explicit XcbSurface(cairo_surface_t* cobject, bool has_reference = false);
+  virtual ~XcbSurface();
+
+  /**
+   * Informs cairo of the new size of the XCB drawable underlying the surface.
+   * For a surface created for a window (rather than a pixmap), this function
+   * must be called each time the size of the window changes. (For a subwindow,
+   * you are normally resizing the window yourself, but for a toplevel window,
+   * it is necessary to listen for ConfigureNotify events.)
+   *
+   * A pixmap can never change size, so it is never necessary to call this
+   * function on a surface created for a pixmap.
+   *
+   * If Surface::flush() wasn't called, some pending operations might be
+   * discarded.
+   *
+   * Throws an exception on error.
+   *
+   * @param width the new width of the surface
+   * @param height the new height of the surface
+   *
+   * @since 1.12
+   */
+  void set_size(int width, int height);
+
+  /**
+   * Informs cairo of the new drawable and size of the XCB drawable underlying
+   * the surface.
+   *
+   * If Surface::flush() wasn't called, some pending operations might be
+   * discarded.
+   *
+   * Throws an exception on error.
+   *
+   * @param drawable the new drawable of the surface
+   * @param width the new width of the surface
+   * @param height the new height of the surface
+   *
+   * @since 1.12
+   */
+  void set_drawable(xcb_drawable_t drawable, int width, int height);
+
+  /**
+   * Creates an XCB surface that draws to the given drawable. The way that
+   * colors are represented in the drawable is specified by the provided
+   * visual.
+   *
+   * @note If drawable is a Window, then the function @c XcbSurface::set_size()
+   * must be called whenever the size of the window changes.
+   *
+   * When drawable is a Window containing child windows then drawing to the
+   * created surface will be clipped by those child windows. When the created
+   * surface is used as a source, the contents of the children will be
+   * included.
+   *
+   * @param connection an XCB connection
+   * @param drawable an XCB drawable
+   * @param visual the visual to use for drawing to drawable. The depth of the
+   *        visual must match the depth of the drawable. Currently, only
+   *        TrueColor visuals are fully supported.
+   * @param width the current width of drawable
+   * @param height the current height of drawable
+   *
+   * @since 1.12
+   */
+  static RefPtr<XcbSurface> create(xcb_connection_t *connection,
+                                   xcb_drawable_t drawable,
+                                   xcb_visualtype_t *visual, int width, int height);
+
+  /**
+   * Creates an XCB surface that draws to the given bitmap. This will be drawn
+   * to as a CAIRO_FORMAT_A1 object.
+   *
+   * @param connection an XCB connection
+   * @param screen the XCB screen associated with the bitmap
+   * @param bitmap an XCB drawable (a Pixmap with depth 1)
+   * @param width the current width of bitmap
+   * @param height the current height of bitmap
+   *
+   * @since 1.12
+   */
+  static RefPtr<XcbSurface> create_for_bitmap(xcb_connection_t *connection,
+                                              xcb_screen_t *screen,
+                                              xcb_pixmap_t bitmap,
+                                              int width, int height);
+
+  /**
+   * Creates an XCB surface that draws to the given drawable. The way that
+   * colors are represented in the drawable is specified by the provided
+   * picture format.
+   *
+   * @note If drawable is a Window, then the function @c XcbSurface::set_size()
+   * must be called whenever the size of the window changes.
+   *
+   * When drawable is a Window containing child windows then drawing to the
+   * created surface will be clipped by those child windows. When the created
+   * surface is used as a source, the contents of the children will be
+   * included.
+   *
+   * @param connection an XCB connection
+   * @param screen the XCB screen associated with the drawable
+   * @param drawable an XCB drawable
+   * @param format the picture format to use for drawing to drawable. The depth
+   *        of format mush match the depth of the drawable.
+   * @param width the current width of drawable
+   * @param height the current height of drawable
+   *
+   * @since 1.12
+   */
+  static RefPtr<XcbSurface>
+    create_with_xrender_format(xcb_connection_t *connection,
+                               xcb_screen_t *screen, xcb_drawable_t drawable,
+                               xcb_render_pictforminfo_t *format,
+                               int width, int height);
+};
+
+#endif // CAIRO_HAS_XCB_SURFACE
+
+} // namespace Cairo
+
+#endif //__CAIROMM_XCB_SURFACE_H
+
-- 
1.8.5.3