pango 1.0.3 → 1.1.0

data/ext/pango/rbpangolayoutiter.c

@@ -1,17 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangolayoutiter.c -
-
-  $Author: ggc $
-  $Date: 2006/06/22 19:52:54 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(r) ((PangoLayoutIter*)RVAL2BOXED(r, PANGO_TYPE_LAYOUT_ITER))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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 "rbpangoprivate.h"
+
+#define RG_TARGET_NAMESPACE cLayoutIter
+#define _SELF(r) (RVAL2PANGOLAYOUTITER(r))
 
 /**********************************/
 #ifndef HAVE_PANGO_LAYOUT_ITER_GET_TYPE
@@ -36,93 +47,93 @@ pango_layout_iter_get_type(void)
 /**********************************/
 
 static VALUE
-layout_iter_next_run(VALUE self)
+rg_next_run_bang(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_iter_next_run(_SELF(self)));
 }
 
 static VALUE
-layout_iter_next_char(VALUE self)
+rg_next_char_bang(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_iter_next_char(_SELF(self)));
 }
 
 static VALUE
-layout_iter_next_cluster(VALUE self)
+rg_next_cluster_bang(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_iter_next_cluster(_SELF(self)));
 }
 
 static VALUE
-layout_iter_next_line(VALUE self)
+rg_next_line_bang(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_iter_next_line(_SELF(self)));
 }
 
 static VALUE
-layout_iter_at_last_line(VALUE self)
+rg_at_last_line_p(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_iter_at_last_line(_SELF(self)));
 }
 
 static VALUE
-layout_iter_get_index(VALUE self)
+rg_index(VALUE self)
 {
     return INT2NUM(pango_layout_iter_get_index(_SELF(self)));
 }
 
 static VALUE
-layout_iter_get_baseline(VALUE self)
+rg_baseline(VALUE self)
 {
     return INT2NUM(pango_layout_iter_get_baseline(_SELF(self)));
 }
 
 static VALUE
-layout_iter_get_run(VALUE self)
+rg_run(VALUE self)
 {
     PangoLayoutRun* run = pango_layout_iter_get_run(_SELF(self));
-    return BOXED2RVAL(run, PANGO_TYPE_GLYPH_ITEM);
+    return PANGOGLYPHITEM2RVAL(run);
 }
 
 static VALUE
-layout_iter_get_line(VALUE self)
+rg_line(VALUE self)
 {
-    return BOXED2RVAL(pango_layout_iter_get_line(_SELF(self)), PANGO_TYPE_LAYOUT_LINE);
+    return PANGOLAYOUTLINE2RVAL(pango_layout_iter_get_line(_SELF(self)));
 }
 
 static VALUE
-layout_iter_get_char_extents(VALUE self)
+rg_char_extents(VALUE self)
 {
     PangoRectangle logical_rect;
-    
+
     pango_layout_iter_get_char_extents(_SELF(self), &logical_rect);
-    return BOXED2RVAL(&logical_rect, PANGO_TYPE_RECTANGLE);
+    return PANGORECTANGLE2RVAL(&logical_rect);
 }
 
 static VALUE
-layout_iter_get_cluster_extents(VALUE self)
+rg_cluster_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
     pango_layout_iter_get_cluster_extents(_SELF(self), &ink_rect, &logical_rect);
 
-    return rb_assoc_new(BOXED2RVAL(&ink_rect, PANGO_TYPE_RECTANGLE),
-                        BOXED2RVAL(&logical_rect, PANGO_TYPE_RECTANGLE));
+    return rb_assoc_new(PANGORECTANGLE2RVAL(&ink_rect),
+                        PANGORECTANGLE2RVAL(&logical_rect));
 }
 
 static VALUE
-layout_iter_get_run_extents(VALUE self)
+rg_run_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
     pango_layout_iter_get_run_extents(_SELF(self), &ink_rect, &logical_rect);
 
-    return rb_assoc_new(BOXED2RVAL(&ink_rect, PANGO_TYPE_RECTANGLE),
-                        BOXED2RVAL(&logical_rect, PANGO_TYPE_RECTANGLE));
+    return rb_assoc_new(PANGORECTANGLE2RVAL(&ink_rect),
+                        PANGORECTANGLE2RVAL(&logical_rect));
 }
 
 static VALUE
-layout_iter_get_line_yrange(VALUE self)
+rg_line_yrange(VALUE self)
 {
     int y0, y1;
     pango_layout_iter_get_line_yrange(_SELF(self), &y0, &y1);
@@ -130,49 +141,49 @@ layout_iter_get_line_yrange(VALUE self)
 }
 
 static VALUE
-layout_iter_get_line_extents(VALUE self)
+rg_line_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
     pango_layout_iter_get_line_extents(_SELF(self), &ink_rect, &logical_rect);
 
-    return rb_assoc_new(BOXED2RVAL(&ink_rect, PANGO_TYPE_RECTANGLE),
-                        BOXED2RVAL(&logical_rect, PANGO_TYPE_RECTANGLE));
+    return rb_assoc_new(PANGORECTANGLE2RVAL(&ink_rect),
+                        PANGORECTANGLE2RVAL(&logical_rect));
 }
 static VALUE
-layout_iter_get_layout_extents(VALUE self)
+rg_layout_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
     pango_layout_iter_get_layout_extents(_SELF(self), &ink_rect, &logical_rect);
 
-    return rb_assoc_new(BOXED2RVAL(&ink_rect, PANGO_TYPE_RECTANGLE),
-                        BOXED2RVAL(&logical_rect, PANGO_TYPE_RECTANGLE));
+    return rb_assoc_new(PANGORECTANGLE2RVAL(&ink_rect),
+                        PANGORECTANGLE2RVAL(&logical_rect));
 }
 
 void
-Init_pango_layout_iter()
+Init_pango_layout_iter(VALUE mPango)
 {
-    VALUE pIter = G_DEF_CLASS(PANGO_TYPE_LAYOUT_ITER, "LayoutIter", mPango);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_LAYOUT_ITER, "LayoutIter", mPango);
 
     rbgobj_boxed_not_copy_obj(PANGO_TYPE_LAYOUT_ITER);
 
-    rb_define_method(pIter, "next_run!", layout_iter_next_run, 0);
-    rb_define_method(pIter, "next_char!", layout_iter_next_char, 0);
-    rb_define_method(pIter, "next_cluster!", layout_iter_next_cluster, 0);
-    rb_define_method(pIter, "next_line!", layout_iter_next_line, 0);
-    rb_define_method(pIter, "at_last_line?", layout_iter_at_last_line, 0);
+    RG_DEF_METHOD_BANG(next_run, 0);
+    RG_DEF_METHOD_BANG(next_char, 0);
+    RG_DEF_METHOD_BANG(next_cluster, 0);
+    RG_DEF_METHOD_BANG(next_line, 0);
+    RG_DEF_METHOD_P(at_last_line, 0);
     /* for backword compatibility. :< */
-    rb_define_alias(pIter, "at_last_line!", "at_last_line?");
-    rb_define_method(pIter, "index", layout_iter_get_index, 0);
-    rb_define_method(pIter, "baseline", layout_iter_get_baseline, 0);
-    rb_define_method(pIter, "run", layout_iter_get_run, 0);
-    rb_define_method(pIter, "line", layout_iter_get_line, 0);
-    rb_define_method(pIter, "char_extents", layout_iter_get_char_extents, 0);
-    rb_define_method(pIter, "cluster_extents", layout_iter_get_cluster_extents, 0);
-    rb_define_method(pIter, "run_extents", layout_iter_get_run_extents, 0);
-    rb_define_method(pIter, "line_yrange", layout_iter_get_line_yrange, 0);
-    rb_define_method(pIter, "line_extents", layout_iter_get_line_extents, 0);
-    rb_define_method(pIter, "layout_extents", layout_iter_get_layout_extents, 0);
-   
+    RG_DEF_ALIAS("at_last_line!", "at_last_line?");
+    RG_DEF_METHOD(index, 0);
+    RG_DEF_METHOD(baseline, 0);
+    RG_DEF_METHOD(run, 0);
+    RG_DEF_METHOD(line, 0);
+    RG_DEF_METHOD(char_extents, 0);
+    RG_DEF_METHOD(cluster_extents, 0);
+    RG_DEF_METHOD(run_extents, 0);
+    RG_DEF_METHOD(line_yrange, 0);
+    RG_DEF_METHOD(line_extents, 0);
+    RG_DEF_METHOD(layout_extents, 0);
+
 }

data/ext/pango/rbpangolayoutline.c

@@ -1,18 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangolayoutline.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:33 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-
-#define _SELF(r) ((PangoLayoutLine*)RVAL2BOXED(r, PANGO_TYPE_LAYOUT_LINE))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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 "rbpangoprivate.h"
+
+#define RG_TARGET_NAMESPACE cLayoutLine
+#define _SELF(r) (RVAL2PANGOLAYOUTLINE(r))
 
 /**********************************/
 #if !PANGO_CHECK_VERSION(1,9,0)
@@ -39,29 +49,29 @@ pango_layout_line_get_type(void)
 /**********************************/
 
 static VALUE
-layout_line_get_extents(VALUE self)
+rg_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
     pango_layout_line_get_extents(_SELF(self), &ink_rect, &logical_rect);
 
-    return rb_assoc_new(BOXED2RVAL(&ink_rect, PANGO_TYPE_RECTANGLE),
-                        BOXED2RVAL(&logical_rect, PANGO_TYPE_RECTANGLE));
+    return rb_assoc_new(PANGORECTANGLE2RVAL(&ink_rect),
+                        PANGORECTANGLE2RVAL(&logical_rect));
 }
 
 static VALUE
-layout_line_get_pixel_extents(VALUE self)
+rg_pixel_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
     pango_layout_line_get_pixel_extents(_SELF(self), &ink_rect, &logical_rect);
 
-    return rb_assoc_new(BOXED2RVAL(&ink_rect, PANGO_TYPE_RECTANGLE),
-                        BOXED2RVAL(&logical_rect, PANGO_TYPE_RECTANGLE));
+    return rb_assoc_new(PANGORECTANGLE2RVAL(&ink_rect),
+                        PANGORECTANGLE2RVAL(&logical_rect));
 }
 
 static VALUE
-layout_line_index_to_x(VALUE self, VALUE index, VALUE trailing)
+rg_index_to_x(VALUE self, VALUE index, VALUE trailing)
 {
     int x_pos;
     pango_layout_line_index_to_x(_SELF(self), NUM2INT(index), 
@@ -70,17 +80,17 @@ layout_line_index_to_x(VALUE self, VALUE index, VALUE trailing)
 }
 
 static VALUE
-layout_line_x_to_index(VALUE self, VALUE x_pos)
+rg_x_to_index(VALUE self, VALUE x_pos)
 {
     int index, trailing;
-    
+
     gboolean ret = pango_layout_line_x_to_index(_SELF(self), NUM2INT(x_pos),
                                                 &index, &trailing);
     return rb_ary_new3(CBOOL2RVAL(ret), INT2NUM(index), INT2NUM(trailing));
 }
 
 static VALUE
-layout_line_get_x_ranges(VALUE self, VALUE start_index, VALUE end_index)
+rg_get_x_ranges(VALUE self, VALUE start_index, VALUE end_index)
 {
     int* ranges;
     int i, n_ranges;
@@ -100,39 +110,39 @@ layout_line_get_x_ranges(VALUE self, VALUE start_index, VALUE end_index)
 
 /* Structure members */
 static VALUE
-layout_line_get_layout(VALUE self)
+rg_layout(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->layout);
 }
 
 static VALUE
-layout_line_set_layout(VALUE self, VALUE val)
+rg_set_layout(VALUE self, VALUE val)
 {
-    _SELF(self)->layout = PANGO_LAYOUT(RVAL2GOBJ(val));
+    _SELF(self)->layout = RVAL2PANGOLAYOUT(val);
     return self;
 }
 
 static VALUE
-layout_line_get_start_index(VALUE self)
+rg_start_index(VALUE self)
 {
     return INT2NUM(_SELF(self)->start_index);
 }
 
 static VALUE
-layout_line_set_start_index(VALUE self, VALUE val)
+rg_set_start_index(VALUE self, VALUE val)
 {
     _SELF(self)->start_index = NUM2INT(val);
     return self;
 }
 
 static VALUE
-layout_line_get_length(VALUE self)
+rg_length(VALUE self)
 {
     return INT2NUM(_SELF(self)->length);
 }
 
 static VALUE
-layout_line_set_length(VALUE self, VALUE val)
+rg_set_length(VALUE self, VALUE val)
 {
     _SELF(self)->length = NUM2INT(val);
     return self;
@@ -140,7 +150,7 @@ layout_line_set_length(VALUE self, VALUE val)
 
 #if PANGO_CHECK_VERSION(1,2,0)
 static VALUE
-layout_line_get_runs(VALUE self)
+rg_runs(VALUE self)
 {
     GSList* list = _SELF(self)->runs;
     VALUE ary = rb_ary_new();
@@ -151,56 +161,81 @@ layout_line_get_runs(VALUE self)
         new_item.item = pango_item_copy(old_item->item);
         new_item.glyphs = pango_glyph_string_copy(old_item->glyphs);
 
-        rb_ary_push(ary, BOXED2RVAL(&new_item, PANGO_TYPE_GLYPH_ITEM));
+        rb_ary_push(ary, PANGOGLYPHITEM2RVAL(&new_item));
         list = list->next;
     }
     return ary;
 }
 #endif
 
+struct layout_line_set_runs_args {
+    PangoLayoutLine *line;
+    VALUE ary;
+    long n;
+    GSList *result;
+};
+
 static VALUE
-layout_line_set_runs(VALUE self, VALUE ary)
+layout_line_set_runs_body(VALUE value)
 {
-    int i, len;
-    GSList* list = NULL;
+    struct layout_line_set_runs_args *args = (struct layout_line_set_runs_args *)value;
+    long i;
 
-    len = RARRAY_LEN(ary);
+    for (i = 0; i < args->n; i++)
+        args->result = g_slist_append(args->result,
+                                      RVAL2PANGOGLYPHITEM(RARRAY_PTR(args->ary)[i]));
 
-    for (i = 0; i < len; i++) {
-        list = g_slist_append(list, RVAL2BOXED(RARRAY_PTR(ary)[i], 
-                                               PANGO_TYPE_GLYPH_ITEM));
-    }
+    g_slist_free(args->line->runs);
+    args->line->runs = args->result;
 
-    if (_SELF(self)->runs) {
-        g_slist_free(_SELF(self)->runs);
-    }
-    _SELF(self)->runs = list;
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+layout_line_set_runs_rescue(VALUE value)
+{
+    g_slist_free(((struct layout_line_set_runs_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static VALUE
+rg_set_runs(VALUE self, VALUE attrs)
+{
+    struct layout_line_set_runs_args args;
+    args.line = _SELF(self);
+    args.ary = rb_ary_to_ary(attrs);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = NULL;
+
+    rb_rescue(layout_line_set_runs_body, (VALUE)&args,
+              layout_line_set_runs_rescue, (VALUE)&args);
 
     return self;
 }
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
-layout_line_is_paragraph_start(VALUE self)
+rg_paragraph_start_p(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->is_paragraph_start);
 }
 
 static VALUE
-layout_line_set_paragraph_start(VALUE self, VALUE val)
+rg_set_paragraph_start(VALUE self, VALUE val)
 {
     _SELF(self)->is_paragraph_start = RVAL2CBOOL(val);
     return self;
 }
 
 static VALUE
-layout_line_get_resolved_dir(VALUE self)
+rg_resolved_dir(VALUE self)
 {
     return UINT2NUM(_SELF(self)->resolved_dir);
 }
 
 static VALUE
-layout_line_set_resolved_dir(VALUE self, VALUE val)
+rg_set_resolved_dir(VALUE self, VALUE val)
 {
     _SELF(self)->resolved_dir = NUM2UINT(val);
     return self;
@@ -208,31 +243,31 @@ layout_line_set_resolved_dir(VALUE self, VALUE val)
 #endif
 
 void
-Init_pango_layout_line()
-{
-    VALUE pLine = G_DEF_CLASS(PANGO_TYPE_LAYOUT_LINE, "LayoutLine", mPango);
-
-    rb_define_method(pLine, "extents", layout_line_get_extents, 0);
-    rb_define_method(pLine, "pixel_extents", layout_line_get_pixel_extents, 0);
-    rb_define_method(pLine, "index_to_x", layout_line_index_to_x, 2);
-    rb_define_method(pLine, "x_to_index", layout_line_x_to_index, 1); 
-    rb_define_method(pLine, "get_x_ranges", layout_line_get_x_ranges, 2); 
-    rb_define_method(pLine, "layout", layout_line_get_layout, 0); 
-    rb_define_method(pLine, "set_layout", layout_line_set_layout, 1); 
-    rb_define_method(pLine, "start_index", layout_line_get_start_index, 0); 
-    rb_define_method(pLine, "set_start_index", layout_line_set_start_index, 1); 
-    rb_define_method(pLine, "length", layout_line_get_length, 0); 
-    rb_define_method(pLine, "set_length", layout_line_set_length, 1); 
+Init_pango_layout_line(VALUE mPango)
+{
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_LAYOUT_LINE, "LayoutLine", mPango);
+
+    RG_DEF_METHOD(extents, 0);
+    RG_DEF_METHOD(pixel_extents, 0);
+    RG_DEF_METHOD(index_to_x, 2);
+    RG_DEF_METHOD(x_to_index, 1); 
+    RG_DEF_METHOD(get_x_ranges, 2); 
+    RG_DEF_METHOD(layout, 0); 
+    RG_DEF_METHOD(set_layout, 1); 
+    RG_DEF_METHOD(start_index, 0); 
+    RG_DEF_METHOD(set_start_index, 1); 
+    RG_DEF_METHOD(length, 0); 
+    RG_DEF_METHOD(set_length, 1); 
 #if PANGO_CHECK_VERSION(1,2,0)
-    rb_define_method(pLine, "runs", layout_line_get_runs, 0); 
+    RG_DEF_METHOD(runs, 0); 
 #endif
-    rb_define_method(pLine, "set_runs", layout_line_set_runs, 1); 
+    RG_DEF_METHOD(set_runs, 1); 
 
 #if PANGO_CHECK_VERSION(1,4,0)
-    rb_define_method(pLine, "paragraph_start?", layout_line_is_paragraph_start, 0); 
-    rb_define_method(pLine, "set_paragraph_start", layout_line_set_paragraph_start, 1); 
-    rb_define_method(pLine, "resolved_dir", layout_line_get_resolved_dir, 0); 
-    rb_define_method(pLine, "set_resolved_dir", layout_line_set_resolved_dir, 1); 
+    RG_DEF_METHOD_P(paragraph_start, 0); 
+    RG_DEF_METHOD(set_paragraph_start, 1); 
+    RG_DEF_METHOD(resolved_dir, 0); 
+    RG_DEF_METHOD(set_resolved_dir, 1); 
 #endif
-    G_DEF_SETTERS(pLine);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }