cairo 1.7.0-x86-mswin32 → 1.8.0-x86-mswin32

data/src/rb_cairo_font_face.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-08-17 06:11:51 $
+ * $Date: 2008-09-26 14:13:58 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -21,7 +21,7 @@ VALUE rb_cCairo_ToyFontFace = Qnil;
 VALUE rb_cCairo_UserFontFace = Qnil;
 VALUE rb_cCairo_UserFontFace_TextToGlyphsData = Qnil;
 
-#if CAIRO_CHECK_VERSION(1, 7, 2)
+#if CAIRO_CHECK_VERSION(1, 7, 6)
 static cairo_user_data_key_t ruby_object_key;
 static ID cr_id_call;
 static ID cr_id_new;
@@ -33,10 +33,10 @@ static ID cr_id_unicode_to_glyph;
 
 static ID cr_id_at_glyphs;
 static ID cr_id_at_clusters;
-static ID cr_id_at_backward;
+static ID cr_id_at_cluster_flags;
 static ID cr_id_at_need_glyphs;
 static ID cr_id_at_need_clusters;
-static ID cr_id_at_need_backward;
+static ID cr_id_at_need_cluster_flags;
 #endif
 
 #define _SELF  (RVAL2CRFONTFACE(self))
@@ -84,7 +84,7 @@ rb_cairo_font_face_to_ruby_object (cairo_font_face_t *face)
 
       switch (cairo_font_face_get_type (face))
         {
-#if CAIRO_CHECK_VERSION(1, 7, 2)
+#if CAIRO_CHECK_VERSION(1, 7, 6)
         case CAIRO_FONT_TYPE_TOY:
           klass = rb_cCairo_ToyFontFace;
           break;
@@ -111,7 +111,7 @@ cr_font_face_allocate (VALUE klass)
   return Data_Wrap_Struct (klass, NULL, cr_font_face_free, NULL);
 }
 
-#if CAIRO_CHECK_VERSION(1, 7, 2)
+#if CAIRO_CHECK_VERSION(1, 7, 6)
 static VALUE
 cr_toy_font_face_initialize (int argc, VALUE *argv, VALUE self)
 {
@@ -346,7 +346,7 @@ typedef struct _cr_text_to_glyphs_after_hook_data {
   int *num_glyphs;
   cairo_text_cluster_t **clusters;
   int *num_clusters;
-  cairo_bool_t *backward;
+  cairo_text_cluster_flags_t *cluster_flags;
 } cr_text_to_glyphs_after_hook_data_t;
 
 static VALUE
@@ -381,12 +381,14 @@ cr_user_font_face_text_to_glyphs_func_after (VALUE user_data)
                                                 after_hook_data->num_clusters);
     }
 
-  if (after_hook_data->backward)
+  if (after_hook_data->cluster_flags)
     {
-      VALUE rb_backward;
+      VALUE rb_cluster_flags;
 
-      rb_backward = rb_ivar_get (text_to_glyphs_data, cr_id_at_backward);
-      *(after_hook_data->backward) = RVAL2CBOOL (rb_backward);
+      rb_cluster_flags = rb_ivar_get (text_to_glyphs_data,
+                                      cr_id_at_cluster_flags);
+      *(after_hook_data->cluster_flags) =
+        RVAL2CRTEXTCLUSTERFLAGS (rb_cluster_flags);
     }
 
   return data->result;
@@ -398,7 +400,7 @@ cr_user_font_face_text_to_glyphs_func (cairo_scaled_font_t *scaled_font,
                                        cairo_glyph_t **glyphs, int *num_glyphs,
                                        cairo_text_cluster_t **clusters,
                                        int *num_clusters,
-                                       cairo_bool_t *backward)
+                                       cairo_text_cluster_flags_t *cluster_flags)
 {
   cairo_status_t status = CAIRO_INT_STATUS_UNSUPPORTED;
   cairo_font_face_t *face;
@@ -434,7 +436,7 @@ cr_user_font_face_text_to_glyphs_func (cairo_scaled_font_t *scaled_font,
                                         3,
                                         CBOOL2RVAL (glyphs != NULL),
                                         CBOOL2RVAL (clusters != NULL),
-                                        CBOOL2RVAL (backward != NULL));
+                                        CBOOL2RVAL (cluster_flags != NULL));
       argv[2] = text_to_glyphs_data;
 
       data.receiver = receiver;
@@ -450,7 +452,7 @@ cr_user_font_face_text_to_glyphs_func (cairo_scaled_font_t *scaled_font,
       after_hook_data.num_glyphs = num_glyphs;
       after_hook_data.clusters = clusters;
       after_hook_data.num_clusters = num_clusters;
-      after_hook_data.backward = backward;
+      after_hook_data.cluster_flags = cluster_flags;
 
       rb_cairo__invoke_callback (cr_user_font_face_invoke_func, (VALUE)&data);
     }
@@ -581,22 +583,30 @@ cr_user_font_face_on_unicode_to_glyph (VALUE self)
 static VALUE
 cr_text_to_glyphs_data_initialize (VALUE self,
                                    VALUE need_glyphs, VALUE need_clusters,
-                                   VALUE need_backward)
+                                   VALUE need_cluster_flags)
 {
   rb_ivar_set (self, cr_id_at_glyphs, Qnil);
   rb_ivar_set (self, cr_id_at_clusters, Qnil);
-  rb_ivar_set (self, cr_id_at_backward, Qfalse);
+  rb_ivar_set (self, cr_id_at_cluster_flags, INT2NUM (0));
   rb_ivar_set (self, cr_id_at_need_glyphs, need_glyphs);
   rb_ivar_set (self, cr_id_at_need_clusters, need_clusters);
-  rb_ivar_set (self, cr_id_at_need_backward, need_backward);
+  rb_ivar_set (self, cr_id_at_need_cluster_flags, need_cluster_flags);
 
   return Qnil;
 }
 
 static VALUE
-cr_text_to_glyphs_data_backward_p (VALUE self)
+cr_text_to_glyphs_data_get_cluster_flags (VALUE self)
 {
-  return rb_ivar_get (self, cr_id_at_backward);
+  return rb_ivar_get (self, cr_id_at_cluster_flags);
+}
+
+static VALUE
+cr_text_to_glyphs_data_set_cluster_flags (VALUE self, VALUE cluster_flags)
+{
+  rb_ivar_set (self, cr_id_at_cluster_flags,
+               INT2NUM (RVAL2CRTEXTCLUSTERFLAGS (cluster_flags)));
+  return Qnil;
 }
 
 static VALUE
@@ -612,16 +622,16 @@ cr_text_to_glyphs_data_need_clusters (VALUE self)
 }
 
 static VALUE
-cr_text_to_glyphs_data_need_backward (VALUE self)
+cr_text_to_glyphs_data_need_cluster_flags (VALUE self)
 {
-  return rb_ivar_get (self, cr_id_at_need_backward);
+  return rb_ivar_get (self, cr_id_at_need_cluster_flags);
 }
 #endif
 
 void
 Init_cairo_font (void)
 {
-#if CAIRO_CHECK_VERSION(1, 7, 2)
+#if CAIRO_CHECK_VERSION(1, 7, 6)
   cr_id_call = rb_intern ("call");
   cr_id_new = rb_intern ("new");
 
@@ -632,17 +642,17 @@ Init_cairo_font (void)
 
   cr_id_at_glyphs = rb_intern ("@glyphs");
   cr_id_at_clusters = rb_intern ("@clusters");
-  cr_id_at_backward = rb_intern ("@backward");
+  cr_id_at_cluster_flags = rb_intern ("@cluster_flags");
   cr_id_at_need_glyphs = rb_intern ("@need_glyphs");
   cr_id_at_need_clusters = rb_intern ("@need_clusters");
-  cr_id_at_need_backward = rb_intern ("@need_backward");
+  cr_id_at_need_cluster_flags = rb_intern ("@need_cluster_flags");
 #endif
 
   rb_cCairo_FontFace =
     rb_define_class_under (rb_mCairo, "FontFace", rb_cObject);
   rb_define_alloc_func (rb_cCairo_FontFace, cr_font_face_allocate);
 
-#if CAIRO_CHECK_VERSION(1, 7, 2)
+#if CAIRO_CHECK_VERSION(1, 7, 6)
   rb_cCairo_ToyFontFace =
     rb_define_class_under (rb_mCairo, "ToyFontFace", rb_cCairo_FontFace);
 
@@ -680,19 +690,24 @@ Init_cairo_font (void)
            CR_TRUE, CR_TRUE, CR_TRUE);
   rb_attr (rb_cCairo_UserFontFace_TextToGlyphsData, rb_intern ("clusters"),
            CR_TRUE, CR_TRUE, CR_TRUE);
-  rb_attr (rb_cCairo_UserFontFace_TextToGlyphsData, rb_intern ("backward"),
-           CR_FALSE, CR_TRUE, CR_TRUE);
 
   rb_define_method (rb_cCairo_UserFontFace_TextToGlyphsData,
                     "initialize", cr_text_to_glyphs_data_initialize, 3);
 
   rb_define_method (rb_cCairo_UserFontFace_TextToGlyphsData,
-                    "backward?", cr_text_to_glyphs_data_backward_p, 0);
+                    "cluster_flags",
+                    cr_text_to_glyphs_data_get_cluster_flags, 0);
+  rb_define_method (rb_cCairo_UserFontFace_TextToGlyphsData,
+                    "cluster_flags=",
+                    cr_text_to_glyphs_data_set_cluster_flags, 1);
   rb_define_method (rb_cCairo_UserFontFace_TextToGlyphsData,
                     "need_glyphs?", cr_text_to_glyphs_data_need_glyphs, 0);
   rb_define_method (rb_cCairo_UserFontFace_TextToGlyphsData,
                     "need_clusters?", cr_text_to_glyphs_data_need_clusters, 0);
   rb_define_method (rb_cCairo_UserFontFace_TextToGlyphsData,
-                    "need_backward?", cr_text_to_glyphs_data_need_backward, 0);
+                    "need_cluster_flags?",
+                    cr_text_to_glyphs_data_need_cluster_flags, 0);
+
+  RB_CAIRO_DEF_SETTERS (rb_cCairo_UserFontFace_TextToGlyphsData);
 #endif
 }

data/src/rb_cairo_font_options.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-08-17 07:21:42 $
+ * $Date: 2008-09-19 12:56:27 $
  *
  * Copyright 2005-2008 Kouhei Sutou <kou@cozmixng.org>
  *
@@ -160,22 +160,6 @@ cr_options_get_hint_metrics (VALUE self)
   return INT2NUM (cairo_font_options_get_hint_metrics (_SELF (self)));
 }
 
-#if CAIRO_CHECK_VERSION(1, 7, 2)
-static VALUE
-cr_options_set_lcd_filter (VALUE self, VALUE lcd_filter)
-{
-  cairo_font_options_set_lcd_filter (_SELF (self),
-                                     RVAL2CRLCDFILTER (lcd_filter));
-  return self;
-}
-
-static VALUE
-cr_options_get_lcd_filter (VALUE self)
-{
-  return INT2NUM (cairo_font_options_get_lcd_filter (_SELF (self)));
-}
-#endif
-
 
 void
 Init_cairo_font_options (void)
@@ -208,12 +192,6 @@ Init_cairo_font_options (void)
                     cr_options_set_hint_metrics, 1);
   rb_define_method (rb_cCairo_FontOptions, "hint_metrics",
                     cr_options_get_hint_metrics, 0);
-#if CAIRO_CHECK_VERSION(1, 7, 2)
-  rb_define_method (rb_cCairo_FontOptions, "set_lcd_filter",
-                    cr_options_set_lcd_filter, 1);
-  rb_define_method (rb_cCairo_FontOptions, "lcd_filter",
-                    cr_options_get_lcd_filter, 0);
-#endif
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_FontOptions);
 }

data/src/rb_cairo_scaled_font.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-08-16 08:34:19 $
+ * $Date: 2008-09-19 12:56:27 $
  *
  * Copyright 2005-2008 Kouhei Sutou <kou@cozmixng.org>
  *
@@ -114,7 +114,7 @@ cr_scaled_font_glyph_extents (VALUE self, VALUE rb_glyphs)
   return CRTEXTEXTENTS2RVAL (&extents);
 }
 
-#if CAIRO_CHECK_VERSION(1, 7, 2)
+#if CAIRO_CHECK_VERSION(1, 7, 6)
 static VALUE
 cr_scaled_font_text_to_glyphs (VALUE self, VALUE rb_x, VALUE rb_y, VALUE rb_utf8)
 {
@@ -125,7 +125,7 @@ cr_scaled_font_text_to_glyphs (VALUE self, VALUE rb_x, VALUE rb_y, VALUE rb_utf8
   int num_glyphs;
   cairo_text_cluster_t *clusters = NULL;
   int num_clusters;
-  cairo_bool_t backward;
+  cairo_text_cluster_flags_t cluster_flags;
   cairo_status_t status;
   VALUE rb_glyphs, rb_clusters;
 
@@ -138,7 +138,7 @@ cr_scaled_font_text_to_glyphs (VALUE self, VALUE rb_x, VALUE rb_y, VALUE rb_utf8
                                              x, y, utf8, utf8_len,
                                              &glyphs, &num_glyphs,
                                              &clusters, &num_clusters,
-                                             &backward);
+                                             &cluster_flags);
   rb_cairo_check_status (status);
 
   rb_glyphs = rb_cairo__glyphs_to_ruby_object (glyphs, num_glyphs);
@@ -146,7 +146,7 @@ cr_scaled_font_text_to_glyphs (VALUE self, VALUE rb_x, VALUE rb_y, VALUE rb_utf8
   rb_clusters = rb_cairo__text_clusters_to_ruby_object (clusters, num_clusters);
   cairo_text_cluster_free (clusters);
 
-  return rb_ary_new3 (3, rb_glyphs, rb_clusters, CBOOL2RVAL (backward));
+  return rb_ary_new3 (3, rb_glyphs, rb_clusters, INT2NUM (cluster_flags));
 }
 #endif
 

data/test/test_constants.rb

@@ -1,19 +1,16 @@
 require 'cairo'
 
 class ConstantsTest < Test::Unit::TestCase
-  def test_lcd_filter
-    constant_name = "LCDFilter"
-    unless Cairo.satisfied_version?(1, 7, 2)
+  def test_text_cluster_flags
+    constant_name = "TextClusterFlag"
+    unless Cairo.satisfied_version?(1, 7, 6)
       assert_false(Cairo.const_defined?(constant_name))
       return
     end
 
     assert_true(Cairo.const_defined?(constant_name))
-    assert_equal((0..4).to_a,
-                 [Cairo::LCDFilter::DEFAULT,
-                  Cairo::LCDFilter::NONE,
-                  Cairo::LCDFilter::INTRA_PIXEL,
-                  Cairo::LCDFilter::FIR3,
-                  Cairo::LCDFilter::FIR5])
+    assert_equal((0..1).to_a,
+                 [0,
+                  Cairo::TextClusterFlag::BACKWARD])
   end
 end

data/test/test_context.rb

@@ -49,18 +49,6 @@ class ContextTest < Test::Unit::TestCase
     assert_equal("sans", context.font_face.family)
   end
 
-  def test_have_show_text_glyphs?
-    only_cairo_version(1, 7, 2)
-
-    pdf_surface = Cairo::PDFSurface.new(@output, 10, 10)
-    context = Cairo::Context.new(pdf_surface)
-    assert_true(context.have_show_text_glyphs?)
-
-    image_surface = Cairo::ImageSurface.new(10, 10)
-    context = Cairo::Context.new(image_surface)
-    assert_false(context.have_show_text_glyphs?)
-  end
-
   def test_text_to_glyphs
     only_cairo_version(1, 7, 2)
 

data/test/test_font_face.rb

@@ -54,7 +54,7 @@ class FontFaceTest < Test::Unit::TestCase
                                         Cairo::Matrix.identity,
                                         Cairo::Matrix.identity,
                                         Cairo::FontOptions.new)
-    assert_equal([[], [], false],
+    assert_equal([[], [], 0],
                  scaled_font.text_to_glyphs(0, 0, "text"))
   end
 
@@ -77,7 +77,7 @@ class FontFaceTest < Test::Unit::TestCase
     face.on_text_to_glyphs do |*args|
       text_to_glyphs_args << args
       scaled_font, utf8, data = args
-      data.backward = true
+      data.cluster_flags = :backward
     end
 
     unicode_to_glyph_args = []
@@ -102,7 +102,7 @@ class FontFaceTest < Test::Unit::TestCase
                    [Cairo::ScaledFont, ?e],
                    [Cairo::ScaledFont, ?x],
                    [Cairo::ScaledFont, ?t]],
-                  [[], [], true]],
+                  [[], [], Cairo::TextClusterFlag::BACKWARD]],
                  [classify_cairo_object(init_args),
                   classify_cairo_object(render_glyph_args),
                   classify_cairo_object(text_to_glyphs_args),
@@ -133,7 +133,7 @@ class FontFaceTest < Test::Unit::TestCase
       def text_to_glyphs(*args)
         @text_to_glyphs_args << args
         scaled_font, utf8, data = args
-        data.backward = true
+        data.cluster_flags = :backward
       end
 
       def unicode_to_glyph(*args)
@@ -164,7 +164,7 @@ class FontFaceTest < Test::Unit::TestCase
                    [Cairo::ScaledFont, ?e],
                    [Cairo::ScaledFont, ?x],
                    [Cairo::ScaledFont, ?t]],
-                  [[], [], true]],
+                  [[], [], Cairo::TextClusterFlag::BACKWARD]],
                  [classify_cairo_object(face.init_args),
                   classify_cairo_object(face.render_glyph_args),
                   classify_cairo_object(face.text_to_glyphs_args),
@@ -191,7 +191,7 @@ class FontFaceTest < Test::Unit::TestCase
     face.on_text_to_glyphs do |*args|
       text_to_glyphs_args << args
       scaled_font, utf8, data = args
-      data.backward = true
+      data.cluster_flags = :backward
     end
 
     unicode_to_glyph_args = []
@@ -220,7 +220,7 @@ class FontFaceTest < Test::Unit::TestCase
                   [],
                   [],
                   [],
-                  [[], [], true]],
+                  [[], [], Cairo::TextClusterFlag::BACKWARD]],
                  [classify_cairo_object(init_args),
                   classify_cairo_object(render_glyph_args),
                   classify_cairo_object(text_to_glyphs_args),

data/test/test_font_options.rb

@@ -7,26 +7,7 @@ class FontOptionsTest < Test::Unit::TestCase
     @options = Cairo::FontOptions.new
   end
 
-  def test_lcd_filter
-    only_cairo_version(1, 7, 2)
-
-    assert_equal(Cairo::LCDFilter::DEFAULT, @options.lcd_filter)
-    @options.lcd_filter = :fir3
-    assert_equal(Cairo::LCDFilter::FIR3, @options.lcd_filter)
-
-    assert_invalid_lcd_filter(Cairo::LCDFilter::DEFAULT - 1)
-    assert_invalid_lcd_filter(Cairo::LCDFilter::FIR5 + 1)
-  end
-
-  def assert_invalid_lcd_filter(value)
-    options = Cairo::FontOptions.new
-    exception = assert_raise(ArgumentError) do
-      options.lcd_filter = value
-    end
-    min = Cairo::LCDFilter::DEFAULT
-    max = Cairo::LCDFilter::FIR5
-    assert_equal("invalid lcd_filter: #{value} " +
-                 "(expect #{min} <= lcd_filter <= #{max})",
-                 exception.message)
+  def test_something
+    # WRITE ME!
   end
 end

data/test/test_scaled_font.rb

@@ -17,7 +17,7 @@ class ScaledFontTest < Test::Unit::TestCase
   end
 
   def test_text_to_glyphs
-    only_cairo_version(1, 7, 2)
+    only_cairo_version(1, 7, 6)
 
     surface = Cairo::PDFSurface.new(StringIO.new, 10, 10)
     context = Cairo::Context.new(surface)
@@ -27,8 +27,8 @@ class ScaledFontTest < Test::Unit::TestCase
                                         Cairo::FontOptions.new)
     expected_glyphs = []
     expected_clusters = []
-    expected_backward = false
-    assert_equal([expected_glyphs, expected_clusters, expected_backward],
+    expected_cluster_flags = 0
+    assert_equal([expected_glyphs, expected_clusters, expected_cluster_flags],
                  scaled_font.text_to_glyphs(0, 0, "text"))
   end
 end