pango 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/pango/rbpangofontsetsimple.c

@@ -1,50 +1,60 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangofontsetsimple.c -
-
-  $Author: mutoh $
-  $Date: 2005/10/14 09:55:57 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 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"
 
 #ifdef PANGO_ENABLE_BACKEND
 
-#define _SELF(self) (PANGO_FONTSET_SIMPLE(RVAL2GOBJ(self)))
-#define RVAL2LANG(v) ((PangoLanguage*)RVAL2BOXED(v, PANGO_TYPE_LANGUAGE))
+#define RG_TARGET_NAMESPACE cFontsetSimple
+#define _SELF(self) (RVAL2PANGOFONTSETSIMPLE(self))
 
 static VALUE
-fontset_simple_initialize(VALUE self, VALUE lang)
+rg_initialize(VALUE self, VALUE lang)
 {
-    G_INITIALIZE(self, pango_fontset_simple_new(RVAL2LANG(lang)));
+    G_INITIALIZE(self, pango_fontset_simple_new(RVAL2PANGOLANGUAGE(lang)));
     return Qnil;
 }
 
 static VALUE
-fontset_simple_append(VALUE self, VALUE font)
+rg_append(VALUE self, VALUE font)
 {
-    pango_fontset_simple_append(_SELF(self), PANGO_FONT(RVAL2GOBJ(font)));
+    pango_fontset_simple_append(_SELF(self), RVAL2PANGOFONT(font));
     return self;
 }
 
 static VALUE
-fontset_simple_size(VALUE self)
+rg_size(VALUE self)
 {
     return INT2NUM(pango_fontset_simple_size(_SELF(self)));
 }
 
 #endif
 void
-Init_pango_fontset_simple()
+Init_pango_fontset_simple(VALUE mPango)
 {
 #ifdef PANGO_ENABLE_BACKEND
-    VALUE pFSimple = G_DEF_CLASS(PANGO_TYPE_FONTSET_SIMPLE, "FontsetSimple", mPango);
-    
-    rb_define_method(pFSimple, "initialize", fontset_simple_initialize, 1);
-    rb_define_method(pFSimple, "append", fontset_simple_append, 1);
-    rb_define_method(pFSimple, "size", fontset_simple_size, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_FONTSET_SIMPLE, "FontsetSimple", mPango);
+
+    RG_DEF_METHOD(initialize, 1);
+    RG_DEF_METHOD(append, 1);
+    RG_DEF_METHOD(size, 0);
 #endif
 }

data/ext/pango/rbpangoglyphinfo.c

@@ -1,27 +1,40 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangoglyphinfo.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:33 $
-
-  Copyright (C) 2005 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 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
+ */
 
-#define _SELF(self) ((PangoGlyphInfo*)RVAL2BOXED(self, PANGO_TYPE_GLYPH_INFO))
+#include "rbpangoprivate.h"
 
+#define RG_TARGET_NAMESPACE cGlyphInfo
+#define _SELF(self) (RVAL2PANGOGLYPHINFO(self))
 
 /**********************************/
-PangoGlyphInfo*
-pango_glyph_info_copy (const PangoGlyphInfo* info)
+static PangoGlyphInfo *
+pango_glyph_info_copy(const PangoGlyphInfo *info)
 {
-  PangoGlyphInfo* data;
-  g_return_val_if_fail (info != NULL, NULL);
+  PangoGlyphInfo *data;
+
+  g_return_val_if_fail(info != NULL, NULL);
+
   data = g_new(PangoGlyphInfo, 1);
   *data = *info;
+
   return data;
 }
 
@@ -39,27 +52,27 @@ pango_glyph_info_get_type(void)
 /**********************************/
 
 static VALUE
-gi_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, g_new0(PangoGlyphInfo, 1));
     return Qnil;
 }
 
 static VALUE
-gi_glyph(VALUE self)
+rg_glyph(VALUE self)
 {
     return UINT2NUM(_SELF(self)->glyph);
 }
 
 static VALUE
-gi_set_glyph(VALUE self, VALUE val)
+rg_set_glyph(VALUE self, VALUE val)
 {
     _SELF(self)->glyph = NUM2UINT(val);
     return self;
 }
 
 static VALUE
-gi_geometry(VALUE self)
+rg_geometry(VALUE self)
 {
     PangoGlyphGeometry geo = _SELF(self)->geometry;
 
@@ -68,7 +81,7 @@ gi_geometry(VALUE self)
 }
 
 static VALUE
-gi_set_geometry(VALUE self, VALUE width, VALUE x_offset, VALUE y_offset)
+rg_set_geometry(VALUE self, VALUE width, VALUE x_offset, VALUE y_offset)
 {
     PangoGlyphGeometry geo = _SELF(self)->geometry;
 
@@ -83,30 +96,30 @@ gi_set_geometry(VALUE self, VALUE width, VALUE x_offset, VALUE y_offset)
   This method may be changed in the future following Pango implementation.
  */
 static VALUE
-gi_attr_is_cluster_start(VALUE self)
+rg_cluster_start_p(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->attr.is_cluster_start);
 }
 
 static VALUE
-gi_attr_set_is_cluster_start(VALUE self, VALUE val)
+rg_set_cluster_start(VALUE self, VALUE val)
 {
     _SELF(self)->attr.is_cluster_start = RVAL2CBOOL(val);
     return self;
 }
 
 void
-Init_pango_glyph_info()
+Init_pango_glyph_info(VALUE mPango)
 {
-    VALUE pInfo = G_DEF_CLASS(PANGO_TYPE_GLYPH_INFO, "GlyphInfo", mPango);
-    
-    rb_define_method(pInfo, "initialize", gi_initialize, 0);
-    rb_define_method(pInfo, "glyph", gi_glyph, 0);
-    rb_define_method(pInfo, "set_glyph", gi_set_glyph, 1);
-    rb_define_method(pInfo, "geometry", gi_geometry, 0);
-    rb_define_method(pInfo, "set_geometry", gi_set_geometry, 3);
-    rb_define_method(pInfo, "cluster_start?", gi_attr_is_cluster_start, 0);
-    rb_define_method(pInfo, "set_cluster_start", gi_attr_set_is_cluster_start, 1);
-
-    G_DEF_SETTERS(pInfo);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_GLYPH_INFO, "GlyphInfo", mPango);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(glyph, 0);
+    RG_DEF_METHOD(set_glyph, 1);
+    RG_DEF_METHOD(geometry, 0);
+    RG_DEF_METHOD(set_geometry, 3);
+    RG_DEF_METHOD_P(cluster_start, 0);
+    RG_DEF_METHOD(set_cluster_start, 1);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rbpangoglyphitem.c

@@ -1,18 +1,29 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangoglyphitem.c -
-
-  $Author: ggc $
-  $Date: 2006/06/22 19:52:54 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
+/*
+ *  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"
 
 #if PANGO_CHECK_VERSION(1,2,0)
-#define _SELF(r) ((PangoGlyphItem*)RVAL2BOXED(r, PANGO_TYPE_GLYPH_ITEM))
+#define RG_TARGET_NAMESPACE cGlyphItem
+#define _SELF(r) (RVAL2PANGOGLYPHITEM(r))
 
 /**********************************/
 #ifndef HAVE_PANGO_GLYPH_ITEM_GET_TYPE
@@ -53,50 +64,50 @@ pango_glyph_item_get_type(void)
 /**********************************/
 
 static VALUE
-glyph_item_get_item(VALUE self)
+rg_item(VALUE self)
 {
     PangoItem* item = _SELF(self)->item;
-    return BOXED2RVAL(item, PANGO_TYPE_ITEM);
+    return PANGOITEM2RVAL(item);
 }
 
 static VALUE
-glyph_item_get_glyphs(VALUE self)
+rg_glyphs(VALUE self)
 {
     PangoGlyphString* glyphs = _SELF(self)->glyphs;
-    return BOXED2RVAL(glyphs, PANGO_TYPE_GLYPH_STRING);
+    return PANGOGLYPHSTRING2RVAL(glyphs);
 }
 
 static VALUE
-glyph_item_split(VALUE self, VALUE text, VALUE split_index)
+rg_split(VALUE self, VALUE text, VALUE split_index)
 {
-    return BOXED2RVAL(pango_glyph_item_split(_SELF(self), RVAL2CSTR(text),
-                                             NUM2INT(split_index)), PANGO_TYPE_GLYPH_ITEM);
+    return PANGOGLYPHITEM2RVAL(pango_glyph_item_split(_SELF(self), RVAL2CSTR(text),
+                                                      NUM2INT(split_index)));
 }
 
 static VALUE
-glyph_item_apply_attrs(VALUE self, VALUE text, VALUE attrs)
+rg_appy_attrs(VALUE self, VALUE text, VALUE attrs)
 {
     GSList* list = pango_glyph_item_apply_attrs(_SELF(self), RVAL2CSTR(text),
-                                                (PangoAttrList*)RVAL2BOXED(attrs, PANGO_TYPE_ATTR_LIST));
+                                                RVAL2PANGOATTRLIST(attrs));
 
     VALUE ret = rb_ary_new();
 
     while (list) {
-        rb_ary_push(ret, BOXED2RVAL(list->data, PANGO_TYPE_GLYPH_ITEM));
+        rb_ary_push(ret, PANGOGLYPHITEM2RVAL(list->data));
         pango_glyph_item_free(list->data); 
         list = list->next;
     }
-   
+
     g_slist_free(list);
     return ret;
 }
 
 #if PANGO_CHECK_VERSION(1,6,0)
 static VALUE
-glyph_item_letter_space(VALUE self, VALUE text, VALUE log_attrs, VALUE letter_spacing)
+rg_letter_space(VALUE self, VALUE text, VALUE log_attrs, VALUE letter_spacing)
 {
     pango_glyph_item_letter_space(_SELF(self), RVAL2CSTR(text),
-                                  (PangoLogAttr*)RVAL2BOXED(log_attrs, PANGO_TYPE_LOG_ATTR),
+                                  RVAL2PANGOLOGATTR(log_attrs),
                                   NUM2INT(letter_spacing));
     return self;
 }
@@ -104,20 +115,19 @@ glyph_item_letter_space(VALUE self, VALUE text, VALUE log_attrs, VALUE letter_sp
 #endif
 
 void
-Init_pango_glyph_item()
+Init_pango_glyph_item(VALUE mPango)
 {
 #if PANGO_CHECK_VERSION(1,2,0)
-    VALUE pItem = G_DEF_CLASS(PANGO_TYPE_GLYPH_ITEM, "GlyphItem", mPango);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_GLYPH_ITEM, "GlyphItem", mPango);
 
-    rb_define_method(pItem, "item", glyph_item_get_item, 0);
-    rb_define_method(pItem, "glyphs", glyph_item_get_glyphs, 0);
+    RG_DEF_METHOD(item, 0);
+    RG_DEF_METHOD(glyphs, 0);
 
-    rb_define_method(pItem, "split", glyph_item_split, 2);
-    rb_define_method(pItem, "appy_attrs", glyph_item_apply_attrs, 2);
+    RG_DEF_METHOD(split, 2);
+    RG_DEF_METHOD(appy_attrs, 2);
 
 #if PANGO_CHECK_VERSION(1,6,0)
-    rb_define_method(pItem, "letter_space", glyph_item_letter_space, 3);
+    RG_DEF_METHOD(letter_space, 3);
 #endif
 #endif
 }
-

data/ext/pango/rbpangoglyphstring.c

@@ -1,34 +1,45 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangoglyphstring.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:33 $
-
-  Copyright (C) 2002-2006 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(self) ((PangoGlyphString*)(RVAL2BOXED(self, PANGO_TYPE_GLYPH_STRING)))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2006 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 cGlyphString
+#define _SELF(self) (RVAL2PANGOGLYPHSTRING(self))
 
 static VALUE
-rglyph_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, pango_glyph_string_new());
     return Qnil;
 }
 
 static VALUE
-rglyph_set_size(VALUE self, VALUE len)
+rg_set_size(VALUE self, VALUE len)
 {
     pango_glyph_string_set_size(_SELF(self), NUM2INT(len));
     return self;
 }
 
 static VALUE
-rglyph_extents(int argc, VALUE *argv, VALUE self)
+rg_extents(int argc, VALUE *argv, VALUE self)
 {
     VALUE font, start_index, end_index;
     PangoRectangle ink_rect;
@@ -38,29 +49,29 @@ rglyph_extents(int argc, VALUE *argv, VALUE self)
 
     if (NIL_P(start_index)){
         pango_glyph_string_extents(_SELF(self), 
-                                   PANGO_FONT(RVAL2GOBJ(font)),
+                                   RVAL2PANGOFONT(font),
                                    &ink_rect, &logical_rect);
     } else {
         pango_glyph_string_extents_range(_SELF(self), 
                                          NUM2INT(start_index), NUM2INT(end_index),
-                                         PANGO_FONT(RVAL2GOBJ(font)),
+                                         RVAL2PANGOFONT(font),
                                          &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));
 }
 
 #if PANGO_CHECK_VERSION(1,14,0)
 static VALUE
-rglyph_get_width(VALUE self)
+rg_width(VALUE self)
 {
     return INT2NUM(pango_glyph_string_get_width(_SELF(self)));
 }
 #endif
 
 static VALUE
-rglyph_index_to_x(VALUE self, VALUE text, VALUE analysis, VALUE index, VALUE trailing)
+rg_index_to_x(VALUE self, VALUE text, VALUE analysis, VALUE index, VALUE trailing)
 {
     int x_pos;
     StringValue(text);
@@ -70,14 +81,14 @@ rglyph_index_to_x(VALUE self, VALUE text, VALUE analysis, VALUE index, VALUE tra
                                    * pango_glyph_string_index_to_x */
                                   (char *)RSTRING_PTR(text),
                                   RSTRING_LEN(text),
-                                  (PangoAnalysis*)RVAL2BOXED(analysis, PANGO_TYPE_ANALYSIS),
+                                  RVAL2PANGOANALYSIS(analysis),
                                   NUM2INT(index), RVAL2CBOOL(trailing),
                                   &x_pos);
     return INT2NUM(x_pos);
 }
 
 static VALUE
-rglyph_x_to_index(VALUE self, VALUE text, VALUE analysis, VALUE x_pos)
+rg_x_to_index(VALUE self, VALUE text, VALUE analysis, VALUE x_pos)
 {
     int index;
     int trailing;
@@ -88,41 +99,30 @@ rglyph_x_to_index(VALUE self, VALUE text, VALUE analysis, VALUE x_pos)
                                    * pango_glyph_string_index_to_x */
                                   (char *)RSTRING_PTR(text),
                                   RSTRING_LEN(text),
-                                  (PangoAnalysis*)RVAL2BOXED(analysis, PANGO_TYPE_ANALYSIS),
+                                  RVAL2PANGOANALYSIS(analysis),
                                   NUM2INT(x_pos),
                                   &index, &trailing);
     return rb_assoc_new(INT2NUM(index), CBOOL2RVAL(trailing));
 }
 
 static VALUE
-rglyph_get_logical_widgths(VALUE self, VALUE text, VALUE embedding_level)
+rg_get_logical_widths(VALUE self, VALUE rbtext, VALUE rbembedding_level)
 {
-    int *logical_widths = NULL;
-    int len, array_len, i;
-    const char *gtext;
-    VALUE ret;
-
-    gtext = RVAL2CSTR(text);
-    len = RSTRING_LEN(text);
-
-    array_len = g_utf8_strlen(gtext, len);
-
-    logical_widths = g_new(PangoGlyphUnit, array_len);
-
-    pango_glyph_string_get_logical_widths(_SELF(self), gtext, len,
-                                          NUM2INT(embedding_level),
+    PangoGlyphString *glyphs = _SELF(self);
+    const char *text = RVAL2CSTR(rbtext);
+    long length = RSTRING_LEN(rbtext);
+    int embedding_level = NUM2INT(rbembedding_level);
+    glong n = g_utf8_strlen(text, length);
+    int *logical_widths = g_new(int, n);
+
+    pango_glyph_string_get_logical_widths(glyphs, text, length, embedding_level,
                                           logical_widths);
 
-    ret = rb_ary_new();
-    for (i = 0; i < array_len; i++){
-        rb_ary_push(ret, INT2NUM(logical_widths[i]));
-    }
-
-    return ret;
+    return GINTS2RVAL_FREE(logical_widths, n);
 }
 
 static VALUE
-rglyph_get_glyphs(VALUE self)
+rg_glyphs(VALUE self)
 {
     int i;
     PangoGlyphInfo** glyphs = &_SELF(self)->glyphs;
@@ -131,27 +131,27 @@ rglyph_get_glyphs(VALUE self)
     VALUE ret = rb_ary_new();
     for (i = 0; i < _SELF(self)->num_glyphs; i++) {
         rb_ary_push(ret, 
-                    rb_assoc_new(BOXED2RVAL(glyphs[i], PANGO_TYPE_GLYPH_INFO),
+                    rb_assoc_new(PANGOGLYPHINFO2RVAL(glyphs[i]),
                                  INT2NUM(log_clusters[i])));
     }
     return ret;
 }
 
 void
-Init_pango_glyph_string()
+Init_pango_glyph_string(VALUE mPango)
 {
-    VALUE pGlyph = G_DEF_CLASS(PANGO_TYPE_GLYPH_STRING, "GlyphString", mPango);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_GLYPH_STRING, "GlyphString", mPango);
 
-    rb_define_method(pGlyph, "initialize", rglyph_initialize, 0);
-    rb_define_method(pGlyph, "set_size", rglyph_set_size, 1);
-    rb_define_method(pGlyph, "extents", rglyph_extents, -1);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(set_size, 1);
+    RG_DEF_METHOD(extents, -1);
 #if PANGO_CHECK_VERSION(1,14,0)
-    rb_define_method(pGlyph, "width", rglyph_get_width, 0);
+    RG_DEF_METHOD(width, 0);
 #endif
-    rb_define_method(pGlyph, "index_to_x", rglyph_index_to_x, 4);
-    rb_define_method(pGlyph, "x_to_index", rglyph_x_to_index, 3);
-    rb_define_method(pGlyph, "get_logical_widths", rglyph_get_logical_widgths, 2);
-    rb_define_method(pGlyph, "glyphs", rglyph_get_glyphs, 0);
+    RG_DEF_METHOD(index_to_x, 4);
+    RG_DEF_METHOD(x_to_index, 3);
+    RG_DEF_METHOD(get_logical_widths, 2);
+    RG_DEF_METHOD(glyphs, 0);
 
-    G_DEF_SETTERS(pGlyph);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }