cairo 1.6.3 → 1.7.0

data/extconf.rb

@@ -80,6 +80,7 @@ major, minor, micro = 1, 2, 0
 
 PKGConfig.have_package(pkg, major, minor, micro) or exit 1
 
+have_header("ruby/st.h") unless have_macro("HAVE_RUBY_ST_H", "ruby.h")
 have_func("rb_errinfo", "ruby.h")
 have_type("enum ruby_value_type", "ruby.h")
 

data/src/cairo.def

@@ -16,11 +16,15 @@ EXPORTS
     rb_cCairo_LinearPattern   DATA
     rb_cCairo_RadialPattern   DATA
     rb_cCairo_FontFace        DATA
+    rb_cCairo_ToyFontFace     DATA
+    rb_cCairo_UserFontFace    DATA
+    rb_cCairo_UserFontFace_TextToGlyphsData DATA
     rb_cCairo_FontExtents     DATA
     rb_cCairo_FontOptions     DATA
     rb_cCairo_ScaledFont      DATA
     rb_cCairo_TextExtents     DATA
     rb_cCairo_Glyph           DATA
+    rb_cCairo_TextCluster     DATA
     rb_cCairo_Surface         DATA
     rb_cCairo_ImageSurface    DATA
     rb_cCairo_PDFSurface      DATA
@@ -48,6 +52,7 @@ EXPORTS
     rb_mCairo_Filter          DATA
     rb_mCairo_SVGVersion      DATA
     rb_mCairo_PSLevel         DATA
+    rb_mCairo_LCDFilter       DATA
 
     rb_mCairo_Color           DATA
     rb_cCairo_Color_Base      DATA
@@ -73,6 +78,8 @@ EXPORTS
     rb_cairo_text_extents_to_ruby_object
     rb_cairo_glyph_from_ruby_object
     rb_cairo_glyph_to_ruby_object
+    rb_cairo_text_cluster_from_ruby_object
+    rb_cairo_text_cluster_to_ruby_object
     rb_cairo_surface_from_ruby_object
     rb_cairo_surface_to_ruby_object
     rb_cairo_surface_to_ruby_object_with_destroy
@@ -93,4 +100,5 @@ EXPORTS
     rb_cairo_filter_from_ruby_object
     rb_cairo_svg_version_from_ruby_object
     rb_cairo_ps_level_from_ruby_object
+    rb_cairo_lcd_filter_from_ruby_object
     rb_cairo_check_status

data/src/lib/cairo.rb

@@ -45,14 +45,19 @@ require 'cairo/constants'
 module Cairo
   class << self
     undef __add_one_arg_setter
-  end
 
-  module_function
-  def bindings_version
-    major, minor, micro, tag = BINDINGS_VERSION
-    version = [major, minor, micro].join('.')
-    version << "-#{tag}" if tag
-    version
+    def bindings_version
+      major, minor, micro, tag = BINDINGS_VERSION
+      version = [major, minor, micro].join('.')
+      version << "-#{tag}" if tag
+      version
+    end
+
+    def exit_application(exception, status)
+      puts("#{exception.class}: #{exception}")
+      puts(exception.backtrace)
+      exit(status)
+    end
   end
 
   class Surface

data/src/lib/cairo/constants.rb

@@ -18,4 +18,5 @@ module Cairo
   define_constants.call(PathDataType, nil, Path)
   define_constants.call(SVGVersion, nil, SVGSurface)
   define_constants.call(SVGVersion, "SVG")
+  define_constants.call(LCDFilter, "LCD_FILTER") if const_defined?(:LCDFilter)
 end

data/src/rb_cairo.c

@@ -3,9 +3,9 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-07-19 11:00:10 $
+ * $Date: 2008-08-16 08:16:39 $
  *
- * Copyright 2006-2007 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2006-2008 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -27,6 +27,24 @@ rb_cairo_def_setters (VALUE klass)
   rb_funcall (rb_mCairo, id__add_one_arg_setter, 1, klass);
 }
 
+static VALUE
+rb_cairo_satisfied_version (int argc, VALUE *argv, VALUE self)
+{
+  VALUE major, minor, micro;
+
+  rb_scan_args (argc, argv, "21", &major, &minor, &micro);
+
+  if (NIL_P (micro))
+    micro = UINT2NUM (0);
+
+  return CBOOL2RVAL (CAIRO_VERSION_MAJOR > NUM2UINT(major) ||
+                     (CAIRO_VERSION_MAJOR == NUM2UINT(major) &&
+                      CAIRO_VERSION_MINOR > NUM2UINT(minor)) ||
+                     (CAIRO_VERSION_MAJOR == NUM2UINT(major) &&
+                      CAIRO_VERSION_MINOR == NUM2UINT(minor) &&
+                      CAIRO_VERSION_MICRO >= NUM2UINT(micro)));
+}
+
 void
 Init_cairo ()
 {
@@ -58,7 +76,10 @@ Init_cairo ()
 
   rb_define_const (rb_mCairo, "BINDINGS_VERSION",
                    rb_ary_new3 (4,
-                                INT2FIX (1), INT2FIX (6), INT2FIX (3), Qnil));
+                                INT2FIX (1), INT2FIX (7), INT2FIX (0), Qnil));
+
+  rb_define_module_function (rb_mCairo, "satisfied_version?",
+                             rb_cairo_satisfied_version, -1);
 
   rb_mCairo_Color = rb_const_get (rb_mCairo, rb_intern ("Color"));
   rb_cCairo_Color_Base = rb_const_get (rb_mCairo_Color, rb_intern ("Base"));
@@ -79,4 +100,5 @@ Init_cairo ()
   Init_cairo_text_extents ();
   Init_cairo_pattern ();
   Init_cairo_glyph ();
+  Init_cairo_text_cluster ();
 }

data/src/rb_cairo.h

@@ -3,8 +3,9 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-06-19 13:00:18 $
+ * $Date: 2008-08-17 07:21:42 $
  *
+ * Copyright 2006-2008 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -83,6 +84,9 @@ RB_CAIRO_VAR VALUE rb_cCairo_GradientPattern;
 RB_CAIRO_VAR VALUE rb_cCairo_LinearPattern;
 RB_CAIRO_VAR VALUE rb_cCairo_RadialPattern;
 RB_CAIRO_VAR VALUE rb_cCairo_FontFace;
+RB_CAIRO_VAR VALUE rb_cCairo_ToyFontFace;
+RB_CAIRO_VAR VALUE rb_cCairo_UserFontFace;
+RB_CAIRO_VAR VALUE rb_cCairo_UserFontFace_TextToGlyphsData;
 RB_CAIRO_VAR VALUE rb_cCairo_FontExtents;
 RB_CAIRO_VAR VALUE rb_cCairo_FontOptions;
 RB_CAIRO_VAR VALUE rb_cCairo_ScaledFont;
@@ -119,6 +123,9 @@ RB_CAIRO_VAR VALUE rb_mCairo_PatternType;
 RB_CAIRO_VAR VALUE rb_mCairo_Extend;
 RB_CAIRO_VAR VALUE rb_mCairo_Filter;
 RB_CAIRO_VAR VALUE rb_mCairo_SVGVersion;
+RB_CAIRO_VAR VALUE rb_mCairo_PSLevel;
+RB_CAIRO_VAR VALUE rb_mCairo_LCDFilter;
+RB_CAIRO_VAR VALUE rb_mCairo_SVGVersion;
 RB_CAIRO_VAR VALUE rb_mCairo_Color;
 RB_CAIRO_VAR VALUE rb_cCairo_Color_Base;
 RB_CAIRO_VAR VALUE rb_cCairo_Paper;
@@ -154,6 +161,9 @@ RB_CAIRO_VAR VALUE rb_cCairo_Paper;
 #define RVAL2CRGLYPH(obj)       (rb_cairo_glyph_from_ruby_object(obj))
 #define CRGLYPH2RVAL(glyph)     (rb_cairo_glyph_to_ruby_object(glyph))
 
+#define RVAL2CRTEXTCLUSTER(obj)     (rb_cairo_text_cluster_from_ruby_object(obj))
+#define CRTEXTCLUSTER2RVAL(cluster) (rb_cairo_text_cluster_to_ruby_object(cluster))
+
 #define RVAL2CRSURFACE(obj)     (rb_cairo_surface_from_ruby_object(obj))
 #define CRSURFACE2RVAL(surface) (rb_cairo_surface_to_ruby_object(surface))
 #define CRSURFACE2RVAL_WITH_DESTROY(surface) \
@@ -189,6 +199,11 @@ VALUE                 rb_cairo_text_extents_to_ruby_object   (cairo_text_extents
 cairo_glyph_t        *rb_cairo_glyph_from_ruby_object        (VALUE obj);
 VALUE                 rb_cairo_glyph_to_ruby_object          (cairo_glyph_t *glyph);
 
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+cairo_text_cluster_t *rb_cairo_text_cluster_from_ruby_object (VALUE obj);
+VALUE                 rb_cairo_text_cluster_to_ruby_object   (cairo_text_cluster_t *cluster);
+#endif
+
 cairo_surface_t      *rb_cairo_surface_from_ruby_object      (VALUE obj);
 VALUE                 rb_cairo_surface_to_ruby_object        (cairo_surface_t *surface);
 VALUE                 rb_cairo_surface_to_ruby_object_with_destroy
@@ -218,6 +233,9 @@ VALUE                 rb_cairo_surface_to_ruby_object_with_destroy
 #define RVAL2CRPSLEVEL(obj)       (rb_cairo_ps_level_from_ruby_object(obj))
 #  endif
 #endif
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+#define RVAL2CRLCDFILTER(obj)     (rb_cairo_lcd_filter_from_ruby_object(obj))
+#endif
 
 cairo_operator_t       rb_cairo_operator_from_ruby_object       (VALUE obj);
 cairo_antialias_t      rb_cairo_antialias_from_ruby_object      (VALUE obj);
@@ -242,6 +260,9 @@ cairo_svg_version_t    rb_cairo_svg_version_from_ruby_object    (VALUE obj);
 cairo_ps_level_t       rb_cairo_ps_level_from_ruby_object       (VALUE obj);
 #  endif
 #endif
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+cairo_lcd_filter_t     rb_cairo_lcd_filter_from_ruby_object     (VALUE obj);
+#endif
 
 void rb_cairo_check_status (cairo_status_t status);
 

data/src/rb_cairo_constants.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-06-19 13:00:18 $
+ * $Date: 2008-08-13 12:27:39 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -33,6 +33,7 @@ VALUE rb_mCairo_Extend;
 VALUE rb_mCairo_Filter;
 VALUE rb_mCairo_SVGVersion = Qnil;
 VALUE rb_mCairo_PSLevel = Qnil;
+VALUE rb_mCairo_LCDFilter = Qnil;
 
 #define CAIRO_OPERATOR_MIN CAIRO_OPERATOR_CLEAR
 #define CAIRO_OPERATOR_MAX CAIRO_OPERATOR_SATURATE
@@ -85,6 +86,9 @@ VALUE rb_mCairo_PSLevel = Qnil;
 #define CAIRO_PS_LEVEL_MIN CAIRO_PS_LEVEL_2
 #define CAIRO_PS_LEVEL_MAX CAIRO_PS_LEVEL_3
 
+#define CAIRO_LCD_FILTER_MIN CAIRO_LCD_FILTER_DEFAULT
+#define CAIRO_LCD_FILTER_MAX CAIRO_LCD_FILTER_FIR5
+
 #define DEFINE_RVAL2ENUM(name, const_name)                      \
 cairo_ ## name ## _t                                            \
 rb_cairo_ ## name ## _from_ruby_object (VALUE rb_ ## name)      \
@@ -135,6 +139,10 @@ DEFINE_RVAL2ENUM(ps_level, PS_LEVEL)
 #  endif
 #endif
 
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+DEFINE_RVAL2ENUM(lcd_filter, LCD_FILTER)
+#endif
+
 #if defined(RB_CAIRO_PLATFORM_WIN32) && !defined(PS_LEVEL_ENUM_DEFINED)
 void
 rb_cairo_ps_level_from_ruby_object (VALUE rb_ps_level)
@@ -459,4 +467,19 @@ Init_cairo_constants (void)
                               cr_ps_level_to_string, -1);
 #  endif
 #endif
+
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+  /* cairo_lcd_filter_t */
+  rb_mCairo_LCDFilter = rb_define_module_under (rb_mCairo, "LCDFilter");
+  rb_define_const (rb_mCairo_LCDFilter, "DEFAULT",
+                   INT2FIX (CAIRO_LCD_FILTER_DEFAULT));
+  rb_define_const (rb_mCairo_LCDFilter, "NONE",
+                   INT2FIX (CAIRO_LCD_FILTER_NONE));
+  rb_define_const (rb_mCairo_LCDFilter, "INTRA_PIXEL",
+                   INT2FIX (CAIRO_LCD_FILTER_INTRA_PIXEL));
+  rb_define_const (rb_mCairo_LCDFilter, "FIR3",
+                   INT2FIX (CAIRO_LCD_FILTER_FIR3));
+  rb_define_const (rb_mCairo_LCDFilter, "FIR5",
+                   INT2FIX (CAIRO_LCD_FILTER_FIR5));
+#endif
 }

data/src/rb_cairo_context.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-06-12 10:59:54 $
+ * $Date: 2008-08-17 03:00:41 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -15,10 +15,17 @@
 #include "rb_cairo.h"
 #include "rb_cairo_private.h"
 
+#ifdef HAVE_RUBY_ST_H
+#  include <ruby/st.h>
+#else
+#  include <st.h>
+#endif
+
 VALUE rb_cCairo_Context;
 
 static ID cr_id_surface, cr_id_source;
 static ID cr_id_plus, cr_id_minus, cr_id_multi, cr_id_div;
+static cairo_user_data_key_t cr_object_holder_key;
 
 #define _SELF  (RVAL2CRCONTEXT(self))
 
@@ -57,9 +64,23 @@ rb_cairo_context_from_ruby_object (VALUE obj)
       rb_raise (rb_eTypeError, "not a cairo graphics context");
     }
   Data_Get_Struct (obj, cairo_t, context);
+  if (!context)
+    rb_cairo_check_status (CAIRO_STATUS_NULL_POINTER);
   return context;
 }
 
+static rb_cairo__object_holder_t *
+cr_object_holder_new (VALUE object)
+{
+  return rb_cairo__object_holder_new (rb_cCairo_Context, object);
+}
+
+static void
+cr_object_holder_free (void *ptr)
+{
+  rb_cairo__object_holder_free (rb_cCairo_Context, ptr);
+}
+
 static void
 cr_context_free (void *ptr)
 {
@@ -89,16 +110,43 @@ cr_allocate (VALUE klass)
   return Data_Wrap_Struct (klass, NULL, cr_context_free, NULL);
 }
 
+static VALUE
+cr_destroy (VALUE self)
+{
+  cairo_t *cr;
+
+  cr = _SELF;
+  cairo_set_user_data (cr, &cr_object_holder_key, NULL, NULL); /* needed? */
+  cairo_destroy (cr);
+
+  DATA_PTR (self) = NULL;
+  return Qnil;
+}
+
+static VALUE
+cr_destroy_with_destroy_check (VALUE self)
+{
+  if (DATA_PTR (self))
+    cr_destroy (self);
+  return Qnil;
+}
+
 static VALUE
 cr_initialize (VALUE self, VALUE target)
 {
   cairo_t *cr;
+  VALUE result = Qnil;
 
   cr = cairo_create (RVAL2CRSURFACE (target));
   cr_check_status (cr);
   rb_ivar_set (self, cr_id_surface, target);
+  cairo_set_user_data (cr, &cr_object_holder_key,
+                       cr_object_holder_new(self),
+                       cr_object_holder_free);
   DATA_PTR (self) = cr;
-  return Qnil;
+  if (rb_block_given_p ())
+    result = rb_ensure (rb_yield, self, cr_destroy_with_destroy_check, self);
+  return result;
 }
 
 static VALUE
@@ -318,6 +366,12 @@ cr_set_source_generic (int argc, VALUE *argv, VALUE self)
     {
       return cr_set_source_rgba (argc, argv, self);
     }
+  else if (n == 1 && rb_cairo__is_kind_of (arg1, rb_cCairo_Surface))
+    {
+      return cr_set_source_surface (self, arg1,
+                                    rb_float_new (0),
+                                    rb_float_new (0));
+    }
   else if (n == 1)
     {
       return cr_set_source (self, arg1);
@@ -336,7 +390,7 @@ cr_set_source_generic (int argc, VALUE *argv, VALUE self)
                 "invalid argument (expect "
                 "(red, green, blue), (red, green, blue, alpha), "
                 "([red, green, blue]), ([red, green, blue, alpha]), "
-                "(pattern) or (surface, x, y))");
+                "(surface), (pattern) or (surface, x, y))");
     }
 }
 
@@ -1017,11 +1071,31 @@ cr_clip_rectangle_list (VALUE self)
 static   VALUE
 cr_select_font_face (int argc, VALUE *argv, VALUE self)
 {
-  VALUE family, rb_slant, rb_weight;
+  VALUE rb_family, rb_slant, rb_weight;
+  const char *family;
   cairo_font_slant_t slant;
   cairo_font_weight_t weight;
 
-  rb_scan_args(argc, argv, "12", &family, &rb_slant, &rb_weight);
+  rb_scan_args(argc, argv, "03", &rb_family, &rb_slant, &rb_weight);
+
+  if (NIL_P (rb_family))
+    {
+      family = "";
+    }
+  else if (rb_cairo__is_kind_of (rb_family, rb_cString))
+    {
+      family = RSTRING_PTR (rb_family);
+    }
+  else if (rb_cairo__is_kind_of (rb_family, rb_cSymbol))
+    {
+      family = rb_id2name (SYM2ID (rb_family));
+    }
+  else
+    {
+      rb_raise (rb_eArgError,
+                "family name should be nil, String or Symbol: %s",
+                rb_cairo__inspect (rb_family));
+    }
 
   if (NIL_P (rb_slant))
     slant = CAIRO_FONT_SLANT_NORMAL;
@@ -1033,7 +1107,7 @@ cr_select_font_face (int argc, VALUE *argv, VALUE self)
   else
     weight = RVAL2CRFONTWEIGHT (rb_weight);
 
-  cairo_select_font_face (_SELF, RVAL2CSTR (family), slant, weight);
+  cairo_select_font_face (_SELF, family, slant, weight);
   cr_check_status (_SELF);
   return self;
 }
@@ -1117,6 +1191,46 @@ cr_show_glyphs (VALUE self, VALUE rb_glyphs)
   return self;
 }
 
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+static VALUE
+cr_has_show_text_glyphs (VALUE self)
+{
+  return CBOOL2RVAL (cairo_has_show_text_glyphs (_SELF));
+}
+
+static VALUE
+cr_show_text_glyphs (VALUE self, VALUE rb_utf8, VALUE rb_glyphs,
+                     VALUE rb_clusters, VALUE rb_backward)
+{
+  cairo_t *cr;
+  const char *utf8;
+  int utf8_len;
+  cairo_glyph_t *glyphs = NULL;
+  int num_glyphs = 0;
+  cairo_text_cluster_t *clusters = NULL;
+  int num_clusters = 0;
+  cairo_bool_t backward;
+
+  cr = _SELF;
+  utf8 = RSTRING_PTR (rb_utf8);
+  utf8_len = RSTRING_LEN (rb_utf8);
+  rb_cairo__glyphs_from_ruby_object (rb_glyphs, &glyphs, &num_glyphs);
+  rb_cairo__text_clusters_from_ruby_object (rb_clusters,
+                                            &clusters, &num_clusters);
+  backward = RVAL2CBOOL (rb_backward);
+  cairo_show_text_glyphs (cr, utf8, utf8_len,
+                          glyphs, num_glyphs,
+                          clusters, num_clusters,
+                          backward);
+  if (glyphs)
+    cairo_glyph_free (glyphs);
+  if (clusters)
+    cairo_text_cluster_free (clusters);
+
+  return self;
+}
+#endif
+
 static VALUE
 cr_get_font_face (VALUE self)
 {
@@ -1370,6 +1484,21 @@ cr_copy_append_path (VALUE self, VALUE path)
   return self;
 }
 
+static int
+cr_destroy_all_guarded_contexts_at_end_iter (VALUE key, VALUE value, VALUE data)
+{
+  cr_destroy (key);
+  return ST_CONTINUE;
+}
+
+static void
+cr_destroy_all_guarded_contexts_at_end (VALUE data)
+{
+  rb_hash_foreach (rb_cairo__gc_guarded_objects (rb_cCairo_Context),
+                   cr_destroy_all_guarded_contexts_at_end_iter,
+                   Qnil);
+}
+
 void
 Init_cairo_context (void)
 {
@@ -1403,8 +1532,12 @@ Init_cairo_context (void)
 
   rb_define_alloc_func (rb_cCairo_Context, cr_allocate);
 
+  rb_cairo__initialize_gc_guard_holder_class (rb_cCairo_Context);
+  rb_set_end_proc(cr_destroy_all_guarded_contexts_at_end, Qnil);
+
   /* Functions for manipulating state objects */
   rb_define_method (rb_cCairo_Context, "initialize", cr_initialize, 1);
+  rb_define_method (rb_cCairo_Context, "destroy", cr_destroy, 0);
 
   rb_define_method (rb_cCairo_Context, "save", cr_save, 0);
   rb_define_method (rb_cCairo_Context, "restore", cr_restore, 0);
@@ -1507,6 +1640,14 @@ Init_cairo_context (void)
 #endif
   rb_define_method (rb_cCairo_Context, "show_text", cr_show_text, 1);
   rb_define_method (rb_cCairo_Context, "show_glyphs", cr_show_glyphs, 1);
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+  rb_define_method (rb_cCairo_Context, "have_show_text_glyphs?",
+                    cr_has_show_text_glyphs, 0);
+  rb_define_alias (rb_cCairo_Context,
+                   "has_show_text_glyphs?", "have_show_text_glyphs?");
+  rb_define_method (rb_cCairo_Context, "show_text_glyphs",
+                    cr_show_text_glyphs, 4);
+#endif
   rb_define_method (rb_cCairo_Context, "text_path", cr_text_path, 1);
   rb_define_method (rb_cCairo_Context, "glyph_path", cr_glyph_path, 1);
   rb_define_method (rb_cCairo_Context, "text_extents", cr_text_extents, 1);