atk 1.0.3 → 1.1.0

data/ext/atk/extconf.rb

@@ -30,6 +30,9 @@ rescue LoadError
   require 'mkmf-gnome2'
 end
 
+ruby_header = 'ruby.h'
+have_func 'rb_errinfo', ruby_header
+
 ["glib2"].each do |package|
   directory = "#{package}#{version_suffix}"
   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"

data/ext/atk/rbatk.c

@@ -1,27 +1,66 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003-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
+ */
 
-  rbatk.c -
-
-  $Author: mutoh $
-  $Date: 2005/09/28 17:38:25 $
-
-  Copyright (C) 2003-2005 Masao Mutoh
-************************************************/
-
-#include "rbatk.h"
+#include "rbatkprivate.h"
 
+#define RG_TARGET_NAMESPACE mAtk
 VALUE mAtk;
 
+extern void Init_atk(void);
+
 void
-Init_atk()
+Init_atk(void)
 {
-    mAtk = rb_define_module("Atk");
+    RG_TARGET_NAMESPACE = rb_define_module("Atk");
 
-    rb_define_const(mAtk, "BUILD_VERSION", 
-                    rb_ary_new3(3, 
-                                INT2FIX(ATK_MAJOR_VERSION), 
-                                INT2FIX(ATK_MINOR_VERSION), 
+    rb_define_const(RG_TARGET_NAMESPACE, "BUILD_VERSION",
+                    rb_ary_new3(3,
+                                INT2FIX(ATK_MAJOR_VERSION),
+                                INT2FIX(ATK_MINOR_VERSION),
                                 INT2FIX(ATK_MICRO_VERSION)));
-    Init_atk_inits();
+
+    Init_atk_action(RG_TARGET_NAMESPACE);
+    Init_atk_component(RG_TARGET_NAMESPACE);
+    Init_atk_document(RG_TARGET_NAMESPACE);
+    Init_atk_editabletext(RG_TARGET_NAMESPACE);
+    Init_atk_gobjectaccessible(RG_TARGET_NAMESPACE);
+    Init_atk_hyperlink(RG_TARGET_NAMESPACE);
+    Init_atk_hypertext(RG_TARGET_NAMESPACE);
+    Init_atk_image(RG_TARGET_NAMESPACE);
+    Init_atk_implementor(RG_TARGET_NAMESPACE);
+    Init_atk_noopobject(RG_TARGET_NAMESPACE);
+    Init_atk_noopobjectfactory(RG_TARGET_NAMESPACE);
+    Init_atk_object(RG_TARGET_NAMESPACE);
+    Init_atk_objectfactory(RG_TARGET_NAMESPACE);
+    Init_atk_registry(RG_TARGET_NAMESPACE);
+    Init_atk_relation(RG_TARGET_NAMESPACE);
+    Init_atk_relation_set(RG_TARGET_NAMESPACE);
+    Init_atk_selection(RG_TARGET_NAMESPACE);
+    Init_atk_state(RG_TARGET_NAMESPACE);
+    Init_atk_state_set(RG_TARGET_NAMESPACE);
+    Init_atk_streamable_content(RG_TARGET_NAMESPACE);
+    Init_atk_table(RG_TARGET_NAMESPACE);
+    Init_atk_text(RG_TARGET_NAMESPACE);
+    Init_atk_text_range(RG_TARGET_NAMESPACE);
+    Init_atk_text_rectangle(RG_TARGET_NAMESPACE);
+    Init_atk_util(RG_TARGET_NAMESPACE);
+    Init_atk_value(RG_TARGET_NAMESPACE);
 }

data/ext/atk/rbatk.h

@@ -1,12 +1,24 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-  rbatk.h -
-
-  $Author: mutoh $
-  $Date: 2005/09/15 17:30:46 $
-
-  Copyright (C) 2003,2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003,2004 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 "ruby.h"
 #include <atk/atk.h>
 #include <atk/atk-enum-types.h>
@@ -14,7 +26,7 @@
 #include <atk/atknoopobjectfactory.h>
 #include "rbgobject.h"
 #include "rbatkversion.h"
-
+#include "rbatkconversions.h"
 
 #if defined(G_PLATFORM_WIN32) && !defined(RUBY_ATK_STATIC_COMPILATION)
 #  ifdef RUBY_ATK_COMPILATION
@@ -25,10 +37,7 @@
 #else
 #  define RUBY_ATK_VAR extern
 #endif
-                                                                                
-#define RVAL2ATKOBJECT(s) ATK_OBJECT(RVAL2GOBJ(s))
 
-extern void Init_atk_inits();
 extern GType atk_text_rectangle_get_type(void);
 extern GType atk_text_range_get_type(void);
 

data/ext/atk/rbatkaction.c

@@ -1,74 +1,85 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  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
+ */
 
-  rbatkaction.c -
+#include "rbatkprivate.h"
 
-  $Author: mutoh $
-  $Date: 2004/03/05 15:33:47 $
-
-  Copyright (C) 2004 Masao Mutoh 
-************************************************/
-
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_ACTION(RVAL2GOBJ(s)))
+#define RG_TARGET_NAMESPACE mAction
+#define _SELF(s) (RVAL2ATKACTION(s))
 
 static VALUE
-rbatk_action_do_action(VALUE self, VALUE i)
+rg_do_action(VALUE self, VALUE i)
 {
     return CBOOL2RVAL(atk_action_do_action(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatk_action_get_n_actions(VALUE self)
+rg_n_actions(VALUE self)
 {
     return INT2NUM(atk_action_get_n_actions(_SELF(self)));
 }
 
 static VALUE
-rbatk_action_get_description(VALUE self, VALUE i)
+rg_get_description(VALUE self, VALUE i)
 {
     return CSTR2RVAL(atk_action_get_description(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatk_action_get_name(VALUE self, VALUE i)
+rg_get_name(VALUE self, VALUE i)
 {
     return CSTR2RVAL(atk_action_get_name(_SELF(self), NUM2INT(i)));
 }
 
 #ifdef HAVE_ATK_ACTION_GET_LOCALIZED_NAME
 static VALUE
-rbatk_action_get_localized_name(VALUE self, VALUE i)
+rg_get_localized_name(VALUE self, VALUE i)
 {
     return CSTR2RVAL(atk_action_get_localized_name(_SELF(self), NUM2INT(i)));
 }
 #endif
 
 static VALUE
-rbatk_action_get_keybinding(VALUE self, VALUE i)
+rg_get_keybinding(VALUE self, VALUE i)
 {
     return CSTR2RVAL(atk_action_get_keybinding(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatk_action_set_description(VALUE self, VALUE i, VALUE desc)
+rg_set_description(VALUE self, VALUE i, VALUE desc)
 {
     return CBOOL2RVAL(atk_action_set_description(_SELF(self), NUM2INT(i), RVAL2CSTR(desc)));
 }
 
 void
-Init_atk_action()
+Init_atk_action(VALUE mAtk)
 {
-    VALUE mAction = G_DEF_INTERFACE(ATK_TYPE_ACTION, "Action", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(ATK_TYPE_ACTION, "Action", mAtk);
 
-    rb_define_method(mAction, "do_action", rbatk_action_do_action, 1);
-    rb_define_method(mAction, "n_actions", rbatk_action_get_n_actions, 0);
-    rb_define_method(mAction, "get_description", rbatk_action_get_description, 1);
-    rb_define_method(mAction, "get_name", rbatk_action_get_name, 1);
+    RG_DEF_METHOD(do_action, 1);
+    RG_DEF_METHOD(n_actions, 0);
+    RG_DEF_METHOD(get_description, 1);
+    RG_DEF_METHOD(get_name, 1);
 #ifdef HAVE_ATK_ACTION_GET_LOCALIZED_NAME
-    rb_define_method(mAction, "get_localized_name", rbatk_action_get_localized_name, 1);
+    RG_DEF_METHOD(get_localized_name, 1);
 #endif
-    rb_define_method(mAction, "get_keybinding", rbatk_action_get_keybinding, 1);
-    rb_define_method(mAction, "set_description", rbatk_action_set_description, 2);
+    RG_DEF_METHOD(get_keybinding, 1);
+    RG_DEF_METHOD(set_description, 2);
 }

data/ext/atk/rbatkcomponent.c

@@ -1,17 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatkcomponent.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 02:51:52 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
-
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_COMPONENT(RVAL2GOBJ(s)))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  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 "rbatkprivate.h"
+
+#define RG_TARGET_NAMESPACE mComponent
+#define _SELF(s) (RVAL2ATKCOMPONENT(s))
 
 /*
 static void
@@ -21,7 +32,7 @@ focus_handler(AtkObject *aobj, gboolean bool)
                            GOBJ2RVAL(aobj), CBOOL2RVAL(bool));
 }
 static VALUE
-comp_add_focus_handler(VALUE self)
+rg_add_focus_handler(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -30,49 +41,49 @@ comp_add_focus_handler(VALUE self)
 */
 
 static VALUE
-comp_contains(VALUE self, VALUE x, VALUE y, VALUE coord_type)
+rg_contains_p(VALUE self, VALUE x, VALUE y, VALUE coord_type)
 {
     return CBOOL2RVAL(atk_component_contains(_SELF(self),
                                              NUM2INT(x), NUM2INT(y),
-                                             RVAL2GENUM(coord_type, ATK_TYPE_COORD_TYPE)));
+                                             RVAL2ATKCOORDTYPE(coord_type)));
 }
 
 static VALUE
-comp_get_extents(VALUE self, VALUE coord_type)
+rg_get_extents(VALUE self, VALUE coord_type)
 {
     gint x, y, width, height; 
     atk_component_get_extents(_SELF(self), &x, &y, &width, &height,
-                              RVAL2GENUM(coord_type, ATK_TYPE_COORD_TYPE));
+                              RVAL2ATKCOORDTYPE(coord_type));
     return rb_ary_new3(4, INT2NUM(x), INT2NUM(y), INT2NUM(width), INT2NUM(height));
 }
 
 #ifdef HAVE_ATK_COMPONENT_GET_LAYER
 static VALUE
-comp_get_layer(VALUE self)
+rg_layer(VALUE self)
 {
-    return GENUM2RVAL(atk_component_get_layer(_SELF(self)), ATK_TYPE_LAYER);
+    return ATKLAYER2RVAL(atk_component_get_layer(_SELF(self)));
 }
 #endif
 
 #ifdef HAVE_ATK_COMPONENT_GET_MDI_ZORDER
 static VALUE
-comp_get_mdi_zorder(VALUE self)
+rg_mdi_zorder(VALUE self)
 {
     return INT2NUM(atk_component_get_mdi_zorder(_SELF(self)));
 }
 
 #endif
 static VALUE
-comp_get_position(VALUE self, VALUE coord_type)
+rg_position(VALUE self, VALUE coord_type)
 {
     gint x, y;
     atk_component_get_position(_SELF(self), &x, &y,
-                               RVAL2GENUM(coord_type, ATK_TYPE_COORD_TYPE));
+                               RVAL2ATKCOORDTYPE(coord_type));
     return rb_assoc_new(INT2NUM(x), INT2NUM(y));
 }
 
 static VALUE
-comp_get_size(VALUE self)
+rg_size(VALUE self)
 {
     gint width, height;
     atk_component_get_size(_SELF(self), &width, &height);
@@ -80,50 +91,50 @@ comp_get_size(VALUE self)
 }
 
 static VALUE
-comp_grab_focus(VALUE self)
+rg_grab_focus(VALUE self)
 {
     return CBOOL2RVAL(atk_component_grab_focus(_SELF(self)));
 }
 
 static VALUE
-comp_ref_accessible_at_point(VALUE self, VALUE x, VALUE y, VALUE coord_type)
+rg_ref_accessible_at_point(VALUE self, VALUE x, VALUE y, VALUE coord_type)
 {
     return GOBJ2RVAL(atk_component_ref_accessible_at_point(
                          _SELF(self),
                          NUM2INT(x), NUM2INT(y),
-                         RVAL2GENUM(coord_type, ATK_TYPE_COORD_TYPE)));
+                         RVAL2ATKCOORDTYPE(coord_type)));
 }
 
 static VALUE
-comp_remove_focus_handler(VALUE self, VALUE handler_id)
+rg_remove_focus_handler(VALUE self, VALUE handler_id)
 {
     atk_component_remove_focus_handler(_SELF(self), NUM2UINT(handler_id));
     return self;
 }
 
 static VALUE
-comp_set_extents(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height, VALUE coord_type)
+rg_set_extents(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height, VALUE coord_type)
 {
     gboolean ret = atk_component_set_extents(_SELF(self),
                                              NUM2INT(x), NUM2INT(y),
                                              NUM2INT(width), NUM2INT(height),
-                                             RVAL2GENUM(coord_type, ATK_TYPE_COORD_TYPE));
+                                             RVAL2ATKCOORDTYPE(coord_type));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set extents");
     return self;
 }
 
 static VALUE
-comp_set_position(VALUE self, VALUE x, VALUE y, VALUE coord_type)
+rg_set_position(VALUE self, VALUE x, VALUE y, VALUE coord_type)
 {
     gboolean ret = atk_component_set_position(_SELF(self),
                                               NUM2INT(x), NUM2INT(y),
-                                              RVAL2GENUM(coord_type, ATK_TYPE_COORD_TYPE));
+                                              RVAL2ATKCOORDTYPE(coord_type));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set the position");
     return self;
 }
 
 static VALUE
-comp_set_size(VALUE self, VALUE width, VALUE height)
+rg_set_size(VALUE self, VALUE width, VALUE height)
 {
     gboolean ret = atk_component_set_size(_SELF(self),
                                           NUM2INT(width), NUM2INT(height));
@@ -133,36 +144,36 @@ comp_set_size(VALUE self, VALUE width, VALUE height)
 
 #if ATK_CHECK_VERSION(1,12,0)
 static VALUE
-comp_get_alpha(VALUE self)
+rg_alpha(VALUE self)
 {
     return rb_float_new(atk_component_get_alpha(_SELF(self)));
 }
 #endif
 
 void
-Init_atk_component()
+Init_atk_component(VALUE mAtk)
 {
-    VALUE comp = G_DEF_INTERFACE(ATK_TYPE_COMPONENT, "Component", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(ATK_TYPE_COMPONENT, "Component", mAtk);
 /*
-    rb_define_method(comp, "add_focus_handler", comp_add_focus_handler, 0);
+    RG_DEF_METHOD(add_focus_handler, 0);
 */
-    rb_define_method(comp, "contains?", comp_contains, 3);
-    rb_define_method(comp, "get_extents", comp_get_extents, 1);
+    RG_DEF_METHOD_P(contains, 3);
+    RG_DEF_METHOD(get_extents, 1);
 #ifdef HAVE_ATK_COMPONENT_GET_LAYER
-    rb_define_method(comp, "layer", comp_get_layer, 0);
+    RG_DEF_METHOD(layer, 0);
 #endif
 #ifdef HAVE_ATK_COMPONENT_GET_MDI_ZORDER
-    rb_define_method(comp, "mdi_zorder", comp_get_mdi_zorder, 0);
+    RG_DEF_METHOD(mdi_zorder, 0);
 #endif
-    rb_define_method(comp, "position", comp_get_position, 1);
-    rb_define_method(comp, "size", comp_get_size, 0);
-    rb_define_method(comp, "grab_focus", comp_grab_focus, 0);
-    rb_define_method(comp, "ref_accessible_at_point", comp_ref_accessible_at_point, 3);
-    rb_define_method(comp, "remove_focus_handler", comp_remove_focus_handler, 1);
-    rb_define_method(comp, "set_extents", comp_set_extents, 5);
-    rb_define_method(comp, "set_position", comp_set_position, 2);
-    rb_define_method(comp, "set_size", comp_set_size, 2);
+    RG_DEF_METHOD(position, 1);
+    RG_DEF_METHOD(size, 0);
+    RG_DEF_METHOD(grab_focus, 0);
+    RG_DEF_METHOD(ref_accessible_at_point, 3);
+    RG_DEF_METHOD(remove_focus_handler, 1);
+    RG_DEF_METHOD(set_extents, 5);
+    RG_DEF_METHOD(set_position, 2);
+    RG_DEF_METHOD(set_size, 2);
 #if ATK_CHECK_VERSION(1,12,0)
-    rb_define_method(comp, "alpha", comp_get_alpha, 0);
+    RG_DEF_METHOD(alpha, 0);
 #endif
 }