atk 1.0.3 → 1.1.0

data/ext/atk/rbatkobjectfactory.c

@@ -1,41 +1,53 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatkobjectfactory.c -
-
-  $Author: mutoh $
-  $Date: 2003/12/07 18:12:33 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_OBJECT_FACTORY(RVAL2GOBJ(s)))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  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 cObjectFactory
+#define _SELF(s) (RVAL2ATKOBJECTFACTORY(s))
 
 static VALUE
-rbatkfact_create_accessible(VALUE self, VALUE obj)
+rg_create_accessible(VALUE self, VALUE obj)
 {
     return GOBJ2RVAL(atk_object_factory_create_accessible(_SELF(self), RVAL2GOBJ(obj)));
 }
 
 static VALUE
-rbatkfact_get_accessible_type(VALUE self)
+rg_accessible_type(VALUE self)
 {
     return GTYPE2CLASS(atk_object_factory_get_accessible_type(_SELF(self)));
 }
 
 static VALUE
-rbatkfact_invalidate(VALUE self)
+rg_invalidate(VALUE self)
 {
     atk_object_factory_invalidate(_SELF(self));
     return self;
 }
 
 void
-Init_atk_objectfactory()
+Init_atk_objectfactory(VALUE mAtk)
 {
-    VALUE fact = G_DEF_CLASS(ATK_TYPE_OBJECT_FACTORY, "ObjectFactory", mAtk);
-    rb_define_method(fact, "create_accessible", rbatkfact_create_accessible, 0);
-    rb_define_method(fact, "accessible_type", rbatkfact_get_accessible_type, 0);
-    rb_define_method(fact, "invalidate", rbatkfact_invalidate, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_OBJECT_FACTORY, "ObjectFactory", mAtk);
+    RG_DEF_METHOD(create_accessible, 0);
+    RG_DEF_METHOD(accessible_type, 0);
+    RG_DEF_METHOD(invalidate, 0);
 }

data/ext/atk/rbatkobjectrole.c

@@ -0,0 +1,50 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  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 "rbatkprivate.h"
+
+#define RG_TARGET_NAMESPACE cRole
+
+static VALUE
+rg_localized_name(G_GNUC_UNUSED VALUE self)
+{
+#ifdef HAVE_ATK_ROLE_GET_LOCALIZED_NAME
+    return CSTR2RVAL(atk_role_get_localized_name(RVAL2ATKROLE(self)));
+#else
+    rb_warning("not supported in this version of ATK.");
+    return Qnil;
+#endif
+}
+
+static VALUE
+rg_s_for_name(G_GNUC_UNUSED VALUE self, VALUE name)
+{
+    return ATKROLE2RVAL(atk_role_for_name(RVAL2CSTR(name)));
+}
+
+void
+Init_atk_object_role(VALUE cObject)
+{
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_ROLE, "Role", cObject);
+    RG_DEF_METHOD(localized_name, 0);
+    RG_DEF_SMETHOD(for_name, 1);
+    G_DEF_CONSTANTS(cObject, ATK_TYPE_ROLE, "ATK_");
+}

data/ext/atk/rbatkprivate.h

@@ -0,0 +1,48 @@
+#ifndef RB_ATK_PRIVATE_H
+#define RB_ATK_PRIVATE_H
+
+#include "rbatk.h"
+
+#ifndef HAVE_RB_ERRINFO
+#  define rb_errinfo() (ruby_errinfo)
+#endif
+
+#ifndef G_VALUE_INIT
+#  define G_VALUE_INIT { 0, { { 0 } } }
+#endif
+
+G_BEGIN_DECLS
+
+G_GNUC_INTERNAL void Init_atk_action(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_component(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_document(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_editabletext(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_gobjectaccessible(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_hyperlink(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_hypertext(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_image(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_implementor(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_noopobject(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_noopobjectfactory(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_object(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_object_role(VALUE cObject);
+G_GNUC_INTERNAL void Init_atk_objectfactory(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_registry(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_relation(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_relation_type(VALUE cRelation);
+G_GNUC_INTERNAL void Init_atk_relation_set(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_selection(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_state(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_state_set(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_streamable_content(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_table(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_text(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_text_attribute(VALUE mText);
+G_GNUC_INTERNAL void Init_atk_text_range(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_text_rectangle(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_util(VALUE mAtk);
+G_GNUC_INTERNAL void Init_atk_value(VALUE mAtk);
+
+G_END_DECLS
+
+#endif /* RB_ATK_PRIVATE_H */

data/ext/atk/rbatkregistry.c

@@ -1,19 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatkregistry.c -
-
-  $Author: mutoh $
-  $Date: 2003/12/07 18:12:33 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_REGISTRY(RVAL2GOBJ(s)))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  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 cRegistry
+#define _SELF(s) (RVAL2ATKREGISTRY(s))
 
 static VALUE
-rbatkregistry_set_factory_type(VALUE self, VALUE type, VALUE factory_type)
+rg_set_factory_type(VALUE self, VALUE type, VALUE factory_type)
 {
     atk_registry_set_factory_type(_SELF(self),
                                   CLASS2GTYPE(type),
@@ -22,30 +34,30 @@ rbatkregistry_set_factory_type(VALUE self, VALUE type, VALUE factory_type)
 }
 
 static VALUE
-rbatkregistry_get_factory_type(VALUE self, VALUE type)
+rg_get_factory_type(VALUE self, VALUE type)
 {
     return GTYPE2CLASS(atk_registry_get_factory_type(_SELF(self), CLASS2GTYPE(type)));
 }
 
 static VALUE
-rbatkregistry_get_factory(VALUE self, VALUE type)
+rg_get_factory(VALUE self, VALUE type)
 {
     return GOBJ2RVAL(atk_registry_get_factory(_SELF(self),
                                               CLASS2GTYPE(type)));
 }
 
 static VALUE
-rbatkregistry_s_get_default_registry(VALUE self)
+rg_s_default_registry(G_GNUC_UNUSED VALUE self)
 {
     return GOBJ2RVAL(atk_get_default_registry());
 }
 
 void
-Init_atk_registry()
+Init_atk_registry(VALUE mAtk)
 {
-    VALUE registry = G_DEF_CLASS(ATK_TYPE_REGISTRY, "Registry", mAtk);
-    rb_define_method(registry, "set_factory_type", rbatkregistry_set_factory_type, 2);
-    rb_define_method(registry, "get_factory_type", rbatkregistry_get_factory_type, 1);
-    rb_define_method(registry, "get_factory", rbatkregistry_get_factory, 1);
-    rb_define_singleton_method(registry, "default_registry", rbatkregistry_s_get_default_registry, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_REGISTRY, "Registry", mAtk);
+    RG_DEF_METHOD(set_factory_type, 2);
+    RG_DEF_METHOD(get_factory_type, 1);
+    RG_DEF_METHOD(get_factory, 1);
+    RG_DEF_SMETHOD(default_registry, 0);
 }

data/ext/atk/rbatkrelation.c

@@ -1,77 +1,102 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatkrelation.c -
-
-  $Author: mutoh $
-  $Date: 2005/09/15 17:30:46 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_RELATION(RVAL2GOBJ(s)))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  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 cRelation
+#define _SELF(s) (RVAL2ATKRELATION(s))
 
 static VALUE
-rbatkrel_s_type_register(VALUE self, VALUE name)
+rg_s_type_register(G_GNUC_UNUSED VALUE self, VALUE name)
 {
-    return GENUM2RVAL(atk_relation_type_register(RVAL2CSTR(name)), ATK_TYPE_RELATION_TYPE);
+    return ATKRELATIONTYPE2RVAL(atk_relation_type_register(RVAL2CSTR(name)));
 }
 
-/* We don't need them
-G_CONST_RETURN gchar* atk_relation_type_get_name
-                                            (AtkRelationType type);
-*/
+struct rval2atkobjects_args {
+    VALUE ary;
+    long n;
+    AtkObject **result;
+};
 
 static VALUE
-rbatkrelation_s_for_name(VALUE self, VALUE name)
+rval2atkobjects_body(VALUE value)
 {
-    return GENUM2RVAL(atk_relation_type_for_name(RVAL2CSTR(name)), ATK_TYPE_RELATION_TYPE);
+    long i;
+    struct rval2atkobjects_args *args = (struct rval2atkobjects_args *)value;
+
+    for (i = 0; i < args->n; i++)
+            args->result[i] = RVAL2ATKOBJECT(RARRAY_PTR(args->ary)[i]);
+
+    return Qnil;
 }
 
+static G_GNUC_NORETURN VALUE
+rval2atkobjects_rescue(VALUE value)
+{
+    g_free(((struct rval2atkobjects_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
 
 static VALUE
-rbatkrel_initialize(VALUE self, VALUE targets, VALUE relationship)
+rg_initialize(VALUE self, VALUE targets, VALUE rbrelationship)
 {
-    VALUE ary = rb_ary_to_ary(targets);
-    long i;
-    long len = RARRAY_LEN(ary);
-    AtkObject **objects = g_new(AtkObject *, len);
+    AtkRelationType relationship = RVAL2ATKRELATIONTYPE(rbrelationship);
+    struct rval2atkobjects_args args;
+    AtkRelation *relation;
+
+    args.ary = rb_ary_to_ary(targets);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_new(AtkObject *, args.n + 1);
+
+    rb_rescue(rval2atkobjects_body, (VALUE)&args,
+              rval2atkobjects_rescue, (VALUE)&args);
 
-    for (i = 0; i < len; i++)
-        objects[i] = RVAL2ATKOBJECT(RARRAY_PTR(targets)[i]);
+    relation = atk_relation_new(args.result, args.n, relationship);
 
-    G_INITIALIZE(self, atk_relation_new(objects,
-                                        len, 
-                                        RVAL2GENUM(relationship, ATK_TYPE_RELATION_TYPE)));
+    g_free(args.result);
 
-    g_free(objects);
+    G_INITIALIZE(self, relation);
 
     return Qnil;
 }
 
 #if ATK_CHECK_VERSION(1,9,0)
 static VALUE
-rbatkrel_add_target(VALUE self, VALUE obj)
+rg_add_target(VALUE self, VALUE obj)
 {
-    atk_relation_add_target(_SELF(self), ATK_OBJECT(RVAL2GOBJ(obj)));
+    atk_relation_add_target(_SELF(self), RVAL2ATKOBJECT(obj));
     return self;
 }
 #endif
 
 void
-Init_atk_relation()
+Init_atk_relation(VALUE mAtk)
 {
-    VALUE rel = G_DEF_CLASS(ATK_TYPE_RELATION, "Relation", mAtk);
-    VALUE type;
-    rb_define_singleton_method(rel, "type_register", rbatkrel_s_type_register, 1);
-    rb_define_method(rel, "initialize", rbatkrel_initialize, 2);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_RELATION, "Relation", mAtk);
+    RG_DEF_SMETHOD(type_register, 1);
+    RG_DEF_METHOD(initialize, 2);
 #if ATK_CHECK_VERSION(1,9,0)
-    rb_define_method(rel, "add_target", rbatkrel_add_target, 1);
+    RG_DEF_METHOD(add_target, 1);
 #endif
 
-    /* AtkRelationType */
-    type = G_DEF_CLASS(ATK_TYPE_RELATION_TYPE, "Type", rel);
-    rb_define_singleton_method(type, "for_name", rbatkrelation_s_for_name, 1);
-    G_DEF_CONSTANTS(rel, ATK_TYPE_RELATION_TYPE, "ATK_");
+    Init_atk_relation_type(RG_TARGET_NAMESPACE);
 }

data/ext/atk/rbatkrelationset.c

@@ -1,59 +1,71 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  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
+ */
 
-  rbatkrelationset.c -
+#include "rbatkprivate.h"
 
-  $Author: mutoh $
-  $Date: 2005/09/15 17:30:46 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_RELATION_SET(RVAL2GOBJ(s)))
+#define RG_TARGET_NAMESPACE cRelationSet
+#define _SELF(s) (RVAL2ATKRELATIONSET(s))
 
 static VALUE
-rbatkrelset_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, atk_relation_set_new());
     return Qnil;
 }
 
 static VALUE
-rbatkrelset_contains(VALUE self, VALUE relationship)
+rg_contains_p(VALUE self, VALUE relationship)
 {
     return CBOOL2RVAL(atk_relation_set_contains(
                           _SELF(self),
-                          RVAL2GENUM(relationship, ATK_TYPE_RELATION_TYPE)));
+                          RVAL2ATKRELATIONTYPE(relationship)));
 }
 
 static VALUE
-rbatkrelset_remove(VALUE self, VALUE relation)
+rg_remove(VALUE self, VALUE relation)
 {
-    atk_relation_set_remove(_SELF(self), ATK_RELATION(RVAL2GOBJ(relation)));
+    atk_relation_set_remove(_SELF(self), RVAL2ATKRELATION(relation));
     return self;
 }
 
 static VALUE
-rbatkrelset_add(VALUE self, VALUE relation)
+rg_add(VALUE self, VALUE relation)
 {
-    atk_relation_set_add(_SELF(self), ATK_RELATION(RVAL2GOBJ(relation)));
+    atk_relation_set_add(_SELF(self), RVAL2ATKRELATION(relation));
     return self;
 }
 
 static VALUE
-rbatkrelset_get_n_relations(VALUE self)
+rg_n_relations(VALUE self)
 {
     return INT2NUM(atk_relation_set_get_n_relations(_SELF(self)));
 }
 
 static VALUE
-rbatkrelset_get_relation(VALUE self, VALUE i)
+rg_get_relation(VALUE self, VALUE i)
 {
     if (rb_obj_is_kind_of(i, GTYPE2CLASS(ATK_TYPE_RELATION_TYPE))){
         return GOBJ2RVAL(atk_relation_set_get_relation_by_type(
                              _SELF(self),
-                             RVAL2GENUM(i, ATK_TYPE_RELATION_TYPE)));
+                             RVAL2ATKRELATIONTYPE(i)));
     } else {
         return GOBJ2RVAL(atk_relation_set_get_relation(_SELF(self), NUM2INT(i)));
     }
@@ -61,27 +73,27 @@ rbatkrelset_get_relation(VALUE self, VALUE i)
 
 #if ATK_CHECK_VERSION(1,9,0)
 static VALUE
-rbatkrelset_add_relation(VALUE self, VALUE relationship, VALUE obj)
+rg_add_relation(VALUE self, VALUE relationship, VALUE obj)
 {
     atk_relation_set_add_relation_by_type(_SELF(self), 
-                                          RVAL2GENUM(relationship, ATK_TYPE_RELATION_TYPE), 
-                                          ATK_OBJECT(RVAL2GOBJ(obj)));
+                                          RVAL2ATKRELATIONTYPE(relationship), 
+                                          RVAL2ATKOBJECT(obj));
     return self;
 }
 #endif
 
 void
-Init_atk_relation_set()
+Init_atk_relation_set(VALUE mAtk)
 {
-    VALUE rel = G_DEF_CLASS(ATK_TYPE_RELATION_SET, "RelationSet", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_RELATION_SET, "RelationSet", mAtk);
 
-    rb_define_method(rel, "initialize", rbatkrelset_initialize, 0);
-    rb_define_method(rel, "contains?", rbatkrelset_contains, 1);
-    rb_define_method(rel, "remove", rbatkrelset_remove, 1);
-    rb_define_method(rel, "add", rbatkrelset_add, 1);
-    rb_define_method(rel, "n_relations", rbatkrelset_get_n_relations, 0);
-    rb_define_method(rel, "get_relation", rbatkrelset_get_relation, 1);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD_P(contains, 1);
+    RG_DEF_METHOD(remove, 1);
+    RG_DEF_METHOD(add, 1);
+    RG_DEF_METHOD(n_relations, 0);
+    RG_DEF_METHOD(get_relation, 1);
 #if ATK_CHECK_VERSION(1,9,0)
-    rb_define_method(rel, "add_relation", rbatkrelset_add_relation, 2);
+    RG_DEF_METHOD(add_relation, 2);
 #endif
 }