cairo 1.6.3 → 1.7.0

data/src/rb_cairo_surface.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-06-20 02:01:53 $
+ * $Date: 2008-08-16 12:52:17 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -15,7 +15,11 @@
 #include "rb_cairo.h"
 #include "rb_cairo_private.h"
 
-#include <st.h>
+#ifdef HAVE_RUBY_ST_H
+#  include <ruby/st.h>
+#else
+#  include <st.h>
+#endif
 
 #ifdef CAIRO_HAS_WIN32_SURFACE
 #  define OpenFile OpenFile_win32
@@ -62,8 +66,6 @@ static ID cr_id_inspect;
 static ID cr_id_parse;
 static ID cr_id_size;
 static ID cr_id_set_unit;
-static ID cr_id_instances;
-static ID cr_id_dup;
 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;
@@ -131,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;
     }
 
@@ -157,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)
@@ -192,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)
@@ -224,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
@@ -268,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
@@ -292,47 +313,21 @@ 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 void
-add_gc_guard (VALUE self)
-{
-  rb_hash_aset (rb_ivar_get (rb_cCairo_Surface, cr_id_instances),
-                self, Qnil);
-}
-
-static void
-remove_gc_guard (VALUE self)
-{
-  rb_hash_delete (rb_ivar_get (rb_cCairo_Surface, cr_id_instances),
-                  self);
-}
-
-typedef struct cr_object_holder {
-  VALUE object;
-} cr_object_holder_t;
-
-static cr_object_holder_t *
+static rb_cairo__object_holder_t *
 cr_object_holder_new (VALUE object)
 {
-  cr_object_holder_t *holder;
-
-  holder = ALLOC(cr_object_holder_t);
-  add_gc_guard (object);
-  holder->object = object;
-  return holder;
+  return rb_cairo__object_holder_new (rb_cCairo_Surface, object);
 }
 
 static void
 cr_object_holder_free (void *ptr)
 {
-  cr_object_holder_t *holder = ptr;
-
-  if (!NIL_P (holder->object))
-    remove_gc_guard (holder->object);
-
-  xfree (holder);
+  rb_cairo__object_holder_free (rb_cCairo_Surface, ptr);
 }
 
 static void
@@ -379,6 +374,18 @@ cr_surface_allocate (VALUE klass)
 }
 
 /* Surface manipulation */
+static VALUE
+cr_surface_destroy (VALUE self)
+{
+  cairo_surface_t *surface;
+
+  surface = _SELF;
+  cairo_surface_destroy (surface);
+  DATA_PTR (self) = NULL;
+
+  return self;
+}
+
 static VALUE
 cr_surface_finish (VALUE self)
 {
@@ -556,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)
@@ -1161,8 +1185,7 @@ cr_finish_all_guarded_surfaces_at_end_iter (VALUE key, VALUE value, VALUE data)
 static void
 cr_finish_all_guarded_surfaces_at_end (VALUE data)
 {
-  rb_hash_foreach (rb_funcall (rb_ivar_get (rb_cCairo_Surface, cr_id_instances),
-                               cr_id_dup, 0),
+  rb_hash_foreach (rb_cairo__gc_guarded_objects (rb_cCairo_Surface),
                    cr_finish_all_guarded_surfaces_at_end_iter,
                    Qnil);
 }
@@ -1177,20 +1200,18 @@ Init_cairo_surface (void)
   cr_id_parse = rb_intern ("parse");
   cr_id_size = rb_intern ("size");
   cr_id_set_unit = rb_intern ("unit=");
-  cr_id_instances = rb_intern ("instances");
-  cr_id_dup = rb_intern ("dup");
-
-  rb_set_end_proc(cr_finish_all_guarded_surfaces_at_end, Qnil);
 
   rb_cCairo_Surface =
     rb_define_class_under (rb_mCairo, "Surface", rb_cObject);
   rb_define_alloc_func (rb_cCairo_Surface, cr_surface_allocate);
 
-  rb_ivar_set (rb_cCairo_Surface, cr_id_instances, rb_hash_new ());
+  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);
 
@@ -1204,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);

data/src/rb_cairo_text_cluster.c

@@ -0,0 +1,151 @@
+/* -*- c-file-style: "gnu"; indent-tabs-mode: nil -*- */
+/*
+ * Ruby Cairo Binding
+ *
+ * $Author: kou $
+ * $Date: 2008-08-16 08:16:40 $
+ *
+ * Copyright 2008 Kouhei Sutou <kou@cozmixng.org>
+ *
+ * This file is made available under the same terms as Ruby
+ *
+ */
+
+
+#include "rb_cairo.h"
+#include "rb_cairo_private.h"
+
+VALUE rb_cCairo_TextCluster = Qnil;
+
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+#define _SELF(self)  (RVAL2CRTEXTCLUSTER(self))
+
+cairo_text_cluster_t *
+rb_cairo_text_cluster_from_ruby_object (VALUE obj)
+{
+  cairo_text_cluster_t *cluster;
+  if (!rb_cairo__is_kind_of (obj, rb_cCairo_TextCluster))
+    {
+      rb_raise (rb_eTypeError,
+                "not a cairo cluster: %s", rb_cairo__inspect (obj));
+    }
+  Data_Get_Struct (obj, cairo_text_cluster_t, cluster);
+  return cluster;
+}
+
+static void
+cr_text_cluster_free (void *ptr)
+{
+  if (ptr)
+    {
+      xfree (ptr);
+    }
+}
+
+VALUE
+rb_cairo_text_cluster_to_ruby_object (cairo_text_cluster_t *cluster)
+{
+  if (cluster)
+    {
+      cairo_text_cluster_t *new_cluster;
+
+      new_cluster = ALLOC (cairo_text_cluster_t);
+      *new_cluster = *cluster;
+      return Data_Wrap_Struct (rb_cCairo_TextCluster, NULL,
+                               cr_text_cluster_free, new_cluster);
+    }
+  else
+    {
+      return Qnil;
+    }
+}
+
+static VALUE
+cr_text_cluster_allocate (VALUE klass)
+{
+  return Data_Wrap_Struct (klass, NULL, cr_text_cluster_free, NULL);
+}
+
+static VALUE
+cr_text_cluster_initialize (VALUE self, VALUE num_bytes, VALUE num_glyphs)
+{
+  cairo_text_cluster_t *cluster;
+
+  cluster = ALLOC (cairo_text_cluster_t);
+  cluster->num_bytes = NUM2INT (num_bytes);
+  cluster->num_glyphs = NUM2INT (num_glyphs);
+
+  DATA_PTR (self) = cluster;
+  return Qnil;
+}
+
+static VALUE
+cr_text_cluster_num_bytes (VALUE self)
+{
+  return INT2NUM (_SELF(self)->num_bytes);
+}
+
+static VALUE
+cr_text_cluster_num_glyphs (VALUE self)
+{
+  return INT2NUM (_SELF(self)->num_glyphs);
+}
+
+static VALUE
+cr_text_cluster_set_num_bytes (VALUE self, VALUE num_bytes)
+{
+  _SELF(self)->num_bytes = NUM2INT (num_bytes);
+  return self;
+}
+
+static VALUE
+cr_text_cluster_set_num_glyphs (VALUE self, VALUE num_glyphs)
+{
+  _SELF(self)->num_glyphs = NUM2INT (num_glyphs);
+  return self;
+}
+
+static VALUE
+cr_text_cluster_to_s (VALUE self)
+{
+  VALUE ret;
+
+  ret = rb_str_new2 ("#<");
+  rb_str_cat2 (ret, rb_class2name (CLASS_OF (self)));
+  rb_str_cat2 (ret, ": ");
+  rb_str_cat2 (ret, "num_bytes=");
+  rb_str_concat (ret, rb_inspect (cr_text_cluster_num_bytes (self)));
+  rb_str_cat2 (ret, ", ");
+  rb_str_cat2 (ret, "num_glyphs=");
+  rb_str_concat (ret, rb_inspect (cr_text_cluster_num_glyphs (self)));
+  rb_str_cat2 (ret, ">");
+
+  return ret;
+}
+#endif
+
+void
+Init_cairo_text_cluster (void)
+{
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+  rb_cCairo_TextCluster = rb_define_class_under (rb_mCairo, "TextCluster", rb_cObject);
+
+  rb_define_alloc_func (rb_cCairo_TextCluster, cr_text_cluster_allocate);
+
+  rb_define_method (rb_cCairo_TextCluster, "initialize",
+                    cr_text_cluster_initialize, 2);
+
+  rb_define_method (rb_cCairo_TextCluster, "num_bytes",
+                    cr_text_cluster_num_bytes, 0);
+  rb_define_method (rb_cCairo_TextCluster, "num_glyphs",
+                    cr_text_cluster_num_glyphs, 0);
+  rb_define_method (rb_cCairo_TextCluster, "set_num_bytes",
+                    cr_text_cluster_set_num_bytes, 1);
+  rb_define_method (rb_cCairo_TextCluster, "set_num_glyphs",
+                    cr_text_cluster_set_num_glyphs, 1);
+
+  rb_define_method (rb_cCairo_TextCluster, "to_s", cr_text_cluster_to_s, 0);
+
+  RB_CAIRO_DEF_SETTERS (rb_cCairo_TextCluster);
+#endif
+}

data/src/rb_cairo_text_extents.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/05/03 02:47:39 $
+ * $Date: 2008-08-17 05:41:28 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -46,6 +46,29 @@ rb_cairo_text_extents_to_ruby_object (cairo_text_extents_t *extents)
     }
 }
 
+static VALUE
+cr_text_extents_allocate (VALUE klass)
+{
+  return Data_Wrap_Struct (klass, NULL, -1, NULL);
+}
+
+static VALUE
+cr_text_extents_initialize (VALUE self)
+{
+  cairo_text_extents_t *extents;
+
+  extents = ALLOC (cairo_text_extents_t);
+  extents->x_bearing = 0.0;
+  extents->y_bearing = -1.0;
+  extents->width = 0.0;
+  extents->height = 1.0;
+  extents->x_advance = 1.0;
+  extents->y_advance = 0.0;
+
+  DATA_PTR (self) = extents;
+
+  return Qnil;
+}
 
 static VALUE
 cr_text_extents_x_bearing (VALUE self)
@@ -53,36 +76,78 @@ cr_text_extents_x_bearing (VALUE self)
   return rb_float_new (_SELF(self)->x_bearing);
 }
 
+static VALUE
+cr_text_extents_set_x_bearing (VALUE self, VALUE x_bearing)
+{
+  _SELF(self)->x_bearing = NUM2DBL (x_bearing);
+  return Qnil;
+}
+
 static VALUE
 cr_text_extents_y_bearing (VALUE self)
 {
   return rb_float_new (_SELF(self)->y_bearing);
 }
 
+static VALUE
+cr_text_extents_set_y_bearing (VALUE self, VALUE y_bearing)
+{
+  _SELF(self)->y_bearing = NUM2DBL (y_bearing);
+  return Qnil;
+}
+
 static VALUE
 cr_text_extents_width (VALUE self)
 {
   return rb_float_new (_SELF(self)->width);
 }
 
+static VALUE
+cr_text_extents_set_width (VALUE self, VALUE width)
+{
+  _SELF(self)->width = NUM2DBL (width);
+  return Qnil;
+}
+
 static VALUE
 cr_text_extents_height (VALUE self)
 {
   return rb_float_new (_SELF(self)->height);
 }
 
+static VALUE
+cr_text_extents_set_height (VALUE self, VALUE height)
+{
+  _SELF(self)->height = NUM2DBL (height);
+  return Qnil;
+}
+
 static VALUE
 cr_text_extents_x_advance (VALUE self)
 {
   return rb_float_new (_SELF(self)->x_advance);
 }
 
+static VALUE
+cr_text_extents_set_x_advance (VALUE self, VALUE x_advance)
+{
+  _SELF(self)->x_advance = NUM2DBL (x_advance);
+  return Qnil;
+}
+
 static VALUE
 cr_text_extents_y_advance (VALUE self)
 {
   return rb_float_new (_SELF(self)->y_advance);
 }
 
+static VALUE
+cr_text_extents_set_y_advance (VALUE self, VALUE y_advance)
+{
+  _SELF(self)->y_advance = NUM2DBL (y_advance);
+  return Qnil;
+}
+
 static VALUE
 cr_text_extents_to_s (VALUE self)
 {
@@ -109,7 +174,7 @@ cr_text_extents_to_s (VALUE self)
   rb_str_cat2 (ret, "y_advance=");
   rb_str_concat (ret, rb_inspect (cr_text_extents_y_advance (self)));
   rb_str_cat2 (ret, ">");
-                 
+
   return ret;
 }
 
@@ -119,20 +184,38 @@ Init_cairo_text_extents (void)
 {
   rb_cCairo_TextExtents =
     rb_define_class_under (rb_mCairo, "TextExtents", rb_cObject);
+  rb_define_alloc_func (rb_cCairo_TextExtents, cr_text_extents_allocate);
+
+  rb_define_method (rb_cCairo_TextExtents, "initialize",
+                    cr_text_extents_initialize, 0);
 
   rb_define_method (rb_cCairo_TextExtents, "x_bearing",
                     cr_text_extents_x_bearing, 0);
+  rb_define_method (rb_cCairo_TextExtents, "set_x_bearing",
+                    cr_text_extents_set_x_bearing, 1);
   rb_define_method (rb_cCairo_TextExtents, "y_bearing",
                     cr_text_extents_y_bearing, 0);
+  rb_define_method (rb_cCairo_TextExtents, "set_y_bearing",
+                    cr_text_extents_set_y_bearing, 1);
   rb_define_method (rb_cCairo_TextExtents, "width",
                     cr_text_extents_width, 0);
+  rb_define_method (rb_cCairo_TextExtents, "set_width",
+                    cr_text_extents_set_width, 1);
   rb_define_method (rb_cCairo_TextExtents, "height",
                     cr_text_extents_height, 0);
+  rb_define_method (rb_cCairo_TextExtents, "set_height",
+                    cr_text_extents_set_height, 1);
   rb_define_method (rb_cCairo_TextExtents, "x_advance",
                     cr_text_extents_x_advance, 0);
+  rb_define_method (rb_cCairo_TextExtents, "set_x_advance",
+                    cr_text_extents_set_x_advance, 1);
   rb_define_method (rb_cCairo_TextExtents, "y_advance",
                     cr_text_extents_y_advance, 0);
+  rb_define_method (rb_cCairo_TextExtents, "set_y_advance",
+                    cr_text_extents_set_y_advance, 1);
 
   rb_define_method (rb_cCairo_TextExtents, "to_s",
                     cr_text_extents_to_s, 0);
+
+  RB_CAIRO_DEF_SETTERS (rb_cCairo_TextExtents);
 }