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

data/ext/pango/rbpangorenderer.c

@@ -1,52 +1,63 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangorenderer.c -
-
-  $Author: ggc $
-  $Date: 2006/06/22 19:52:54 $
-
-  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
+ */
+
+#include "rbpangoprivate.h"
 
 #if PANGO_CHECK_VERSION(1,8,0)
-#define _SELF(self) (PANGO_RENDERER(RVAL2GOBJ(self)))
+#define RG_TARGET_NAMESPACE cRenderer
+#define _SELF(self) (RVAL2PANGORENDERER(self))
 
 static VALUE
-renderer_draw_layout(VALUE self, VALUE layout, VALUE x, VALUE y)
+rg_draw_layout(VALUE self, VALUE layout, VALUE x, VALUE y)
 {
     pango_renderer_draw_layout(_SELF(self), 
-                               PANGO_LAYOUT(RVAL2GOBJ(layout)),
+                               RVAL2PANGOLAYOUT(layout),
                                NUM2INT(x), NUM2INT(y));
     return self;
 }
 
 static VALUE
-renderer_draw_layout_line(VALUE self, VALUE line, VALUE x, VALUE y)
+rg_draw_layout_line(VALUE self, VALUE line, VALUE x, VALUE y)
 {
     pango_renderer_draw_layout_line(_SELF(self),  
-                                    (PangoLayoutLine*)RVAL2BOXED(line, PANGO_TYPE_LAYOUT_LINE),
+                                    RVAL2PANGOLAYOUTLINE(line),
                                     NUM2INT(x), NUM2INT(y));
     return self;
 }
 
 static VALUE
-renderer_draw_glyphs(VALUE self, VALUE font, VALUE glyphs, VALUE x, VALUE y)
+rg_draw_glyphs(VALUE self, VALUE font, VALUE glyphs, VALUE x, VALUE y)
 {
-    pango_renderer_draw_glyphs(_SELF(self), 
-                               PANGO_FONT(RVAL2GOBJ(self)),
-                               (PangoGlyphString*)(RVAL2BOXED(self, PANGO_TYPE_GLYPH_STRING)),
+    pango_renderer_draw_glyphs(_SELF(self),
+                               RVAL2PANGOFONT(font),
+                               RVAL2PANGOGLYPHSTRING(glyphs),
                                NUM2INT(x), NUM2INT(y));
     return self;
 }
 
 static VALUE
-renderer_draw_rectangle(VALUE self, VALUE part, VALUE x, VALUE y, VALUE width, VALUE height)
+rg_draw_rectangle(VALUE self, VALUE part, VALUE x, VALUE y, VALUE width, VALUE height)
 {
-#if HAVE_PANGO_RENDER_PART_GET_TYPE
-    pango_renderer_draw_rectangle(_SELF(self), RVAL2GENUM(part, PANGO_TYPE_RENDER_PART),
+#ifdef HAVE_PANGO_RENDER_PART_GET_TYPE
+    pango_renderer_draw_rectangle(_SELF(self), RVAL2PANGORENDERPART(part),
                                   NUM2INT(x), NUM2INT(y), NUM2INT(width), NUM2INT(height));
 #else
     pango_renderer_draw_rectangle(_SELF(self), NUM2INT(part),
@@ -56,7 +67,7 @@ renderer_draw_rectangle(VALUE self, VALUE part, VALUE x, VALUE y, VALUE width, V
 }
 
 static VALUE
-renderer_draw_error_underline(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
+rg_draw_error_underline(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     pango_renderer_draw_error_underline(_SELF(self),
                                         NUM2INT(x), NUM2INT(y), NUM2INT(width), NUM2INT(height));
@@ -64,11 +75,11 @@ renderer_draw_error_underline(VALUE self, VALUE x, VALUE y, VALUE width, VALUE h
 }
 
 static VALUE
-renderer_draw_trapezoid(VALUE self, VALUE part, VALUE y1, VALUE x11, VALUE x21, VALUE y2, VALUE x12, VALUE x22)
+rg_draw_trapezoid(VALUE self, VALUE part, VALUE y1, VALUE x11, VALUE x21, VALUE y2, VALUE x12, VALUE x22)
 {
-#if HAVE_PANGO_RENDER_PART_GET_TYPE
+#ifdef HAVE_PANGO_RENDER_PART_GET_TYPE
     pango_renderer_draw_trapezoid(_SELF(self), 
-                                  RVAL2GENUM(part, PANGO_TYPE_RENDER_PART),
+                                  RVAL2PANGORENDERPART(part),
                                   NUM2DBL(y1), NUM2DBL(x11), NUM2DBL(x21),
                                   NUM2DBL(y2), NUM2DBL(x12), NUM2DBL(x22));
 #else
@@ -80,35 +91,35 @@ renderer_draw_trapezoid(VALUE self, VALUE part, VALUE y1, VALUE x11, VALUE x21,
 }
 
 static VALUE
-renderer_draw_glyph(VALUE self, VALUE font, VALUE glyph, VALUE x, VALUE y)
+rg_draw_glyph(VALUE self, VALUE font, VALUE glyph, VALUE x, VALUE y)
 {
-    pango_renderer_draw_glyph(_SELF(self), PANGO_FONT(RVAL2GOBJ(self)),
+    pango_renderer_draw_glyph(_SELF(self), RVAL2PANGOFONT(font),
                               NUM2INT(glyph), NUM2INT(x), NUM2INT(y));
     return self;
 }
 
 static VALUE
-renderer_deactivate(VALUE self)
+rg_deactivate(VALUE self)
 {
     pango_renderer_deactivate(_SELF(self));
     return self;
 }
 
 static VALUE
-renderer_activate(VALUE self)
+rg_activate(VALUE self)
 {
     pango_renderer_activate(_SELF(self));
     if (rb_block_given_p()) {
-        rb_ensure(rb_yield, self, renderer_deactivate, self);
+        rb_ensure(rb_yield, self, rg_deactivate, self);
     }
     return self;
 }
 
 static VALUE
-renderer_part_changed(VALUE self, VALUE part)
+rg_part_changed(VALUE self, VALUE part)
 {
-#if HAVE_PANGO_RENDER_PART_GET_TYPE
-    pango_renderer_part_changed(_SELF(self), RVAL2GENUM(part, PANGO_TYPE_RENDER_PART));
+#ifdef HAVE_PANGO_RENDER_PART_GET_TYPE
+    pango_renderer_part_changed(_SELF(self), RVAL2PANGORENDERPART(part));
 #else
     pango_renderer_part_changed(_SELF(self), NUM2INT(part));
 #endif
@@ -116,74 +127,74 @@ renderer_part_changed(VALUE self, VALUE part)
 }
 
 static VALUE
-renderer_set_color(VALUE self, VALUE part, VALUE color)
+rg_set_color(VALUE self, VALUE part, VALUE color)
 {
-#if HAVE_PANGO_RENDER_PART_GET_TYPE
-    pango_renderer_set_color(_SELF(self), RVAL2GENUM(part, PANGO_TYPE_RENDER_PART),
-                             (PangoColor*)(NIL_P(color) ? NULL : RVAL2BOXED(color, PANGO_TYPE_COLOR)));
+#ifdef HAVE_PANGO_RENDER_PART_GET_TYPE
+    pango_renderer_set_color(_SELF(self), RVAL2PANGORENDERPART(part),
+                             NIL_P(color) ? NULL : RVAL2PANGOCOLOR(color));
 #else
     pango_renderer_set_color(_SELF(self), NUM2INT(part),
-                             (PangoColor*)(NIL_P(color) ? NULL : RVAL2BOXED(color, PANGO_TYPE_COLOR)));
+                             NIL_P(color) ? NULL : RVAL2PANGOCOLOR(color));
 #endif
     return self;
 }
 
 static VALUE
-renderer_get_color(VALUE self, VALUE part)
+rg_get_color(VALUE self, VALUE part)
 {
-#if HAVE_PANGO_RENDER_PART_GET_TYPE
+#ifdef HAVE_PANGO_RENDER_PART_GET_TYPE
     PangoColor* color = pango_renderer_get_color(_SELF(self),
-                                                 RVAL2GENUM(part, PANGO_TYPE_RENDER_PART));
+                                                 RVAL2PANGORENDERPART(part));
 #else
     PangoColor* color = pango_renderer_get_color(_SELF(self),NUM2INT(part));
 #endif
-    return BOXED2RVAL(color, PANGO_TYPE_COLOR);
+    return PANGOCOLOR2RVAL(color);
 }
 
 static VALUE
-renderer_set_matrix(VALUE self, VALUE matrix)
+rg_set_matrix(VALUE self, VALUE matrix)
 {
     pango_renderer_set_matrix(_SELF(self), 
-                              (PangoMatrix*)(NIL_P(matrix) ? NULL : RVAL2BOXED(matrix, PANGO_TYPE_MATRIX)));
+                              NIL_P(matrix) ? NULL : RVAL2PANGOMATRIX(matrix));
     return self;
 }
 
 static VALUE
-renderer_get_matrix(VALUE self)
+rg_matrix(VALUE self)
 {
     const PangoMatrix* matrix = pango_renderer_get_matrix(_SELF(self));
-    return BOXED2RVAL((PangoMatrix*)matrix, PANGO_TYPE_MATRIX);
+    return PANGOMATRIX2RVAL((PangoMatrix*)matrix);
 }
 
 #endif
 
 void
-Init_pangorenderer()
+Init_pangorenderer(VALUE mPango)
 {
 #if PANGO_CHECK_VERSION(1,8,0)
-    VALUE renderer = G_DEF_CLASS(PANGO_TYPE_RENDERER, "Renderer", mPango);
-
-    rb_define_method(renderer, "draw_layout", renderer_draw_layout, 3);
-    rb_define_method(renderer, "draw_layout_line", renderer_draw_layout_line, 3);
-    rb_define_method(renderer, "draw_glyphs", renderer_draw_glyphs, 4);
-    rb_define_method(renderer, "draw_rectangle", renderer_draw_rectangle, 5);
-    rb_define_method(renderer, "draw_error_underline", renderer_draw_error_underline, 4);
-    rb_define_method(renderer, "draw_trapezoid", renderer_draw_trapezoid, 7);
-    rb_define_method(renderer, "draw_glyph", renderer_draw_glyph, 4);
-    rb_define_method(renderer, "activate", renderer_activate, 0);
-    rb_define_method(renderer, "deactivate", renderer_deactivate, 0); 
-    rb_define_method(renderer, "part_changed", renderer_part_changed, 1);
-    rb_define_method(renderer, "set_color", renderer_set_color, 2);
-    rb_define_method(renderer, "get_color", renderer_get_color, 1);
-    rb_define_method(renderer, "set_matrix", renderer_set_matrix, 1);
-    rb_define_method(renderer, "matrix", renderer_get_matrix, 0);
-
-    G_DEF_SETTERS(renderer);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_RENDERER, "Renderer", mPango);
+
+    RG_DEF_METHOD(draw_layout, 3);
+    RG_DEF_METHOD(draw_layout_line, 3);
+    RG_DEF_METHOD(draw_glyphs, 4);
+    RG_DEF_METHOD(draw_rectangle, 5);
+    RG_DEF_METHOD(draw_error_underline, 4);
+    RG_DEF_METHOD(draw_trapezoid, 7);
+    RG_DEF_METHOD(draw_glyph, 4);
+    RG_DEF_METHOD(activate, 0);
+    RG_DEF_METHOD(deactivate, 0); 
+    RG_DEF_METHOD(part_changed, 1);
+    RG_DEF_METHOD(set_color, 2);
+    RG_DEF_METHOD(get_color, 1);
+    RG_DEF_METHOD(set_matrix, 1);
+    RG_DEF_METHOD(matrix, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* PangoRenderPart */
-#if HAVE_PANGO_RENDER_PART_GET_TYPE
-    G_DEF_CLASS(PANGO_TYPE_RENDER_PART, "Part", renderer);
-    G_DEF_CONSTANTS(renderer, PANGO_TYPE_RENDER_PART, "PANGO_RENDER_");
+#ifdef HAVE_PANGO_RENDER_PART_GET_TYPE
+    G_DEF_CLASS(PANGO_TYPE_RENDER_PART, "Part", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_RENDER_PART, "PANGO_RENDER_");
 #endif
 
 #endif

data/ext/pango/rbpangoscript.c

@@ -1,35 +1,46 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  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
+ */
 
-  rbpangoscript.c -
-
-  $Author: ggc $
-  $Date: 2006/06/22 19:52:54 $
-
-  Copyright (C) 2005 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
+#include "rbpangoprivate.h"
 
 #if PANGO_CHECK_VERSION(1,4,0)
-#define _SELF(r) (RVAL2GENUM(r, PANGO_TYPE_SCRIPT))
+#define RG_TARGET_NAMESPACE cScript
+#define _SELF(r) (RVAL2PANGOSCRIPT(r))
 
 static VALUE
-rbpango_s_script_for_unichar(VALUE self, VALUE ch)
+rg_s_for_unichar(G_GNUC_UNUSED VALUE self, VALUE ch)
 {
-    return GENUM2RVAL(pango_script_for_unichar(NUM2UINT(ch)), PANGO_TYPE_SCRIPT);
+    return PANGOSCRIPT2RVAL(pango_script_for_unichar(NUM2UINT(ch)));
 }
 
 static VALUE
-rbpango_script_get_sample_language(VALUE self)
+rg_sample_language(VALUE self)
 {
     PangoLanguage* lang = pango_script_get_sample_language(_SELF(self));
-    return BOXED2RVAL(lang, PANGO_TYPE_LANGUAGE);
+    return PANGOLANGUAGE2RVAL(lang);
 }
 
 #if PANGO_CHECK_VERSION(1,16,0)
 static VALUE
-rbpango_script_get_gravity(int argc, VALUE *argv, VALUE self)
+rg_get_gravity(int argc, VALUE *argv, VALUE self)
 {
     VALUE wide, gravity, gravity_hint;
     int n;
@@ -39,20 +50,20 @@ rbpango_script_get_gravity(int argc, VALUE *argv, VALUE self)
 
     if (n == 2) {
         g = pango_gravity_get_for_script(_SELF(self),
-                                         RVAL2GENUM(gravity, PANGO_TYPE_GRAVITY),
-                                         RVAL2GENUM(gravity_hint, PANGO_TYPE_GRAVITY_HINT));
+                                         RVAL2PANGOGRAVITY(gravity),
+                                         RVAL2PANGOGRAVITYHINT(gravity_hint));
     } else {
 #  if PANGO_CHECK_VERSION(1,26,0)
         g = pango_gravity_get_for_script_and_width(_SELF(self),
                                                    RVAL2CBOOL(wide),
-                                                   RVAL2GENUM(gravity, PANGO_TYPE_GRAVITY),
-                                                   RVAL2GENUM(gravity_hint, PANGO_TYPE_GRAVITY_HINT));
+                                                   RVAL2PANGOGRAVITY(gravity),
+                                                   RVAL2PANGOGRAVITYHINT(gravity_hint));
 #  else
         rb_raise(rb_eArgError,
                  "the 3rd 'wide' argument requires Pango >= 1.26");
 #  endif
     }
-    return GENUM2RVAL(g, PANGO_TYPE_GRAVITY);
+    return PANGOGRAVITY2RVAL(g);
 }
 #endif
 
@@ -63,16 +74,15 @@ gboolean    pango_language_includes_script  (PangoLanguage *language,
 #endif
 
 void
-Init_pango_script()
+Init_pango_script(VALUE mPango)
 {
 #if PANGO_CHECK_VERSION(1,4,0)
-    VALUE script = G_DEF_CLASS(PANGO_TYPE_SCRIPT, "Script", mPango);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_SCRIPT, "Script", mPango);
 
-    rb_define_singleton_method(script, "for_unichar", rbpango_s_script_for_unichar, 1);
-    rb_define_method(script, "sample_language", rbpango_script_get_sample_language, 0);
+    RG_DEF_SMETHOD(for_unichar, 1);
+    RG_DEF_METHOD(sample_language, 0);
 #endif
 #if PANGO_CHECK_VERSION(1,16,0)
-    rb_define_method(script, "get_gravity", rbpango_script_get_gravity, -1);
+    RG_DEF_METHOD(get_gravity, -1);
 #endif
 }
-

data/ext/pango/rbpangoscriptiter.c

@@ -1,15 +1,25 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangoscriptiter.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 02:53:10 $
-
-  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
+ */
+
+#include "rbpangoprivate.h"
 
 #if PANGO_CHECK_VERSION(1,4,0)
 
@@ -40,10 +50,11 @@ pango_script_iter_get_type(void)
 }
 /**********************************/
 
-#define _SELF(r) ((PangoScriptIter*)RVAL2BOXED(r, PANGO_TYPE_SCRIPT_ITER))
+#define RG_TARGET_NAMESPACE cScriptIter
+#define _SELF(r) (RVAL2PANGOSCRIPTITER(r))
 
 static VALUE
-rbpango_scriptiter_initialize(VALUE self, VALUE text)
+rg_initialize(VALUE self, VALUE text)
 {
     PangoScriptIter* iter;
 
@@ -54,7 +65,7 @@ rbpango_scriptiter_initialize(VALUE self, VALUE text)
 }
 
 static VALUE
-rbpango_scriptiter_get_range(VALUE self)
+rg_range(VALUE self)
 {
     G_CONST_RETURN char* start;
     G_CONST_RETURN char* end;
@@ -63,25 +74,24 @@ rbpango_scriptiter_get_range(VALUE self)
     pango_script_iter_get_range(_SELF(self), &start, &end, &script);
 
     return rb_ary_new3(3, CSTR2RVAL(start), CSTR2RVAL(end), 
-                       GENUM2RVAL(script, PANGO_TYPE_SCRIPT));
+                       PANGOSCRIPT2RVAL(script));
 }
 
 static VALUE
-rbpango_scriptiter_next(VALUE self)
+rg_next_bang(VALUE self)
 {
     return CBOOL2RVAL(pango_script_iter_next(_SELF(self)));
 }
 #endif
 
 void
-Init_pango_script_iter()
+Init_pango_script_iter(VALUE mPango)
 {
 #if PANGO_CHECK_VERSION(1,4,0)
-    VALUE scriter = G_DEF_CLASS(PANGO_TYPE_SCRIPT_ITER, "ScriptIter", mPango);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_SCRIPT_ITER, "ScriptIter", mPango);
 
-    rb_define_method(scriter, "initialize", rbpango_scriptiter_initialize, 1);
-    rb_define_method(scriter, "range", rbpango_scriptiter_get_range, 0);
-    rb_define_method(scriter, "next!", rbpango_scriptiter_next, 0);
+    RG_DEF_METHOD(initialize, 1);
+    RG_DEF_METHOD(range, 0);
+    RG_DEF_METHOD_BANG(next, 0);
 #endif
 }
-