pango 1.0.3 → 1.1.0

data/ext/pango/rbpangoattrlist.c

@@ -1,50 +1,61 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangoattrlist.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 02:53:10 $
-
-  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"
 
 static ID id_call;
 
-#define _SELF(self) ((PangoAttrList*)RVAL2BOXED(self, PANGO_TYPE_ATTR_LIST))
+#define RG_TARGET_NAMESPACE cAttrList
+#define _SELF(self) (RVAL2PANGOATTRLIST(self))
 
 static VALUE
-attrlist_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, pango_attr_list_new());
     return Qnil;
 }
 
 static VALUE
-attrlist_insert(VALUE self, VALUE attr)
+rg_insert(VALUE self, VALUE attr)
 {
     pango_attr_list_insert(_SELF(self), RVAL2ATTR(attr));
     return self;
 }
 
 static VALUE
-attrlist_insert_before(VALUE self, VALUE attr)
+rg_insert_before(VALUE self, VALUE attr)
 {
     pango_attr_list_insert_before(_SELF(self), RVAL2ATTR(attr));
     return self;
 }
 
 static VALUE
-attrlist_change(VALUE self, VALUE attr)
+rg_change(VALUE self, VALUE attr)
 {
     pango_attr_list_change(_SELF(self), RVAL2ATTR(attr));
     return self;
 }
 
 static VALUE
-attrlist_splice(VALUE self, VALUE other, VALUE pos, VALUE len)
+rg_splice(VALUE self, VALUE other, VALUE pos, VALUE len)
 {
     pango_attr_list_splice(_SELF(self), _SELF(other), NUM2INT(pos), NUM2INT(len));
     return self;
@@ -58,38 +69,37 @@ filter_func(PangoAttribute *attr, gpointer data)
 }
 
 static VALUE
-attrlist_filter(VALUE self)
+rg_filter(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
-    return BOXED2RVAL(pango_attr_list_filter(_SELF(self), 
+    return PANGOATTRLIST2RVAL(pango_attr_list_filter(_SELF(self), 
                                              (PangoAttrFilterFunc)filter_func, 
-                                             (gpointer)func),
-                      PANGO_TYPE_ATTR_LIST);
+                                             (gpointer)func));
 }
 #endif
 
 static VALUE
-attrlist_get_iterator(VALUE self)
+rg_iterator(VALUE self)
 {
-    return BOXED2RVAL(pango_attr_list_get_iterator(_SELF(self)), PANGO_TYPE_ATTR_ITERATOR);
+    return PANGOATTRITERATOR2RVAL(pango_attr_list_get_iterator(_SELF(self)));
 }
 
 void
-Init_pango_attrlist()
+Init_pango_attrlist(VALUE mPango)
 {
-    VALUE pAttrlist = G_DEF_CLASS(PANGO_TYPE_ATTR_LIST, "AttrList", mPango);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_ATTR_LIST, "AttrList", mPango);
 
     id_call = rb_intern("call");
 
-    rb_define_method(pAttrlist, "initialize", attrlist_initialize, 0);
-    rb_define_method(pAttrlist, "insert", attrlist_insert, 1);
-    rb_define_method(pAttrlist, "insert_before", attrlist_insert_before, 1);
-    rb_define_method(pAttrlist, "change", attrlist_change, 1);
-    rb_define_method(pAttrlist, "splice", attrlist_splice, 3);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(insert, 1);
+    RG_DEF_METHOD(insert_before, 1);
+    RG_DEF_METHOD(change, 1);
+    RG_DEF_METHOD(splice, 3);
 #if PANGO_CHECK_VERSION(1,4,0)
-    rb_define_method(pAttrlist, "filter", attrlist_filter, 0);
+    RG_DEF_METHOD(filter, 0);
 #endif
-    rb_define_method(pAttrlist, "iterator", attrlist_get_iterator, 0);
+    RG_DEF_METHOD(iterator, 0);
 
 }

data/ext/pango/rbpangocairo.c

@@ -1,215 +1,81 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangocairo.c -
-
-  $Author: ktou $
-  $Date: 2007/08/13 11:10:22 $
-
-  Copyright (C) 2005 Kouhei Sutou
-  Copyright (C) 2006 Ruby-GNOME2 Project Team
-************************************************/
-
-#include "rbpango.h"
-
-#if PANGO_CHECK_VERSION(1,10,0) && defined(HAVE_RB_CAIRO_H)
-#  define CAIRO_AVAILABLE 1
-#endif
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005  Kouhei Sutou
+ *
+ *  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 CAIRO_AVAILABLE
 
-#define _SELF(self) (PANGO_CAIRO_FONT_MAP(RVAL2GOBJ(self)))
-#define RVAL2CONTEXT(v) (PANGO_CONTEXT(RVAL2GOBJ(v)))
-#define RVAL2LAYOUT(v) (PANGO_LAYOUT(RVAL2GOBJ(v)))
-#define RVAL2FONT(v) (PANGO_FONT(RVAL2GOBJ(v)))
-#define RVAL2GLYPH(v) ((PangoGlyphString*)(RVAL2BOXED(self, PANGO_TYPE_GLYPH_STRING)))
-#define RVAL2LINE(v) ((PangoLayoutLine*)RVAL2BOXED(v, PANGO_TYPE_LAYOUT_LINE))
+#define RG_TARGET_NAMESPACE cCairoFontMap
+#define _SELF(self) (RVAL2PANGOCAIROFONTMAP(self))
 
 static VALUE
-font_map_create(VALUE klass)
+rg_s_create(VALUE klass)
 {
     return GOBJ2RVAL(pango_cairo_font_map_new());
 }
 
 static VALUE
-font_map_get_default(VALUE klass)
+rg_s_default(VALUE klass)
 {
     return GOBJ2RVAL(pango_cairo_font_map_get_default());
 }
 
 static VALUE
-font_map_set_resolution(VALUE self, VALUE dpi)
+rg_set_resolution(VALUE self, VALUE dpi)
 {
     pango_cairo_font_map_set_resolution(_SELF(self), NUM2DBL(dpi));
     return self;
 }
 
 static VALUE
-font_map_get_resolution(VALUE self)
+rg_resolution(VALUE self)
 {
     return rb_float_new(pango_cairo_font_map_get_resolution(_SELF(self)));
 }
 
 static VALUE
-font_map_create_context(VALUE self)
+rg_create_context(VALUE self)
 {
     return GOBJ2RVAL_UNREF(pango_cairo_font_map_create_context(_SELF(self)));
 }
 
-static VALUE
-update_context(VALUE self, VALUE context)
-{
-    pango_cairo_update_context(RVAL2CRCONTEXT(self), RVAL2CONTEXT(context));
-    return self;
-}
-
-/* Convenience */
-static VALUE
-create_layout(VALUE self)
-{
-    return GOBJ2RVAL_UNREF(pango_cairo_create_layout(RVAL2CRCONTEXT(self)));
-}
-
-static VALUE
-update_layout(VALUE self, VALUE layout)
-{
-    pango_cairo_update_layout(RVAL2CRCONTEXT(self), RVAL2LAYOUT(layout));
-    return self;
-}
-
-/* Rendering */
-static VALUE
-show_glyph_string(VALUE self, VALUE font, VALUE glyphs)
-{
-    pango_cairo_show_glyph_string(RVAL2CRCONTEXT(self),
-                                  RVAL2FONT(font),
-                                  RVAL2GLYPH(glyphs));
-    return self;
-}
-
-static VALUE
-show_layout_line(VALUE self, VALUE line)
-{
-    pango_cairo_show_layout_line(RVAL2CRCONTEXT(self), RVAL2LINE(line));
-    return self;
-}
-
-static VALUE
-show_layout(VALUE self, VALUE layout)
-{
-    pango_cairo_show_layout(RVAL2CRCONTEXT(self), RVAL2LAYOUT(layout));
-    return self;
-}
-
-#if PANGO_CHECK_VERSION(1,14,0)
-static VALUE
-show_error_underline(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
-{
-    pango_cairo_show_error_underline(RVAL2CRCONTEXT(self), 
-                                     NUM2DBL(x), NUM2DBL(y), 
-                                     NUM2DBL(width), NUM2DBL(height));
-    return self;
-}
-#endif
-
-/* Rendering to a path */
-static VALUE
-glyph_string_path(VALUE self, VALUE font, VALUE glyphs)
-{
-    pango_cairo_glyph_string_path(RVAL2CRCONTEXT(self),
-                                  RVAL2FONT(font),
-                                  RVAL2GLYPH(glyphs));
-    return self;
-}
-
-static VALUE
-layout_line_path(VALUE self, VALUE line)
-{
-    pango_cairo_layout_line_path(RVAL2CRCONTEXT(self), RVAL2LINE(line));
-    return self;
-}
-
-static VALUE
-layout_path(VALUE self, VALUE layout)
-{
-    pango_cairo_layout_path(RVAL2CRCONTEXT(self), RVAL2LAYOUT(layout));
-    return self;
-}
-
-#if PANGO_CHECK_VERSION(1,14,0)
-static VALUE
-error_underline_path(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
-{
-    pango_cairo_error_underline_path(RVAL2CRCONTEXT(self), 
-                                     NUM2DBL(x), NUM2DBL(y), 
-                                     NUM2DBL(width), NUM2DBL(height));
-    return self;
-}
-#endif
-
-#endif
-
-static VALUE
-cairo_available_p(VALUE self)
-{
-#if CAIRO_AVAILABLE
-    return Qtrue;
-#else
-    return Qfalse;
 #endif
-}
 
 void
-Init_pango_cairo()
+Init_pango_cairo(VALUE mPango)
 {
 #ifdef CAIRO_AVAILABLE
-    VALUE pFontMap;
+    VALUE RG_TARGET_NAMESPACE;
 
     /* Pango::CairoFontMap */
-    pFontMap = G_DEF_CLASS(PANGO_TYPE_CAIRO_FONT_MAP, "CairoFontMap", mPango);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_CAIRO_FONT_MAP, "CairoFontMap", mPango);
 
-    rb_define_singleton_method(pFontMap, "create", font_map_create, 0);
-    rb_define_singleton_method(pFontMap, "default", font_map_get_default, 0);
+    RG_DEF_SMETHOD(create, 0);
+    RG_DEF_SMETHOD(default, 0);
 
-    rb_define_method(pFontMap, "set_resolution", font_map_set_resolution, 1);
-    rb_define_method(pFontMap, "resolution", font_map_get_resolution, 0);
-    rb_define_method(pFontMap, "create_context", font_map_create_context, 0);
+    RG_DEF_METHOD(set_resolution, 1);
+    RG_DEF_METHOD(resolution, 0);
+    RG_DEF_METHOD(create_context, 0);
 
-    G_DEF_SETTERS(pFontMap);
-
-    /* Cairo::Context */
-    rb_define_method(rb_cCairo_Context, "update_pango_context",
-                     update_context, 1);
-    /* Convenience */
-    rb_define_method(rb_cCairo_Context, "create_pango_layout",
-                     create_layout, 0);
-    rb_define_method(rb_cCairo_Context, "update_pango_layout",
-                     update_layout, 1);
-    /* Rendering */
-    rb_define_method(rb_cCairo_Context, "show_pango_glyph_string",
-                     show_glyph_string, 2);
-    rb_define_method(rb_cCairo_Context, "show_pango_layout_line",
-                     show_layout_line, 1);
-    rb_define_method(rb_cCairo_Context, "show_pango_layout",
-                     show_layout, 1);
-#if PANGO_CHECK_VERSION(1,14,0)
-    rb_define_method(rb_cCairo_Context, "show_pango_error_underline",
-                     show_error_underline, 4);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
-    /* Rendering to a path */
-    rb_define_method(rb_cCairo_Context, "pango_glyph_string_path",
-                     glyph_string_path, 2);
-    rb_define_method(rb_cCairo_Context, "pango_layout_line_path",
-                     layout_line_path, 1);
-    rb_define_method(rb_cCairo_Context, "pango_layout_path",
-                     layout_path, 1);
-
-#if PANGO_CHECK_VERSION(1,14,0)
-    rb_define_method(rb_cCairo_Context, "pango_error_underline_path",
-                     error_underline_path, 4);
-#endif
-
-#endif
-
-    rb_define_module_function(mPango, "cairo_available?", cairo_available_p, 0);
 }

data/ext/pango/rbpangocairocontext.c

@@ -0,0 +1,151 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005  Kouhei Sutou
+ *
+ *  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,10,0) && defined(HAVE_RB_CAIRO_H)
+#  define CAIRO_AVAILABLE 1
+#endif
+
+#ifdef CAIRO_AVAILABLE
+
+#define RG_TARGET_NAMESPACE rb_cCairo_Context
+
+static VALUE
+rg_update_pango_context(VALUE self, VALUE context)
+{
+    pango_cairo_update_context(RVAL2CRCONTEXT(self), RVAL2PANGOCONTEXT(context));
+    return self;
+}
+
+/* Convenience */
+static VALUE
+rg_create_pango_layout(VALUE self)
+{
+    return GOBJ2RVAL_UNREF(pango_cairo_create_layout(RVAL2CRCONTEXT(self)));
+}
+
+static VALUE
+rg_update_pango_layout(VALUE self, VALUE layout)
+{
+    pango_cairo_update_layout(RVAL2CRCONTEXT(self), RVAL2PANGOLAYOUT(layout));
+    return self;
+}
+
+/* Rendering */
+static VALUE
+rg_show_pango_glyph_string(VALUE self, VALUE font, VALUE glyphs)
+{
+    pango_cairo_show_glyph_string(RVAL2CRCONTEXT(self),
+                                  RVAL2PANGOFONT(font),
+                                  RVAL2PANGOGLYPHSTRING(glyphs));
+    return self;
+}
+
+static VALUE
+rg_show_pango_layout_line(VALUE self, VALUE line)
+{
+    pango_cairo_show_layout_line(RVAL2CRCONTEXT(self), RVAL2PANGOLAYOUTLINE(line));
+    return self;
+}
+
+static VALUE
+rg_show_pango_layout(VALUE self, VALUE layout)
+{
+    pango_cairo_show_layout(RVAL2CRCONTEXT(self), RVAL2PANGOLAYOUT(layout));
+    return self;
+}
+
+#if PANGO_CHECK_VERSION(1,14,0)
+static VALUE
+rg_show_pango_error_underline(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
+{
+    pango_cairo_show_error_underline(RVAL2CRCONTEXT(self), 
+                                     NUM2DBL(x), NUM2DBL(y), 
+                                     NUM2DBL(width), NUM2DBL(height));
+    return self;
+}
+#endif
+
+/* Rendering to a path */
+static VALUE
+rg_pango_glyph_string_path(VALUE self, VALUE font, VALUE glyphs)
+{
+    pango_cairo_glyph_string_path(RVAL2CRCONTEXT(self),
+                                  RVAL2PANGOFONT(font),
+                                  RVAL2PANGOGLYPHSTRING(glyphs));
+    return self;
+}
+
+static VALUE
+rg_pango_layout_line_path(VALUE self, VALUE line)
+{
+    pango_cairo_layout_line_path(RVAL2CRCONTEXT(self), RVAL2PANGOLAYOUTLINE(line));
+    return self;
+}
+
+static VALUE
+rg_pango_layout_path(VALUE self, VALUE layout)
+{
+    pango_cairo_layout_path(RVAL2CRCONTEXT(self), RVAL2PANGOLAYOUT(layout));
+    return self;
+}
+
+#if PANGO_CHECK_VERSION(1,14,0)
+static VALUE
+rg_pango_error_underline_path(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
+{
+    pango_cairo_error_underline_path(RVAL2CRCONTEXT(self), 
+                                     NUM2DBL(x), NUM2DBL(y), 
+                                     NUM2DBL(width), NUM2DBL(height));
+    return self;
+}
+#endif
+
+#endif
+
+void
+Init_pango_cairo_context(VALUE mPango)
+{
+#ifdef CAIRO_AVAILABLE
+    /* Cairo::Context */
+    RG_DEF_METHOD(update_pango_context, 1);
+    /* Convenience */
+    RG_DEF_METHOD(create_pango_layout, 0);
+    RG_DEF_METHOD(update_pango_layout, 1);
+    /* Rendering */
+    RG_DEF_METHOD(show_pango_glyph_string, 2);
+    RG_DEF_METHOD(show_pango_layout_line, 1);
+    RG_DEF_METHOD(show_pango_layout, 1);
+#if PANGO_CHECK_VERSION(1,14,0)
+    RG_DEF_METHOD(show_pango_error_underline, 4);
+#endif
+    /* Rendering to a path */
+    RG_DEF_METHOD(pango_glyph_string_path, 2);
+    RG_DEF_METHOD(pango_layout_line_path, 1);
+    RG_DEF_METHOD(pango_layout_path, 1);
+
+#if PANGO_CHECK_VERSION(1,14,0)
+    RG_DEF_METHOD(pango_error_underline_path, 4);
+#endif
+#endif
+}