goocanvas 1.0.3 → 1.1.0

data/ext/goocanvas/rbgoocanvastext.c

@@ -1,31 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/* $Id: rbgoocanvastext.c 3288 2008-09-13 10:07:44Z ktou $ */
-/* GooCanvasText
- * Copyright (C) 2007 Vincent Isambart <vincent.isambart@gmail.com>
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Vincent Isambart <vincent.isambart@gmail.com>
  *
- * 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 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.
+ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  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 "rbgoocanvas.h"
+#include "rbgoocanvasprivate.h"
+
+#define RG_TARGET_NAMESPACE cCanvasText
 
 static VALUE
-rb_goo_canvas_text_new(VALUE self, VALUE parent, VALUE string,
+rg_initialize(VALUE self, VALUE parent, VALUE string,
                        VALUE x, VALUE y, VALUE width, VALUE anchor)
 {
     GooCanvasItem *item;
-    item = goo_canvas_text_new(RVAL2GCI(parent),
+    item = goo_canvas_text_new(RVAL2GOOCANVASITEM(parent),
                                NIL_P(string) ? NULL : StringValueCStr(string),
                                NUM2DBL(x),
                                NUM2DBL(y),
@@ -38,21 +41,11 @@ rb_goo_canvas_text_new(VALUE self, VALUE parent, VALUE string,
 }
 
 void
-Init_goocanvastext(void)
+Init_goocanvastext(VALUE mGoo)
 {
-    VALUE GooCanvasText;
-
-    GooCanvasText = G_DEF_CLASS(GOO_TYPE_CANVAS_TEXT, "CanvasText", mGoo);
+    VALUE RG_TARGET_NAMESPACE;
 
-    rb_define_method(GooCanvasText, "initialize", rb_goo_canvas_text_new, 6);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GOO_TYPE_CANVAS_TEXT, "CanvasText", mGoo);
 
-#if 0
-   GooCanvasItemModel* goo_canvas_text_model_new (GooCanvasItemModel *parent,
-   					       const char         *string,
-   					       gdouble             x,
-   					       gdouble             y,
-   					       gdouble             width,
-   					       GtkAnchorType       anchor,
-   					       ...);
-#endif
+    RG_DEF_METHOD(initialize, 6);
 }

data/ext/goocanvas/rbgoocanvaswidget.c

@@ -1,32 +1,35 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/* $Id: rbgoocanvaswidget.c 3288 2008-09-13 10:07:44Z ktou $ */
-/* GooCanvasWidget
- * Copyright (C) 2007 Vincent Isambart <vincent.isambart@gmail.com>
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Vincent Isambart <vincent.isambart@gmail.com>
  *
- * 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 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.
+ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  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 "rbgoocanvas.h"
+#include "rbgoocanvasprivate.h"
+
+#define RG_TARGET_NAMESPACE cCanvasWidget
 
 static VALUE
-rb_goo_canvas_widget_new(VALUE self, VALUE parent, VALUE widget,
+rg_initialize(VALUE self, VALUE parent, VALUE widget,
                          VALUE x, VALUE y, VALUE width, VALUE height)
 {
     GooCanvasItem *item;
-    item = goo_canvas_widget_new(RVAL2GCI(parent),
-                                 RVAL2GTK_WIDGET(widget),
+    item = goo_canvas_widget_new(RVAL2GOOCANVASITEM(parent),
+                                 RVAL2GTKWIDGET(widget),
                                  NUM2DBL(x),
                                  NUM2DBL(y),
                                  NUM2DBL(width),
@@ -38,11 +41,11 @@ rb_goo_canvas_widget_new(VALUE self, VALUE parent, VALUE widget,
 }
 
 void
-Init_goocanvaswidget(void)
+Init_goocanvaswidget(VALUE mGoo)
 {
-    VALUE GooCanvasWidget;
+    VALUE RG_TARGET_NAMESPACE;
 
-    GooCanvasWidget = G_DEF_CLASS(GOO_TYPE_CANVAS_WIDGET, "CanvasWidget", mGoo);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GOO_TYPE_CANVAS_WIDGET, "CanvasWidget", mGoo);
 
-    rb_define_method(GooCanvasWidget, "initialize", rb_goo_canvas_widget_new, 6);
+    RG_DEF_METHOD(initialize, 6);
 }

data/ext/goocanvas/rbgooutils.c

@@ -1,24 +1,25 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/* $Id: rbgooutils.c 3426 2008-11-01 14:20:52Z ktou $ */
-/* Utility functions
- * Copyright (C) 2007 Vincent Isambart <vincent.isambart@gmail.com>
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Vincent Isambart <vincent.isambart@gmail.com>
  *
- * 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 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.
+ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  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 "rbgoocanvas.h"
+#include "rbgoocanvasprivate.h"
 
 GooCanvasBounds *
 ruby_to_goo_canvas_bounds(VALUE rb_bounds, GooCanvasBounds *dest_bounds)

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: goocanvas
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
-- The Ruby-GNOME2 Proejct Team
+- The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-09-18 00:00:00 Z
+date: 2012-01-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gtk2
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 19
         segments: 
         - 1
+        - 1
         - 0
-        - 3
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   version_requirements: *id001
 description: Ruby/GooCanvas is a Ruby binding of GooCanvas.
@@ -42,20 +42,24 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- ChangeLog
 - README
 - Rakefile
 - extconf.rb
 - lib/goocanvas.rb
+- ext/goocanvas/rbgoocairomatrix.c
 - ext/goocanvas/rbgoocanvastext.c
+- ext/goocanvas/rbgoocairopattern.c
+- ext/goocanvas/rbgoocanvasconversions.h
 - ext/goocanvas/rbgoocanvasimage.c
 - ext/goocanvas/rbgoocanvastable.c
 - ext/goocanvas/rbgooutils.c
 - ext/goocanvas/rbgoocanvas.c
 - ext/goocanvas/rbgoocanvaspolyline.c
-- ext/goocanvas/rbgoocairo.c
+- ext/goocanvas/rbgoocanvaspoints.c
 - ext/goocanvas/extconf.rb
+- ext/goocanvas/rbgoocanvasprivate.h
 - ext/goocanvas/goocanvas.def
+- ext/goocanvas/rbgoo.c
 - ext/goocanvas/rbgoocanvasrect.c
 - ext/goocanvas/rbgoocanvasellipse.c
 - ext/goocanvas/rbgoocanvasitem.c
@@ -106,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Ruby/GooCanvas is a Ruby binding of GooCanvas.

data/ChangeLog

@@ -1,97 +0,0 @@
-2011-08-19  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/goocanvas.rb: support binary bundled gem.
-	Patch by HAYASHI Kentaro. Thanks!!!
-
-2011-02-12  Kouhei Sutou  <kou@cozmixng.org>
-
-	* ext/goocanvas/depend: fix .pc path. #3178294
-	Reported by OBATA Akio. Thanks!!!
-
-2011-01-30  Kouhei Sutou  <kou@cozmixng.org>
-
-	* ./: support gem for Windows build.
-
-2011-01-28  Masaaki Aoyagi
-
-	* src/lib/: -> lib/.
-
-	* src/: -> ext/goocanvas/.
-
-	* extconf.rb: -> ext/goocanvas/extconf.rb
-
-	* ext/goocanvas/extconf.rb: support directory structure change.
-
-	* extconf.rb: add.
-
-	* Rakefile: add.
-
-2010-09-23  Kouhei Sutou  <kou@cozmixng.org>
-
-	* extconf.rb: support Ruby/GLib2 directory structure change.
-
-2008-11-01  Kouhei Sutou  <kou@cozmixng.org>
-
-	* src/: use RARRAY_PTR() and RARRAY_LEN().
-
-2008-09-30  yselkowitz
-
-	* extconf.rb: add missing dependencies.
-
-2008-09-14  Kouhei Sutou  <kou@cozmixng.org>
-
-	* extconf.rb: fix path.
-
-2008-09-13  Kouhei Sutou  <kou@cozmixng.org>
-
-	* extconf.rb: use check_cairo.
-
-	* /: move to The Ruby-GNOME2 Project.
-
-2008-08-16  Kouhei Sutou  <kou@cozmixng.org>
-
-	* sample/demo-primitives.rb: update menu widgets to follow the
-	latest original demo.
-
-	* sample/demo-primitives.rb: TAB -> 2 spaces.
-
-2008-07-21  Kouhei Sutou  <kou@cozmixng.org>
-
-	* src/rbgoocairo.c (rb_cairo_pattern_to_goo)
-	(rb_cairo_matrix_to_goo): fix a reference count bug.
-
-	* sample/demo-fifteen.rb (CanvasSampleFifteen#scramble): fix broken.
-
-	* src/rbgoocanvas.c: bind Goo::Canvas#scroll_to.
-
-2008-06-27  Kouhei Sutou  <kou@cozmixng.org>
-
-	* sample/demo.rb: support quiting by C-q.
-
-	* sample/demo.rb: set $LOAD_PATH.
-
-2007-06-22  Kouhei Sutou  <kou@cozmixng.org>
-
-	* src/:
-	- cleanup macros.
-	- cleanup styles.
-
-	* src/rbgoocanvasitem.c:
-	- fixed style.
-	- used more self-describing macro.
-
-	* README: added.
-
-2007-05-02  Kouhei Sutou  <kou@cozmixng.org>
-
-	* sample/demo.rb: cleanup.
-
-	* extconf.rb, src/rbgoocairo.c: required >= 0.8.0.
-
-	* sample/demo.rb: untabified.
-
-	* extconf.rb: supported GooCanvas version check in C.
-
-	* src/rbgoocanvas.h, src/rbgoocairo.c: supported build with
-	GooCanvas 0.6.0.
-

data/ext/goocanvas/rbgoocairo.c

@@ -1,74 +0,0 @@
-/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/* $Id: rbgoocairo.c 3288 2008-09-13 10:07:44Z ktou $ */
-/* convertion from Cairo types to GooCairo types
- * Copyright (C) 2007 Vincent Isambart <vincent.isambart@gmail.com>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "rbgoocanvas.h"
-
-static VALUE
-rb_cairo_pattern_to_goo(VALUE self)
-{
-    GValue gval = {0,};
-    VALUE result;
-
-    g_value_init(&gval, GOO_TYPE_CAIRO_PATTERN);
-    g_value_set_boxed(&gval, RVAL2CRPATTERN(self));
-
-    result = rbgobj_gvalue_to_rvalue(&gval);
-    g_value_unset(&gval);
-
-    return result;
-}
-
-static VALUE
-rb_cairo_matrix_to_goo(VALUE self)
-{
-    GValue gval = {0,};
-    VALUE result;
-
-    g_value_init(&gval, GOO_TYPE_CAIRO_MATRIX);
-    g_value_set_boxed(&gval, RVAL2CRMATRIX(self));
-
-    result = rbgobj_gvalue_to_rvalue(&gval);
-    g_value_unset(&gval);
-
-    return result;
-}
-
-void
-Init_goocairo(void)
-{
-    VALUE Cairo, CairoPattern, CairoMatrix;
-
-    G_DEF_CLASS(GOO_TYPE_CAIRO_MATRIX, "CairoMatrix", mGoo);
-    G_DEF_CLASS(GOO_TYPE_CAIRO_PATTERN, "CairoPattern", mGoo);
-    G_DEF_CLASS(GOO_TYPE_CAIRO_FILL_RULE, "CairoFillRule", mGoo);
-    G_DEF_CLASS(GOO_TYPE_CAIRO_OPERATOR, "CairoOperator", mGoo);
-    G_DEF_CLASS(GOO_TYPE_CAIRO_ANTIALIAS, "CairoAntiAlias", mGoo);
-    G_DEF_CLASS(GOO_TYPE_CAIRO_LINE_CAP, "CairoLineCap", mGoo);
-    G_DEF_CLASS(GOO_TYPE_CAIRO_LINE_JOIN, "CairoLineJoin", mGoo);
-    G_DEF_CLASS(GOO_TYPE_CAIRO_HINT_METRICS, "CairoHintMetrics", mGoo);
-
-    Cairo = rb_const_get(rb_mKernel, rb_intern("Cairo"));
-
-    CairoPattern = rb_const_get(Cairo, rb_intern("Pattern"));
-    rb_define_method(CairoPattern, "to_goo", rb_cairo_pattern_to_goo, 0);
-
-    CairoMatrix = rb_const_get(Cairo, rb_intern("Matrix"));
-    rb_define_method(CairoMatrix, "to_goo", rb_cairo_matrix_to_goo, 0);
-}