pango 1.0.3 → 1.1.0

data/ext/pango/rbpangoconversions.h

@@ -0,0 +1,111 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *
+ *  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
+ */
+
+#ifndef __PANGOCONVERSIONS_H__
+#define __PANGOCONVERSIONS_H__
+
+#define RVAL2PANGOCAIROFONTMAP(o)          (PANGO_CAIRO_FONT_MAP(RVAL2GOBJ(o)))
+#define RVAL2PANGOCONTEXT(o)               (PANGO_CONTEXT(RVAL2GOBJ(o)))
+#define RVAL2PANGOENGINE(o)                (PANGO_ENGINE(RVAL2GOBJ(o)))
+#define RVAL2PANGOENGINELANG(o)            (PANGO_ENGINE_LANG(RVAL2GOBJ(o)))
+#define RVAL2PANGOENGINESHAPE(o)           (PANGO_ENGINE_SHAPE(RVAL2GOBJ(o)))
+#define RVAL2PANGOFONT(o)                  (PANGO_FONT(RVAL2GOBJ(o)))
+#define RVAL2PANGOFONTSET(o)               (PANGO_FONTSET(RVAL2GOBJ(o)))
+#define RVAL2PANGOFONTSETSIMPLE(o)         (PANGO_FONTSET_SIMPLE(RVAL2GOBJ(o)))
+#define RVAL2PANGOFONTFACE(o)              (PANGO_FONT_FACE(RVAL2GOBJ(o)))
+#define RVAL2PANGOFONTFAMILY(o)            (PANGO_FONT_FAMILY(RVAL2GOBJ(o)))
+#define RVAL2PANGOFONTMAP(o)               (PANGO_FONT_MAP(RVAL2GOBJ(o)))
+#define RVAL2PANGOLAYOUT(o)                (PANGO_LAYOUT(RVAL2GOBJ(o)))
+#define RVAL2PANGORENDERER(o)              (PANGO_RENDERER(RVAL2GOBJ(o)))
+
+#define RVAL2PANGOANALYSIS(o)              ((PangoAnalysis*)RVAL2BOXED(o, PANGO_TYPE_ANALYSIS))
+#define PANGOANALYSIS2RVAL(o)              (BOXED2RVAL(o, PANGO_TYPE_ANALYSIS))
+#define RVAL2PANGOATTRITERATOR(o)          ((PangoAttrIterator*)RVAL2BOXED(o, PANGO_TYPE_ATTR_ITERATOR))
+#define PANGOATTRITERATOR2RVAL(o)          (BOXED2RVAL(o, PANGO_TYPE_ATTR_ITERATOR))
+#define RVAL2PANGOATTRLIST(o)              ((PangoAttrList*)RVAL2BOXED(o, PANGO_TYPE_ATTR_LIST))
+#define PANGOATTRLIST2RVAL(o)              (BOXED2RVAL(o, PANGO_TYPE_ATTR_LIST))
+#define RVAL2PANGOCOLOR(o)                 ((PangoColor*)RVAL2BOXED(o, PANGO_TYPE_COLOR))
+#define PANGOCOLOR2RVAL(o)                 (BOXED2RVAL(o, PANGO_TYPE_COLOR))
+#define RVAL2PANGOCOVERAGE(o)              ((PangoCoverage*)RVAL2BOXED(o, PANGO_TYPE_COVERAGE))
+#define PANGOCOVERAGE2RVAL(o)              (BOXED2RVAL(o, PANGO_TYPE_COVERAGE))
+#define RVAL2PANGOFONTDESCRIPTION(o)       ((PangoFontDescription*)RVAL2BOXED(o, PANGO_TYPE_FONT_DESCRIPTION))
+#define PANGOFONTDESCRIPTION2RVAL(o)       (BOXED2RVAL(o, PANGO_TYPE_FONT_DESCRIPTION))
+#define RVAL2PANGOFONTMETRICS(o)           ((PangoFontMetrics*)RVAL2BOXED(o, PANGO_TYPE_FONT_METRICS))
+#define PANGOFONTMETRICS2RVAL(o)           (BOXED2RVAL(o, PANGO_TYPE_FONT_METRICS))
+#define RVAL2PANGOGLYPHINFO(o)             ((PangoGlyphInfo*)RVAL2BOXED(o, PANGO_TYPE_GLYPH_INFO))
+#define PANGOGLYPHINFO2RVAL(o)             (BOXED2RVAL(o, PANGO_TYPE_GLYPH_INFO))
+#define RVAL2PANGOGLYPHITEM(o)             ((PangoGlyphItem*)RVAL2BOXED(o, PANGO_TYPE_GLYPH_ITEM))
+#define PANGOGLYPHITEM2RVAL(o)             (BOXED2RVAL(o, PANGO_TYPE_GLYPH_ITEM))
+#define RVAL2PANGOGLYPHSTRING(o)           ((PangoGlyphString*)RVAL2BOXED(o, PANGO_TYPE_GLYPH_STRING))
+#define PANGOGLYPHSTRING2RVAL(o)           (BOXED2RVAL(o, PANGO_TYPE_GLYPH_STRING))
+#define RVAL2PANGOITEM(o)                  ((PangoItem*)RVAL2BOXED(o, PANGO_TYPE_ITEM))
+#define PANGOITEM2RVAL(o)                  (BOXED2RVAL(o, PANGO_TYPE_ITEM))
+#define RVAL2PANGOLANGUAGE(o)              ((PangoLanguage*)RVAL2BOXED(o, PANGO_TYPE_LANGUAGE))
+#define PANGOLANGUAGE2RVAL(o)              (BOXED2RVAL(o, PANGO_TYPE_LANGUAGE))
+#define RVAL2PANGOLAYOUTITER(o)            ((PangoLayoutIter*)RVAL2BOXED(o, PANGO_TYPE_LAYOUT_ITER))
+#define PANGOLAYOUTITER2RVAL(o)            (BOXED2RVAL(o, PANGO_TYPE_LAYOUT_ITER))
+#define RVAL2PANGOLAYOUTLINE(o)            ((PangoLayoutLine*)RVAL2BOXED(o, PANGO_TYPE_LAYOUT_LINE))
+#define PANGOLAYOUTLINE2RVAL(o)            (BOXED2RVAL(o, PANGO_TYPE_LAYOUT_LINE))
+#define RVAL2PANGOLOGATTR(o)               ((PangoLogAttr*)RVAL2BOXED(o, PANGO_TYPE_LOG_ATTR))
+#define PANGOLOGATTR2RVAL(o)               (BOXED2RVAL(o, PANGO_TYPE_LOG_ATTR))
+#define RVAL2PANGOMATRIX(o)                ((PangoMatrix*)RVAL2BOXED(o, PANGO_TYPE_MATRIX))
+#define PANGOMATRIX2RVAL(o)                (BOXED2RVAL(o, PANGO_TYPE_MATRIX))
+#define RVAL2PANGORECTANGLE(o)             ((PangoRectangle*)RVAL2BOXED(o, PANGO_TYPE_RECTANGLE))
+#define PANGORECTANGLE2RVAL(o)             (BOXED2RVAL(o, PANGO_TYPE_RECTANGLE))
+#define RVAL2PANGOSCRIPTITER(o)            ((PangoScriptIter*)RVAL2BOXED(o, PANGO_TYPE_SCRIPT_ITER))
+#define PANGOSCRIPTITER2RVAL(o)            (BOXED2RVAL(o, PANGO_TYPE_SCRIPT_ITER))
+#define RVAL2PANGOTABARRAY(o)              ((PangoTabArray*)RVAL2BOXED(o, PANGO_TYPE_TAB_ARRAY))
+#define PANGOTABARRAY2RVAL(o)              (BOXED2RVAL(o, PANGO_TYPE_TAB_ARRAY))
+
+#define RVAL2PANGOALIGNMENT(o)             (RVAL2GENUM(o, PANGO_TYPE_ALIGNMENT))
+#define PANGOALIGNMENT2RVAL(o)             (GENUM2RVAL(o, PANGO_TYPE_ALIGNMENT))
+#define RVAL2PANGOCOVERAGELEVEL(o)         (RVAL2GENUM(o, PANGO_TYPE_COVERAGE_LEVEL))
+#define PANGOCOVERAGELEVEL2RVAL(o)         (GENUM2RVAL(o, PANGO_TYPE_COVERAGE_LEVEL))
+#define RVAL2PANGODIRECTION(o)             (RVAL2GENUM(o, PANGO_TYPE_DIRECTION))
+#define PANGODIRECTION2RVAL(o)             (GENUM2RVAL(o, PANGO_TYPE_DIRECTION))
+#define RVAL2PANGOELLIPSIZEMODE(o)         (RVAL2GENUM(o, PANGO_TYPE_ELLIPSIZE_MODE))
+#define PANGOELLIPSIZEMODE2RVAL(o)         (GENUM2RVAL(o, PANGO_TYPE_ELLIPSIZE_MODE))
+#define RVAL2PANGOGRAVITY(o)               (RVAL2GENUM(o, PANGO_TYPE_GRAVITY))
+#define PANGOGRAVITY2RVAL(o)               (GENUM2RVAL(o, PANGO_TYPE_GRAVITY))
+#define RVAL2PANGOGRAVITYHINT(o)           (RVAL2GENUM(o, PANGO_TYPE_GRAVITY_HINT))
+#define PANGOGRAVITYHINT2RVAL(o)           (GENUM2RVAL(o, PANGO_TYPE_GRAVITY_HINT))
+#define RVAL2PANGORENDERPART(o)            (RVAL2GENUM(o, PANGO_TYPE_RENDER_PART))
+#define PANGORENDERPART2RVAL(o)            (GENUM2RVAL(o, PANGO_TYPE_RENDER_PART))
+#define RVAL2PANGOSCRIPT(o)                (RVAL2GENUM(o, PANGO_TYPE_SCRIPT))
+#define PANGOSCRIPT2RVAL(o)                (GENUM2RVAL(o, PANGO_TYPE_SCRIPT))
+#define RVAL2PANGOSTRETCH(o)               (RVAL2GENUM(o, PANGO_TYPE_STRETCH))
+#define PANGOSTRETCH2RVAL(o)               (GENUM2RVAL(o, PANGO_TYPE_STRETCH))
+#define RVAL2PANGOSTYLE(o)                 (RVAL2GENUM(o, PANGO_TYPE_STYLE))
+#define PANGOSTYLE2RVAL(o)                 (GENUM2RVAL(o, PANGO_TYPE_STYLE))
+#define RVAL2PANGOTABALIGN(o)              (RVAL2GENUM(o, PANGO_TYPE_TAB_ALIGN))
+#define PANGOTABALIGN2RVAL(o)              (GENUM2RVAL(o, PANGO_TYPE_TAB_ALIGN))
+#define RVAL2PANGOUNDERLINE(o)             (RVAL2GENUM(o, PANGO_TYPE_UNDERLINE))
+#define PANGOUNDERLINE2RVAL(o)             (GENUM2RVAL(o, PANGO_TYPE_UNDERLINE))
+#define RVAL2PANGOVARIANT(o)               (RVAL2GENUM(o, PANGO_TYPE_VARIANT))
+#define PANGOVARIANT2RVAL(o)               (GENUM2RVAL(o, PANGO_TYPE_VARIANT))
+#define RVAL2PANGOWEIGHT(o)                (RVAL2GENUM(o, PANGO_TYPE_WEIGHT))
+#define PANGOWEIGHT2RVAL(o)                (GENUM2RVAL(o, PANGO_TYPE_WEIGHT))
+#define RVAL2PANGOWRAPMODE(o)              (RVAL2GENUM(o, PANGO_TYPE_WRAP_MODE))
+#define PANGOWRAPMODE2RVAL(o)              (GENUM2RVAL(o, PANGO_TYPE_WRAP_MODE))
+
+#define RVAL2PANGOFONTMASK(o)              (RVAL2GFLAGS(o, PANGO_TYPE_FONT_MASK))
+#define PANGOFONTMASK2RVAL(o)              (GFLAGS2RVAL(o, PANGO_TYPE_FONT_MASK))
+
+#endif /* __PANGOCONVERSIONS_H__ */

data/ext/pango/rbpangocoverage.c

@@ -1,18 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangocoverage.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 02:53:10 $
-
-  Copyright (C) 2005 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(self) ((PangoCoverage*)RVAL2BOXED(self, PANGO_TYPE_COVERAGE))
-
+/*
+ *  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
+ */
+
+#include "rbpangoprivate.h"
+
+#define RG_TARGET_NAMESPACE cCoverage
+#define _SELF(self) (RVAL2PANGOCOVERAGE(self))
 
 /**********************************/
 GType
@@ -29,36 +39,35 @@ pango_coverage_get_type(void)
 /**********************************/
 
 static VALUE
-coverage_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, pango_coverage_new());
     return Qnil;
 }
 
 static VALUE
-coverage_get_level(VALUE self, VALUE index_)
+rg_get_level(VALUE self, VALUE index_)
 {
-    return GENUM2RVAL(pango_coverage_get(_SELF(self), NUM2INT(index_)), 
-                      PANGO_TYPE_COVERAGE_LEVEL);
+    return PANGOCOVERAGELEVEL2RVAL(pango_coverage_get(_SELF(self), NUM2INT(index_)));
 }
 
 static VALUE
-coverage_max(VALUE self, VALUE other)
+rg_max_bang(VALUE self, VALUE other)
 {
     pango_coverage_max(_SELF(self), _SELF(other));
     return self;
 }
 
 static VALUE
-coverage_set(VALUE self, VALUE index_, VALUE level)
+rg_set(VALUE self, VALUE index_, VALUE level)
 {
     pango_coverage_set(_SELF(self), NUM2INT(index_), 
-                       RVAL2GENUM(level, PANGO_TYPE_COVERAGE_LEVEL));
+                       RVAL2PANGOCOVERAGELEVEL(level));
     return self;
 }
 
 static VALUE
-coverage_to_bytes(VALUE self)
+rg_to_bytes(VALUE self)
 {
     guchar* bytes;
     int n_bytes;
@@ -72,27 +81,26 @@ coverage_to_bytes(VALUE self)
 }
 
 static VALUE
-coverage_s_from_bytes(VALUE self, VALUE bytes)
+rg_s_from_bytes(G_GNUC_UNUSED VALUE self, VALUE bytes)
 {
     StringValue(bytes);
-    return BOXED2RVAL(pango_coverage_from_bytes((guchar *)RSTRING_PTR(bytes), 
-                                                RSTRING_LEN(bytes)),
-                      PANGO_TYPE_COVERAGE);
+    return PANGOCOVERAGE2RVAL(pango_coverage_from_bytes((guchar *)RSTRING_PTR(bytes), 
+                                                        RSTRING_LEN(bytes)));
 }
 
 void
-Init_pango_coverage()
+Init_pango_coverage(VALUE mPango)
 {
-    VALUE pCoverage = G_DEF_CLASS(PANGO_TYPE_COVERAGE, "Coverage", mPango);
-    
-    rb_define_method(pCoverage, "initialize", coverage_initialize, 0);
-    rb_define_method(pCoverage, "get_level", coverage_get_level, 0);
-    rb_define_method(pCoverage, "max!", coverage_max, 1);
-    rb_define_method(pCoverage, "set", coverage_set, 2);
-    rb_define_method(pCoverage, "to_bytes", coverage_to_bytes, 0);
-    rb_define_singleton_method(pCoverage, "from_bytes", coverage_s_from_bytes, 1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_COVERAGE, "Coverage", mPango);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(get_level, 0);
+    RG_DEF_METHOD_BANG(max, 1);
+    RG_DEF_METHOD(set, 2);
+    RG_DEF_METHOD(to_bytes, 0);
+    RG_DEF_SMETHOD(from_bytes, 1);
 
     /* PangoCoverageLevel */
-    G_DEF_CLASS(PANGO_TYPE_COVERAGE_LEVEL, "Level", pCoverage);
-    G_DEF_CONSTANTS(pCoverage, PANGO_TYPE_COVERAGE_LEVEL, "PANGO_COVERAGE_");
+    G_DEF_CLASS(PANGO_TYPE_COVERAGE_LEVEL, "Level", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_COVERAGE_LEVEL, "PANGO_COVERAGE_");
 }

data/ext/pango/rbpangoengine.c

@@ -1,19 +1,29 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangoengine.c -
-
-  $Author: mutoh $
-  $Date: 2005/10/15 04:32:01 $
-
-  Copyright (C) 2005 Masao Mutoh
-************************************************/
+/*
+ *  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
+ */
 
-#include "rbpango.h"
+#include "rbpangoprivate.h"
 
 #ifdef PANGO_TYPE_ENGINE
 
-#define _SELF(self) (PANGO_ENGINE(RVAL2GOBJ(self)))
+#define _SELF(self) (RVAL2PANGOENGINE(self))
 
 /* FIXME
 static VALUE
@@ -47,7 +57,7 @@ PangoEngine* script_engine_create           (const char *id);
 #endif
 
 void
-Init_pango_engine()
+Init_pango_engine(VALUE mPango)
 {
 #ifdef PANGO_TYPE_ENGINE
     G_DEF_CLASS(PANGO_TYPE_ENGINE, "Engine", mPango);

data/ext/pango/rbpangofont.c

@@ -1,103 +1,112 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangofont.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:33 $
-
-  Copyright (C) 2002-2006 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(self) (PANGO_FONT(RVAL2GOBJ(self)))
+/*
+ *  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 cFont
+#define _SELF(self) (RVAL2PANGOFONT(self))
 
 static VALUE
-font_find_shaper(VALUE self, VALUE language, VALUE ch)
+rg_find_shaper(VALUE self, VALUE language, VALUE ch)
 {
     return GOBJ2RVAL(pango_font_find_shaper(_SELF(self), 
-                                            (PangoLanguage*)RVAL2BOXED(language, PANGO_TYPE_LANGUAGE),
+                                            RVAL2PANGOLANGUAGE(language),
                                             NUM2UINT(ch)));
 }
 
 static VALUE
-font_describe(int argc, VALUE *argv, VALUE self)
+rg_describe(int argc, VALUE *argv, VALUE self)
 {
     VALUE desc, absolute_size;
     rb_scan_args(argc, argv, "01", &absolute_size);
 
     if (NIL_P(absolute_size) || ! RVAL2CBOOL(absolute_size)){
-        desc = BOXED2RVAL(pango_font_describe(_SELF(self)), PANGO_TYPE_FONT_DESCRIPTION);
+        desc = PANGOFONTDESCRIPTION2RVAL(pango_font_describe(_SELF(self)));
     } else {
 #if PANGO_CHECK_VERSION(1,14,0)
-        desc = BOXED2RVAL(pango_font_describe_with_absolute_size(_SELF(self)), 
-                          PANGO_TYPE_FONT_DESCRIPTION);
+        desc = PANGOFONTDESCRIPTION2RVAL(pango_font_describe_with_absolute_size(_SELF(self)));
 #else
         rb_warning("Pango::Font#describe(absolute) has been supported since GTK+-2.10.x. Use Pango::Font#describe() instead."); 
-        desc = BOXED2RVAL(pango_font_describe(_SELF(self)), PANGO_TYPE_FONT_DESCRIPTION);
+        desc = PANGOFONTDESCRIPTION2RVAL(pango_font_describe(_SELF(self)));
 #endif
     }
     return desc;
 }
 
 static VALUE
-font_get_coverage(VALUE self, VALUE language)
+rg_get_coverage(VALUE self, VALUE language)
 {
     PangoCoverage* c = pango_font_get_coverage(_SELF(self), 
-                                               (PangoLanguage*)RVAL2BOXED(language, PANGO_TYPE_LANGUAGE));
-    return BOXED2RVAL(c, PANGO_TYPE_COVERAGE);
+                                               RVAL2PANGOLANGUAGE(language));
+    return PANGOCOVERAGE2RVAL(c);
 }
 
 static VALUE
-font_get_glyph_extents(VALUE self, VALUE glyph)
+rg_get_glyph_extents(VALUE self, VALUE glyph)
 {
     PangoRectangle ink_rect, logical_rect;
     pango_font_get_glyph_extents(_SELF(self),
                                  NUM2UINT(glyph),
                                  &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
-font_get_metrics(int argc, VALUE *argv, VALUE self)
+rg_metrics(int argc, VALUE *argv, VALUE self)
 {
     VALUE language;
     PangoLanguage* lang = NULL;
-    
+
     rb_scan_args(argc, argv, "01", &language);
-    
+
     if (!NIL_P(language))
-        lang = (PangoLanguage*)RVAL2BOXED(language, PANGO_TYPE_LANGUAGE);
+        lang = RVAL2PANGOLANGUAGE(language);
 
-    return BOXED2RVAL(pango_font_get_metrics(_SELF(self), lang), 
-                      PANGO_TYPE_FONT_METRICS);
+    return PANGOFONTMETRICS2RVAL(pango_font_get_metrics(_SELF(self), lang));
 }
 
 #if PANGO_CHECK_VERSION(1,9,0)
 static VALUE
-font_get_font_map(VALUE self)
+rg_font_map(VALUE self)
 {
     return GOBJ2RVAL(pango_font_get_font_map(_SELF(self)));
 }
 #endif
 
 void
-Init_pango_font()
+Init_pango_font(VALUE mPango)
 {
-    VALUE pFont = G_DEF_CLASS(PANGO_TYPE_FONT, "Font", mPango);
-    
-    rb_define_method(pFont, "find_shaper", font_find_shaper, 2);
-    rb_define_method(pFont, "describe", font_describe, -1);
-    rb_define_method(pFont, "get_coverage", font_get_coverage, 1);
-    rb_define_method(pFont, "get_glyph_extents", font_get_glyph_extents, 1);
-    rb_define_method(pFont, "metrics", font_get_metrics, -1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_FONT, "Font", mPango);
+
+    RG_DEF_METHOD(find_shaper, 2);
+    RG_DEF_METHOD(describe, -1);
+    RG_DEF_METHOD(get_coverage, 1);
+    RG_DEF_METHOD(get_glyph_extents, 1);
+    RG_DEF_METHOD(metrics, -1);
 
 #if PANGO_CHECK_VERSION(1,9,0)
-    rb_define_method(pFont, "font_map", font_get_font_map, 0);
+    RG_DEF_METHOD(font_map, 0);
 #endif
 
     G_DEF_CLASS3("PangoXFont", "XFont", mPango);

data/ext/pango/rbpangofontdescription.c

@@ -1,20 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangofontdescription.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:33 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(self) ((PangoFontDescription*)RVAL2BOXED(self, PANGO_TYPE_FONT_DESCRIPTION))
+/*
+ *  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 cFontDescription
+#define _SELF(self) (RVAL2PANGOFONTDESCRIPTION(self))
 
 static VALUE
-font_desc_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE str;
     PangoFontDescription *description;
@@ -22,7 +33,7 @@ font_desc_initialize(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "01", &str);
 
     if (NIL_P(str)) {
-	description = pango_font_description_new();
+        description = pango_font_description_new();
     } else {
         description = pango_font_description_from_string(RVAL2CSTR(str));
     }
@@ -40,13 +51,13 @@ PangoFontDescription* pango_font_description_copy_static
 */
 
 static VALUE
-font_desc_hash(VALUE self)
+rg_hash(VALUE self)
 {
     return UINT2NUM(pango_font_description_hash(_SELF(self)));
 }
 
 static VALUE
-font_desc_equal(VALUE self, VALUE other)
+rg_operator_font_desc_equal(VALUE self, VALUE other)
 {
     return CBOOL2RVAL(pango_font_description_equal(_SELF(self), _SELF(other)));
 }
@@ -57,7 +68,7 @@ void        pango_font_descriptions_free    (PangoFontDescription **descs,
 */
 
 static VALUE
-font_desc_set_family(VALUE self, VALUE family)
+rg_set_family(VALUE self, VALUE family)
 {
     pango_font_description_set_family(_SELF(self), RVAL2CSTR(family));
     return self;
@@ -69,87 +80,87 @@ void        pango_font_description_set_family_static
 */
 
 static VALUE
-font_desc_get_family(VALUE self)
+rg_family(VALUE self)
 {
     return CSTR2RVAL(pango_font_description_get_family(_SELF(self)));
 }
 
 static VALUE
-font_desc_set_style(VALUE self, VALUE style)
+rg_set_style(VALUE self, VALUE style)
 {
-    pango_font_description_set_style(_SELF(self), RVAL2GENUM(style, PANGO_TYPE_STYLE));
+    pango_font_description_set_style(_SELF(self), RVAL2PANGOSTYLE(style));
     return self;
 }
 
 static VALUE
-font_desc_get_style(VALUE self)
+rg_style(VALUE self)
 {
-    return GENUM2RVAL(pango_font_description_get_style(_SELF(self)), PANGO_TYPE_STYLE);
+    return PANGOSTYLE2RVAL(pango_font_description_get_style(_SELF(self)));
 }
 
 static VALUE
-font_desc_set_variant(VALUE self, VALUE variant)
+rg_set_variant(VALUE self, VALUE variant)
 {
-    pango_font_description_set_variant(_SELF(self), RVAL2GENUM(variant, PANGO_TYPE_VARIANT));
+    pango_font_description_set_variant(_SELF(self), RVAL2PANGOVARIANT(variant));
     return self;
 }
 
 static VALUE
-font_desc_get_variant(VALUE self)
+rg_variant(VALUE self)
 {
-    return GENUM2RVAL(pango_font_description_get_variant(_SELF(self)), PANGO_TYPE_VARIANT);
+    return PANGOVARIANT2RVAL(pango_font_description_get_variant(_SELF(self)));
 }
 
 static VALUE
-font_desc_set_weight(VALUE self, VALUE weight)
+rg_set_weight(VALUE self, VALUE weight)
 {
     pango_font_description_set_weight(_SELF(self),
-				      RVAL2GENUM(weight, PANGO_TYPE_WEIGHT));
+                      RVAL2PANGOWEIGHT(weight));
     return self;
 }
 
 static VALUE
-font_desc_get_weight(VALUE self)
+rg_weight(VALUE self)
 {
-    return GENUM2RVAL(pango_font_description_get_weight(_SELF(self)), PANGO_TYPE_WEIGHT);
+    return PANGOWEIGHT2RVAL(pango_font_description_get_weight(_SELF(self)));
 }
 
 static VALUE
-font_desc_set_stretch(VALUE self, VALUE stretch)
+rg_set_stretch(VALUE self, VALUE stretch)
 {
-    pango_font_description_set_stretch(_SELF(self), RVAL2GENUM(stretch, PANGO_TYPE_STRETCH));
+    pango_font_description_set_stretch(_SELF(self), RVAL2PANGOSTRETCH(stretch));
     return self;
 }
 
 static VALUE
-font_desc_get_stretch(VALUE self)
+rg_stretch(VALUE self)
 {
-    return GENUM2RVAL(pango_font_description_get_stretch(_SELF(self)), PANGO_TYPE_STRETCH);
+    return PANGOSTRETCH2RVAL(pango_font_description_get_stretch(_SELF(self)));
 }
 
 static VALUE
-font_desc_set_size(VALUE self, VALUE size)
+rg_set_size(VALUE self, VALUE size)
 {
     pango_font_description_set_size(_SELF(self), NUM2INT(size));
     return self;
 }
 
 static VALUE
-font_desc_get_size(VALUE self)
+rg_size(VALUE self)
 {
     return INT2NUM(pango_font_description_get_size(_SELF(self)));
 }
 
 #if PANGO_CHECK_VERSION(1,8,0)
 static VALUE
-font_desc_set_absolute_size(VALUE self, VALUE size)
+rg_set_absolute_size(VALUE self, VALUE size)
 {
     pango_font_description_set_absolute_size(_SELF(self), NUM2INT(size));
     return self;
 }
 
 static VALUE
-font_desc_get_size_is_absolute(VALUE self)
+rg_size_is_absolute_p(VALUE self)
 {
     return CBOOL2RVAL(pango_font_description_get_size_is_absolute(_SELF(self)));
 }
@@ -157,34 +168,34 @@ font_desc_get_size_is_absolute(VALUE self)
 
 #if PANGO_CHECK_VERSION(1,16,0)
 static VALUE
-font_desc_get_gravity(VALUE self)
+rg_gravity(VALUE self)
 {
-    return GENUM2RVAL(pango_font_description_get_gravity(_SELF(self)), PANGO_TYPE_GRAVITY);
+    return PANGOGRAVITY2RVAL(pango_font_description_get_gravity(_SELF(self)));
 }
 
 static VALUE
-font_desc_set_gravity(VALUE self, VALUE gravity)
+rg_set_gravity(VALUE self, VALUE gravity)
 {
-    pango_font_description_set_gravity(_SELF(self), RVAL2GENUM(gravity, PANGO_TYPE_GRAVITY));
+    pango_font_description_set_gravity(_SELF(self), RVAL2PANGOGRAVITY(gravity));
     return self;
 }
 #endif
 
 static VALUE
-font_desc_get_set_fields(VALUE self)
+rg_set_fields(VALUE self)
 {
-    return GFLAGS2RVAL(pango_font_description_get_set_fields(_SELF(self)), PANGO_TYPE_FONT_MASK);
+    return PANGOFONTMASK2RVAL(pango_font_description_get_set_fields(_SELF(self)));
 }
 
 static VALUE
-font_desc_unset_fields(VALUE self, VALUE to_unset)
+rg_unset_fields(VALUE self, VALUE to_unset)
 {
-    pango_font_description_unset_fields(_SELF(self), RVAL2GFLAGS(to_unset, PANGO_TYPE_FONT_MASK));
+    pango_font_description_unset_fields(_SELF(self), RVAL2PANGOFONTMASK(to_unset));
     return self;
 }
 
 static VALUE
-font_desc_merge(VALUE self, VALUE desc_to_merge, VALUE replace_existing)
+rg_merge(VALUE self, VALUE desc_to_merge, VALUE replace_existing)
 {
     pango_font_description_merge(_SELF(self), _SELF(desc_to_merge),
                                  RVAL2CBOOL(replace_existing));
@@ -199,7 +210,7 @@ void        pango_font_description_merge_static
 */
 
 static VALUE
-font_desc_better_match(VALUE self, VALUE old_match, VALUE new_match)
+rg_better_match(VALUE self, VALUE old_match, VALUE new_match)
 {
     return CBOOL2RVAL(pango_font_description_better_match(_SELF(self), 
                                                           _SELF(old_match),
@@ -207,73 +218,73 @@ font_desc_better_match(VALUE self, VALUE old_match, VALUE new_match)
 }
 
 static VALUE
-font_desc_to_string(VALUE self)
+rg_to_str(VALUE self)
 {
     return CSTR2RVAL(pango_font_description_to_string(_SELF(self)));
 }
 
 static VALUE
-font_desc_to_filename(VALUE self)
+rg_to_filename(VALUE self)
 {
     return CSTR2RVAL(pango_font_description_to_filename(_SELF(self)));
 }
 
 void
-Init_pango_font_description()
+Init_pango_font_description(VALUE mPango)
 {
-    VALUE pFontDesc = G_DEF_CLASS(PANGO_TYPE_FONT_DESCRIPTION, "FontDescription", mPango);
-
-    rb_define_method(pFontDesc, "initialize", font_desc_initialize, -1);
-    rb_define_method(pFontDesc, "hash", font_desc_hash, 0);
-    rb_define_method(pFontDesc, "==", font_desc_equal, 1);
-    rb_define_method(pFontDesc, "set_family", font_desc_set_family, 1);
-    rb_define_method(pFontDesc, "family", font_desc_get_family, 0);
-    rb_define_method(pFontDesc, "set_style", font_desc_set_style, 1);
-    rb_define_method(pFontDesc, "style", font_desc_get_style, 0);
-    rb_define_method(pFontDesc, "set_variant", font_desc_set_variant, 1);
-    rb_define_method(pFontDesc, "variant", font_desc_get_variant, 0);
-    rb_define_method(pFontDesc, "set_weight", font_desc_set_weight, 1);
-    rb_define_method(pFontDesc, "weight", font_desc_get_weight, 0);
-    rb_define_method(pFontDesc, "set_stretch", font_desc_set_stretch, 1);
-    rb_define_method(pFontDesc, "stretch", font_desc_get_stretch, 0);
-    rb_define_method(pFontDesc, "set_size", font_desc_set_size, 1);
-    rb_define_method(pFontDesc, "size", font_desc_get_size, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_FONT_DESCRIPTION, "FontDescription", mPango);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(hash, 0);
+    RG_DEF_METHOD_OPERATOR("==", font_desc_equal, 1);
+    RG_DEF_METHOD(set_family, 1);
+    RG_DEF_METHOD(family, 0);
+    RG_DEF_METHOD(set_style, 1);
+    RG_DEF_METHOD(style, 0);
+    RG_DEF_METHOD(set_variant, 1);
+    RG_DEF_METHOD(variant, 0);
+    RG_DEF_METHOD(set_weight, 1);
+    RG_DEF_METHOD(weight, 0);
+    RG_DEF_METHOD(set_stretch, 1);
+    RG_DEF_METHOD(stretch, 0);
+    RG_DEF_METHOD(set_size, 1);
+    RG_DEF_METHOD(size, 0);
 
 #if PANGO_CHECK_VERSION(1,8,0)
-    rb_define_method(pFontDesc, "set_absolute_size", font_desc_set_absolute_size, 1);
-    rb_define_method(pFontDesc, "size_is_absolute?", font_desc_get_size_is_absolute, 0);
+    RG_DEF_METHOD(set_absolute_size, 1);
+    RG_DEF_METHOD_P(size_is_absolute, 0);
 #endif
 #if PANGO_CHECK_VERSION(1,16,0)
-    rb_define_method(pFontDesc, "set_gravity", font_desc_set_gravity, 1);
-    rb_define_method(pFontDesc, "gravity", font_desc_get_gravity, 0);
+    RG_DEF_METHOD(set_gravity, 1);
+    RG_DEF_METHOD(gravity, 0);
 #endif
-    rb_define_method(pFontDesc, "set_fields", font_desc_get_set_fields, 0);
-    rb_define_method(pFontDesc, "unset_fields", font_desc_unset_fields, 1);
-    rb_define_method(pFontDesc, "merge", font_desc_merge, 2);
-    rb_define_method(pFontDesc, "better_match", font_desc_better_match, 2);
-    rb_define_method(pFontDesc, "to_str", font_desc_to_string, 0);
-    rb_define_alias(pFontDesc, "to_s", "to_str");
-    rb_define_method(pFontDesc, "to_filename", font_desc_to_filename, 0);
+    RG_DEF_METHOD(set_fields, 0);
+    RG_DEF_METHOD(unset_fields, 1);
+    RG_DEF_METHOD(merge, 2);
+    RG_DEF_METHOD(better_match, 2);
+    RG_DEF_METHOD(to_str, 0);
+    RG_DEF_ALIAS("to_s", "to_str");
+    RG_DEF_METHOD(to_filename, 0);
 
-    G_DEF_SETTERS(pFontDesc);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* PangoStyle */
-    G_DEF_CLASS(PANGO_TYPE_STYLE, "Style", pFontDesc);
-    G_DEF_CONSTANTS(pFontDesc, PANGO_TYPE_STYLE, "PANGO_");
+    G_DEF_CLASS(PANGO_TYPE_STYLE, "Style", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_STYLE, "PANGO_");
 
     /* PangoWeight */
-    G_DEF_CLASS(PANGO_TYPE_WEIGHT, "Weight", pFontDesc);
-    G_DEF_CONSTANTS(pFontDesc, PANGO_TYPE_WEIGHT, "PANGO_");
+    G_DEF_CLASS(PANGO_TYPE_WEIGHT, "Weight", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_WEIGHT, "PANGO_");
 
     /* PangoVariant */
-    G_DEF_CLASS(PANGO_TYPE_VARIANT, "Variant", pFontDesc);
-    G_DEF_CONSTANTS(pFontDesc, PANGO_TYPE_VARIANT, "PANGO_");
+    G_DEF_CLASS(PANGO_TYPE_VARIANT, "Variant", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_VARIANT, "PANGO_");
 
     /* PangoStretch */
-    G_DEF_CLASS(PANGO_TYPE_STRETCH, "Stretch", pFontDesc);
-    G_DEF_CONSTANTS(pFontDesc, PANGO_TYPE_STRETCH, "PANGO_");
+    G_DEF_CLASS(PANGO_TYPE_STRETCH, "Stretch", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_STRETCH, "PANGO_");
 
     /* PangoFontMask */
-    G_DEF_CLASS(PANGO_TYPE_FONT_MASK, "FontMask", pFontDesc);
-    G_DEF_CONSTANTS(pFontDesc, PANGO_TYPE_FONT_MASK, "PANGO_");
+    G_DEF_CLASS(PANGO_TYPE_FONT_MASK, "FontMask", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_FONT_MASK, "PANGO_");
 }