cairo 1.6.1-x86-mswin32 → 1.7.0-x86-mswin32

data/src/rb_cairo_surface.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-04-16 14:48:23 $
+ * $Date: 2008-08-16 12:52:17 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -15,9 +15,34 @@
 #include "rb_cairo.h"
 #include "rb_cairo_private.h"
 
-#include "rubyio.h"
+#ifdef HAVE_RUBY_ST_H
+#  include <ruby/st.h>
+#else
+#  include <st.h>
+#endif
+
+#ifdef CAIRO_HAS_WIN32_SURFACE
+#  define OpenFile OpenFile_win32
+#  include <cairo-win32.h>
+#  undef OpenFile
+#endif
 
-#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_SVG_SURFACE
+#include <rubyio.h>
+
+#ifdef CAIRO_HAS_QUARTZ_SURFACE
+#  ifndef HAVE_TYPE_ENUM_RUBY_VALUE_TYPE
+enum ruby_value_type {
+  RUBY_T_DATA = T_DATA
+};
+#  endif
+#  undef T_DATA
+#  include <cairo-quartz.h>
+#  define T_DATA RUBY_T_DATA
+#endif
+
+#if defined(CAIRO_HAS_PS_SURFACE) || \
+  defined(CAIRO_HAS_PDF_SURFACE) || \
+  defined(CAIRO_HAS_SVG_SURFACE)
 #  define HAS_CREATE_CR_CLOSURE_SURFACE 1
 #else
 #  define HAS_CREATE_CR_CLOSURE_SURFACE 0
@@ -42,6 +67,8 @@ static ID cr_id_parse;
 static ID cr_id_size;
 static ID cr_id_set_unit;
 static cairo_user_data_key_t cr_closure_key;
+static cairo_user_data_key_t cr_object_holder_key;
+static cairo_user_data_key_t cr_finished_key;
 
 #define _SELF  (RVAL2CRSURFACE(self))
 
@@ -106,7 +133,7 @@ cr_surface_get_klass (cairo_surface_t *surface)
       break;
 #endif
     default:
-      rb_raise (rb_eArgError, "unknown source type: %d", type);
+      klass = rb_cCairo_Surface;
       break;
     }
 
@@ -132,6 +159,11 @@ typedef struct cr_io_callback_closure {
   unsigned int length;
 } cr_io_callback_closure_t;
 
+typedef struct cr_invoke_data {
+  cr_callback_func_t func;
+  VALUE data;
+} cr_invoke_data_t;
+
 #if HAS_CREATE_CR_CLOSURE_SURFACE
 static cr_io_callback_closure_t *
 cr_closure_new (VALUE target)
@@ -148,7 +180,7 @@ cr_closure_new (VALUE target)
 static void
 cr_closure_destroy (cr_io_callback_closure_t *closure)
 {
-  free (closure);
+  xfree (closure);
 }
 
 static void
@@ -167,6 +199,17 @@ cr_surface_io_func_rescue (VALUE io_closure)
   return Qnil;
 }
 
+static VALUE
+cr_surface_invoke_io_func (VALUE user_data)
+{
+  cr_invoke_data_t *data;
+
+  data = (cr_invoke_data_t *)user_data;
+  return rb_rescue2 (data->func, data->data,
+                     cr_surface_io_func_rescue, data->data, rb_eException,
+                     (VALUE)0);
+}
+
 /* write callback */
 static VALUE
 cr_surface_write_func_invoke (VALUE write_closure)
@@ -199,15 +242,16 @@ cr_surface_write_func (void *write_closure,
                        const unsigned char *data, unsigned int length)
 {
   cr_io_callback_closure_t *closure;
+  cr_invoke_data_t invoke_data;
 
   closure = (cr_io_callback_closure_t *)write_closure;
   closure->data = (unsigned char *)data;
   closure->length = length;
-  
-  rb_rescue2 (cr_surface_write_func_invoke, (VALUE) closure,
-              cr_surface_io_func_rescue, (VALUE) closure, rb_eException,
-              (VALUE)0);
-  
+
+  invoke_data.func = cr_surface_write_func_invoke;
+  invoke_data.data = (VALUE)closure;
+  rb_cairo__invoke_callback (cr_surface_invoke_io_func, (VALUE)&invoke_data);
+
   if (NIL_P (closure->error))
     return CAIRO_STATUS_SUCCESS;
   else
@@ -243,14 +287,16 @@ cr_surface_read_func (void *read_closure,
                       unsigned char *data, unsigned int length)
 {
   cr_io_callback_closure_t *closure;
+  cr_invoke_data_t invoke_data;
 
   closure = (cr_io_callback_closure_t *)read_closure;
   closure->data = data;
   closure->length = length;
-  rb_rescue2 (cr_surface_read_func_invoke, (VALUE) closure,
-              cr_surface_io_func_rescue, (VALUE) closure, rb_eException,
-              (VALUE)0);
-  
+
+  invoke_data.func = cr_surface_read_func_invoke;
+  invoke_data.data = (VALUE)closure;
+  rb_cairo__invoke_callback (cr_surface_invoke_io_func, (VALUE)&invoke_data);
+
   if (NIL_P (closure->error))
     return CAIRO_STATUS_SUCCESS;
   else
@@ -267,16 +313,30 @@ rb_cairo_surface_from_ruby_object (VALUE obj)
       rb_raise (rb_eTypeError, "not a cairo surface");
     }
   Data_Get_Struct (obj, cairo_surface_t, surface);
+  if (!surface)
+    rb_cairo_check_status (CAIRO_STATUS_NULL_POINTER);
   return surface;
 }
 
+static rb_cairo__object_holder_t *
+cr_object_holder_new (VALUE object)
+{
+  return rb_cairo__object_holder_new (rb_cCairo_Surface, object);
+}
+
+static void
+cr_object_holder_free (void *ptr)
+{
+  rb_cairo__object_holder_free (rb_cCairo_Surface, ptr);
+}
+
 static void
 cr_surface_free (void *ptr)
 {
-  if (ptr)
-    {
-      cairo_surface_destroy ((cairo_surface_t *) ptr);
-    }
+  cairo_surface_t *surface = ptr;
+
+  if (surface)
+    cairo_surface_destroy (surface);
 }
 
 VALUE
@@ -299,9 +359,11 @@ VALUE
 rb_cairo_surface_to_ruby_object_with_destroy (cairo_surface_t *surface)
 {
   VALUE rb_surface;
+
   rb_surface = rb_cairo_surface_to_ruby_object (surface);
   if (surface)
     cairo_surface_destroy (surface);
+
   return rb_surface;
 }
 
@@ -312,23 +374,48 @@ cr_surface_allocate (VALUE klass)
 }
 
 /* Surface manipulation */
-static void
-yield_and_finish (VALUE self)
+static VALUE
+cr_surface_destroy (VALUE self)
 {
   cairo_surface_t *surface;
-  cairo_status_t status;
 
-  rb_yield (self);
+  surface = _SELF;
+  cairo_surface_destroy (surface);
+  DATA_PTR (self) = NULL;
+
+  return self;
+}
+
+static VALUE
+cr_surface_finish (VALUE self)
+{
+  cairo_surface_t *surface;
+  cr_io_callback_closure_t *closure;
 
   surface = _SELF;
-  if (cairo_surface_status (surface))
-    return;
+  closure = cairo_surface_get_user_data (surface, &cr_closure_key);
+
   cairo_surface_finish (surface);
-  status = cairo_surface_status (surface);
-  if (status == CAIRO_STATUS_SUCCESS || status == CAIRO_STATUS_SURFACE_FINISHED)
-    return;
+  cairo_surface_set_user_data (surface, &cr_finished_key, (void *)CR_TRUE, NULL);
+  cairo_surface_set_user_data (surface, &cr_object_holder_key, NULL, NULL);
 
+  if (closure && !NIL_P (closure->error))
+    rb_exc_raise (closure->error);
   cr_surface_check_status (surface);
+
+  return self;
+}
+
+static void
+yield_and_finish (VALUE self)
+{
+  cairo_surface_t *surface;
+
+  rb_yield (self);
+
+  surface = _SELF;
+  if (!cairo_surface_get_user_data (surface, &cr_finished_key))
+    cr_surface_finish (self);
 }
 
 static VALUE
@@ -343,21 +430,6 @@ cr_surface_create_similar (VALUE self, VALUE content, VALUE width, VALUE height)
   return CRSURFACE2RVAL_WITH_DESTROY (surface);
 }
 
-static VALUE
-cr_surface_finish (VALUE self)
-{
-  cr_io_callback_closure_t *closure;
-  closure = cairo_surface_get_user_data (_SELF, &cr_closure_key);
-  
-  cairo_surface_finish (_SELF);
-
-  if (closure && !NIL_P (closure->error))
-    rb_exc_raise (closure->error);
-  
-  cr_surface_check_status (_SELF);
-  return self;
-}
-
 static VALUE
 cr_surface_get_content (VALUE self)
 {
@@ -365,7 +437,7 @@ cr_surface_get_content (VALUE self)
 }
 
 
-#if CAIRO_HAS_PNG_FUNCTIONS
+#ifdef CAIRO_HAS_PNG_FUNCTIONS
 static VALUE
 cr_surface_write_to_png_stream (VALUE self, VALUE target)
 {
@@ -491,6 +563,23 @@ cr_surface_set_fallback_resolution (VALUE self,
   return self;
 }
 
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+static VALUE
+cr_surface_get_fallback_resolution (VALUE self)
+{
+  double x_pixels_per_inch, y_pixels_per_inch;
+
+  cairo_surface_get_fallback_resolution (_SELF,
+                                         &x_pixels_per_inch,
+                                         &y_pixels_per_inch);
+  cr_surface_check_status (_SELF);
+  return rb_ary_new3 (2,
+                      rb_float_new (x_pixels_per_inch),
+                      rb_float_new (y_pixels_per_inch));
+}
+#endif
+
+
 #if CAIRO_CHECK_VERSION(1, 5, 2)
 static VALUE
 cr_surface_copy_page (VALUE self)
@@ -510,7 +599,7 @@ cr_surface_show_page (VALUE self)
 #endif
 
 /* Image-surface functions */
-#if CAIRO_HAS_PNG_FUNCTIONS
+#ifdef CAIRO_HAS_PNG_FUNCTIONS
 static cairo_surface_t *
 cr_image_surface_create_from_png_stream (VALUE target)
 {
@@ -700,6 +789,9 @@ cr_ ## type ## _surface_initialize (int argc, VALUE *argv, VALUE self)  \
           rb_ivar_set (self, cr_id_target, target);                     \
           cairo_surface_set_user_data (surface, &cr_closure_key,        \
                                        closure, cr_closure_free);       \
+          cairo_surface_set_user_data (surface, &cr_object_holder_key,  \
+                                       cr_object_holder_new(self),      \
+                                       cr_object_holder_free);          \
         }                                                               \
     }                                                                   \
   else                                                                  \
@@ -747,7 +839,7 @@ cr_ ## type ## _surface_set_size (int argc, VALUE *argv, VALUE self)    \
   return Qnil;                                                          \
 }
 
-#if CAIRO_HAS_PS_SURFACE
+#ifdef CAIRO_HAS_PS_SURFACE
 /* PS-surface functions */
 DEFINE_SURFACE(ps)
 DEFINE_SURFACE_SET_SIZE(ps)
@@ -807,13 +899,13 @@ cr_ps_surface_set_eps (VALUE self, VALUE eps)
 #  endif
 #endif
 
-#if CAIRO_HAS_PDF_SURFACE
+#ifdef CAIRO_HAS_PDF_SURFACE
 /* PDF-surface functions */
 DEFINE_SURFACE(pdf)
 DEFINE_SURFACE_SET_SIZE(pdf)
 #endif
 
-#if CAIRO_HAS_SVG_SURFACE
+#ifdef CAIRO_HAS_SVG_SURFACE
 /* SVG-surface functions */
 DEFINE_SURFACE(svg)
 
@@ -826,7 +918,7 @@ cr_svg_surface_restrict_to_version (VALUE self, VALUE version)
 }
 #endif
 
-#if CAIRO_HAS_WIN32_SURFACE
+#ifdef CAIRO_HAS_WIN32_SURFACE
 /* WIN32-surface functions */
 
 /* from dl/dl.h (ruby 1.9) */
@@ -964,7 +1056,7 @@ cr_win32_surface_get_image (VALUE self)
 #  endif
 #endif
 
-#if CAIRO_HAS_QUARTZ_SURFACE && defined(HAVE_RUBY_COCOA)
+#if defined(CAIRO_HAS_QUARTZ_SURFACE) && defined(HAVE_RUBY_COCOA)
 /* Quartz-surface functions */
 
 #include <objc/objc-runtime.h>
@@ -1083,6 +1175,20 @@ cr_quartz_image_surface_get_image (VALUE self)
 #  endif
 #endif
 
+static int
+cr_finish_all_guarded_surfaces_at_end_iter (VALUE key, VALUE value, VALUE data)
+{
+  cr_surface_finish (key);
+  return ST_CONTINUE;
+}
+
+static void
+cr_finish_all_guarded_surfaces_at_end (VALUE data)
+{
+  rb_hash_foreach (rb_cairo__gc_guarded_objects (rb_cCairo_Surface),
+                   cr_finish_all_guarded_surfaces_at_end_iter,
+                   Qnil);
+}
 
 void
 Init_cairo_surface (void)
@@ -1098,9 +1204,14 @@ Init_cairo_surface (void)
   rb_cCairo_Surface =
     rb_define_class_under (rb_mCairo, "Surface", rb_cObject);
   rb_define_alloc_func (rb_cCairo_Surface, cr_surface_allocate);
-  
+
+  rb_cairo__initialize_gc_guard_holder_class (rb_cCairo_Surface);
+  rb_set_end_proc(cr_finish_all_guarded_surfaces_at_end, Qnil);
+
+
   rb_define_method (rb_cCairo_Surface, "create_similar",
                     cr_surface_create_similar, 3);
+  rb_define_method (rb_cCairo_Surface, "destroy", cr_surface_destroy, 0);
   rb_define_method (rb_cCairo_Surface, "finish", cr_surface_finish, 0);
   rb_define_method (rb_cCairo_Surface, "content", cr_surface_get_content, 0);
 
@@ -1114,6 +1225,10 @@ Init_cairo_surface (void)
                     cr_surface_get_device_offset, 0);
   rb_define_method (rb_cCairo_Surface, "set_fallback_resolution",
                     cr_surface_set_fallback_resolution, 2);
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+  rb_define_method (rb_cCairo_Surface, "fallback_resolution",
+                    cr_surface_get_fallback_resolution, 0);
+#endif
 #if CAIRO_CHECK_VERSION(1, 5, 2)
   rb_define_method (rb_cCairo_Surface, "copy_page",
                     cr_surface_copy_page, 2);
@@ -1121,7 +1236,7 @@ Init_cairo_surface (void)
                     cr_surface_show_page, 2);
 #endif
 
-#if CAIRO_HAS_PNG_FUNCTIONS
+#ifdef CAIRO_HAS_PNG_FUNCTIONS
   rb_define_method (rb_cCairo_Surface, "write_to_png",
                     cr_surface_write_to_png_generic, 1);
 #endif
@@ -1132,7 +1247,7 @@ Init_cairo_surface (void)
   rb_cCairo_ImageSurface =
     rb_define_class_under (rb_mCairo, "ImageSurface", rb_cCairo_Surface);
   
-#if CAIRO_HAS_PNG_FUNCTIONS
+#ifdef CAIRO_HAS_PNG_FUNCTIONS
   rb_define_singleton_method (rb_cCairo_ImageSurface, "from_png",
                               cr_image_surface_create_from_png_generic, 1);
 #endif
@@ -1159,7 +1274,7 @@ Init_cairo_surface (void)
   rb_define_method (rb_cCairo_ ## name ## Surface, "initialize",        \
                     cr_ ## type ## _surface_initialize, -1);
 
-#if CAIRO_HAS_PS_SURFACE
+#ifdef CAIRO_HAS_PS_SURFACE
   /* PS-surface */
   INIT_SURFACE(ps, PS)
 
@@ -1171,17 +1286,17 @@ Init_cairo_surface (void)
   rb_define_method (rb_cCairo_PSSurface, "dsc_begin_page_setup",
                     cr_ps_surface_dsc_begin_page_setup, 0);
 
-#if CAIRO_CHECK_VERSION(1, 5, 2)
+#  if CAIRO_CHECK_VERSION(1, 5, 2)
   rb_define_method (rb_cCairo_PSSurface, "restrict_to_level",
                     cr_ps_surface_restrict_to_level, 1);
   rb_define_method (rb_cCairo_PSSurface, "eps?", cr_ps_surface_get_eps, 0);
   rb_define_method (rb_cCairo_PSSurface, "set_eps", cr_ps_surface_set_eps, 1);
-#endif
+#  endif
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_PSSurface);
 #endif
 
-#if CAIRO_HAS_PDF_SURFACE
+#ifdef CAIRO_HAS_PDF_SURFACE
   /* PDF-surface */
   INIT_SURFACE(pdf, PDF)
 
@@ -1191,7 +1306,7 @@ Init_cairo_surface (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_PDFSurface);
 #endif
 
-#if CAIRO_HAS_SVG_SURFACE
+#ifdef CAIRO_HAS_SVG_SURFACE
   /* SVG-surface */
   INIT_SURFACE(svg, SVG)
 
@@ -1201,7 +1316,7 @@ Init_cairo_surface (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_SVGSurface);
 #endif
 
-#if CAIRO_HAS_WIN32_SURFACE
+#ifdef CAIRO_HAS_WIN32_SURFACE
   /* Win32-surface */
   rb_cCairo_Win32Surface =
     rb_define_class_under (rb_mCairo, "Win32Surface", rb_cCairo_Surface);
@@ -1227,7 +1342,7 @@ Init_cairo_surface (void)
 
 #endif
 
-#if CAIRO_HAS_QUARTZ_SURFACE && defined(HAVE_RUBY_COCOA)
+#if defined(CAIRO_HAS_QUARTZ_SURFACE) && defined(HAVE_RUBY_COCOA)
   /* Quartz-surface */
 
   rb_cCairo_QuartzSurface =