atk 1.0.3 → 1.1.0

data/ext/atk/rbatkconversions.h

@@ -0,0 +1,70 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *
+ *  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
+ */
+
+#ifndef __RBATKCONVERSIONS_H__
+#define __RBATKCONVERSIONS_H__
+
+#define RVAL2ATKACTION(o)                  (ATK_ACTION(RVAL2GOBJ(o)))
+#define RVAL2ATKCOMPONENT(o)               (ATK_COMPONENT(RVAL2GOBJ(o)))
+#define RVAL2ATKDOCUMENT(o)                (ATK_DOCUMENT(RVAL2GOBJ(o)))
+#define RVAL2ATKEDITABLETEXT(o)            (ATK_EDITABLE_TEXT(RVAL2GOBJ(o)))
+#define RVAL2ATKGOBJECTACCESSIBLE(o)       (ATK_GOBJECT_ACCESSIBLE(RVAL2GOBJ(o)))
+#define RVAL2ATKHYPERLINK(o)               (ATK_HYPERLINK(RVAL2GOBJ(o)))
+#define RVAL2ATKHYPERTEXT(o)               (ATK_HYPERTEXT(RVAL2GOBJ(o)))
+#define RVAL2ATKIMAGE(o)                   (ATK_IMAGE(RVAL2GOBJ(o)))
+#define RVAL2ATKIMPLEMENTOR(o)             (ATK_IMPLEMENTOR(RVAL2GOBJ(o)))
+#define RVAL2ATKNOOPOBJECT(o)              (ATK_NOOPOBJECT(RVAL2GOBJ(o)))
+#define RVAL2ATKNOOPOBJECTFACTORY(o)       (ATK_NO_OP_OBJECT_FACTORY(RVAL2GOBJ(o)))
+#define RVAL2ATKOBJECT(o)                  (ATK_OBJECT(RVAL2GOBJ(o)))
+#define RVAL2ATKOBJECTFACTORY(o)           (ATK_OBJECT_FACTORY(RVAL2GOBJ(o)))
+#define RVAL2ATKREGISTRY(o)                (ATK_REGISTRY(RVAL2GOBJ(o)))
+#define RVAL2ATKRELATION(o)                (ATK_RELATION(RVAL2GOBJ(o)))
+#define RVAL2ATKRELATIONSET(o)             (ATK_RELATION_SET(RVAL2GOBJ(o)))
+#define RVAL2ATKSELECTION(o)               (ATK_SELECTION(RVAL2GOBJ(o)))
+#define RVAL2ATKSTATE(o)                   (ATK_STATE(RVAL2GOBJ(o)))
+#define RVAL2ATKSTATESET(o)                (ATK_STATE_SET(RVAL2GOBJ(o)))
+#define RVAL2ATKSTREAMABLECONTENT(o)       (ATK_STREAMABLE_CONTENT(RVAL2GOBJ(o)))
+#define RVAL2ATKTABLE(o)                   (ATK_TABLE(RVAL2GOBJ(o)))
+#define RVAL2ATKTEXT(o)                    (ATK_TEXT(RVAL2GOBJ(o)))
+#define RVAL2ATKVALUE(o)                   (ATK_VALUE(RVAL2GOBJ(o)))
+
+#define RVAL2ATKTEXTRANGE(o)               ((AtkTextRange*)RVAL2BOXED(o, ATK_TYPE_TEXT_RANGE))
+#define ATKTEXTRANGE2RVAL(o)               (BOXED2RVAL(o, ATK_TYPE_TEXT_RANGE))
+#define RVAL2ATKTEXTRECTANGLE(o)           ((AtkTextRectangle*)RVAL2BOXED(o, ATK_TYPE_TEXT_RECTANGLE))
+#define ATKTEXTRECTANGLE2RVAL(o)           (BOXED2RVAL(o, ATK_TYPE_TEXT_RECTANGLE))
+
+#define RVAL2ATKCOORDTYPE(o)               (RVAL2GENUM(o, ATK_TYPE_COORD_TYPE))
+#define ATKCOORDTYPE2RVAL(o)               (GENUM2RVAL(o, ATK_TYPE_COORD_TYPE))
+#define RVAL2ATKLAYER(o)                   (RVAL2GENUM(o, ATK_TYPE_LAYER))
+#define ATKLAYER2RVAL(o)                   (GENUM2RVAL(o, ATK_TYPE_LAYER))
+#define RVAL2ATKRELATIONTYPE(o)            (RVAL2GENUM(o, ATK_TYPE_RELATION_TYPE))
+#define ATKRELATIONTYPE2RVAL(o)            (GENUM2RVAL(o, ATK_TYPE_RELATION_TYPE))
+#define RVAL2ATKROLE(o)                    (RVAL2GENUM(o, ATK_TYPE_ROLE))
+#define ATKROLE2RVAL(o)                    (GENUM2RVAL(o, ATK_TYPE_ROLE))
+#define RVAL2ATKSTATETYPE(o)               (RVAL2GENUM(o, ATK_TYPE_STATE_TYPE))
+#define ATKSTATETYPE2RVAL(o)               (GENUM2RVAL(o, ATK_TYPE_STATE_TYPE))
+#define RVAL2ATKTEXTATTRIBUTE(o)           (RVAL2GENUM(o, ATK_TYPE_TEXT_ATTRIBUTE))
+#define ATKTEXTATTRIBUTE2RVAL(o)           (GENUM2RVAL(o, ATK_TYPE_TEXT_ATTRIBUTE))
+#define RVAL2ATKTEXTBOUNDARY(o)            (RVAL2GENUM(o, ATK_TYPE_TEXT_BOUNDARY))
+#define ATKTEXTBOUNDARY2RVAL(o)            (GENUM2RVAL(o, ATK_TYPE_TEXT_BOUNDARY))
+#define RVAL2ATKTEXTCLIPTYPE(o)            (RVAL2GENUM(o, ATK_TYPE_TEXT_CLIP_TYPE))
+#define ATKTEXTCLIPTYPE2RVAL(o)            (GENUM2RVAL(o, ATK_TYPE_TEXT_CLIP_TYPE))
+
+#endif /* __RBATKCONVERSIONS_H__ */

data/ext/atk/rbatkdocument.c

@@ -1,20 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatkdocument.c -
-
-  $Author: sakai $
-  $Date: 2007/06/16 09:18:55 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
+/*
+ *  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 "rbatk.h"
+#include "rbatkprivate.h"
 
-#define _SELF(s) (ATK_DOCUMENT(RVAL2GOBJ(s)))
+#define RG_TARGET_NAMESPACE mDocument
+#define _SELF(s) (RVAL2ATKDOCUMENT(s))
 
 static VALUE
-rbatk_document_get_document_type(VALUE self)
+rg_document_type(VALUE self)
 {
     return CSTR2RVAL(atk_document_get_document_type(_SELF(self)));
 }
@@ -22,7 +33,7 @@ rbatk_document_get_document_type(VALUE self)
 /*
 How can I implement this?
 static VALUE
-rbatk_document_get_document(VALUE self)
+rg_document(VALUE self)
 {
     return GOBJ2RVAL(atk_document_get_document(_SELF(self)));
 }
@@ -30,14 +41,14 @@ rbatk_document_get_document(VALUE self)
 
 #if ATK_CHECK_VERSION(1,12,0)
 static VALUE
-rbatk_document_get_attribute_value(VALUE self, VALUE name)
+rg_get_attribute_value(VALUE self, VALUE name)
 {
     return CSTR2RVAL(atk_document_get_attribute_value(_SELF(self), 
                                                       RVAL2CSTR(name)));
 }
 
 static VALUE
-rbatk_document_set_attribute_value(VALUE self, VALUE name, VALUE value)
+rg_set_attribute_value(VALUE self, VALUE name, VALUE value)
 {
     gboolean ret = atk_document_set_attribute_value(_SELF(self),
                                                     RVAL2CSTR(name),
@@ -50,7 +61,7 @@ rbatk_document_set_attribute_value(VALUE self, VALUE name, VALUE value)
 }
 
 static VALUE
-rbatk_document_get_attributes(VALUE self)
+rg_attributes(VALUE self)
 {
     AtkAttributeSet* list = atk_document_get_attributes(_SELF(self));
     VALUE ary = rb_ary_new();
@@ -63,27 +74,27 @@ rbatk_document_get_attributes(VALUE self)
 }
 
 static VALUE
-rbatk_document_get_locale(VALUE self)
+rg_locale(VALUE self)
 {
     return CSTR2RVAL(atk_document_get_locale(_SELF(self)));
 }
 #endif
 
 void
-Init_atk_document()
+Init_atk_document(VALUE mAtk)
 {
-    VALUE mDoc = G_DEF_INTERFACE(ATK_TYPE_DOCUMENT, "Document", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(ATK_TYPE_DOCUMENT, "Document", mAtk);
 
-    rb_define_method(mDoc, "document_type", rbatk_document_get_document_type, 0);
+    RG_DEF_METHOD(document_type, 0);
 /*
-    rb_define_method(mDoc, "document", rbatk_document_get_document, 0);
+    RG_DEF_METHOD(document, 0);
 */
 #if ATK_CHECK_VERSION(1,12,0)
-    rb_define_method(mDoc, "get_attribute_value", rbatk_document_get_attribute_value, 1);
-    rb_define_alias(mDoc, "[]", "get_attribute_value");
-    rb_define_method(mDoc, "set_attribute_value", rbatk_document_set_attribute_value, 2);
-    rb_define_alias(mDoc, "[]=", "set_attribute_value");
-    rb_define_method(mDoc, "attributes", rbatk_document_get_attributes, 0);
-    rb_define_method(mDoc, "locale", rbatk_document_get_locale, 0);
+    RG_DEF_METHOD(get_attribute_value, 1);
+    RG_DEF_ALIAS("[]", "get_attribute_value");
+    RG_DEF_METHOD(set_attribute_value, 2);
+    RG_DEF_ALIAS("[]=", "set_attribute_value");
+    RG_DEF_METHOD(attributes, 0);
+    RG_DEF_METHOD(locale, 0);
 #endif
 }

data/ext/atk/rbatkeditabletext.c

@@ -1,47 +1,131 @@
 /* -*- 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
+ */
+
+#include "rbatkprivate.h"
+
+#define RG_TARGET_NAMESPACE mEditableText
+#define _SELF(s) (RVAL2ATKEDITABLETEXT(s))
+
+struct rval2atkattributegslist_args {
+    VALUE ary;
+    long n;
+    GSList *result;
+};
 
-  rbatkeditabletext.c -
+static VALUE
+rbatk_rval2atkattributegslist_body(VALUE value)
+{
+    long i;
+    struct rval2atkattributegslist_args *args = (struct rval2atkattributegslist_args *)value;
 
-  $Author: sakai $
-  $Date: 2007/06/16 09:24:04 $
+    for (i = 0; i < args->n; i++) {
+        VALUE ary = rb_ary_to_ary(RARRAY_PTR(args->ary)[i]);
+        AtkAttribute *attribute;
 
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-#include "rbatk.h"
+        if (RARRAY_LEN(ary) != 2)
+            rb_raise(rb_eArgError, "attribute %ld should be an array of length 2", i);
 
-#define _SELF(s) (ATK_EDITABLE_TEXT(RVAL2GOBJ(s)))
+        attribute = g_new(AtkAttribute, 1);
+        args->result = g_slist_append(args->result, attribute);
+        attribute->name = g_strdup(RVAL2CSTR(RARRAY_PTR(ary)[0]));
+        attribute->value = g_strdup(RVAL2CSTR(RARRAY_PTR(ary)[1]));
+    }
 
-static VALUE
-rbatk_edit_set_run_attributes(VALUE self, VALUE attributes, VALUE start_offset, VALUE end_offset)
+    return Qnil;
+}
+
+static void
+rbatk_atkattributegslist_free(GSList *list)
 {
-    long i;
-    gboolean ret;
-    AtkAttributeSet* list = NULL;
-                                                                                
-    if (NIL_P(attributes)) return Qfalse;
-
-    Check_Type(attributes, T_ARRAY);
-    for (i=0; i<RARRAY_LEN(attributes); i++) {
-        list = g_slist_append(list, RVAL2GOBJ(RARRAY_PTR(attributes)[i]));
+    GSList *p;
+
+    for (p = list; p != NULL; p = g_slist_next(p)) {
+        AtkAttribute *attribute = (AtkAttribute *)p->data;
+
+        g_free(attribute->value);
+        g_free(attribute->name);
+        g_free(attribute);
     }
 
-    ret = CBOOL2RVAL(atk_editable_text_set_run_attributes(
-                         _SELF(self), list,
-                         NUM2INT(start_offset), NUM2INT(end_offset)));
     g_slist_free(list);
-    return ret;
+}
+
+static G_GNUC_NORETURN VALUE
+rbatk_rval2atkattributegslist_rescue(VALUE value)
+{
+    rbatk_atkattributegslist_free(((struct rval2atkattributegslist_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static GSList *
+rbatk_rval2atkattributegslist(VALUE value)
+{
+    struct rval2atkattributegslist_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = NULL;
+
+    rb_rescue(rbatk_rval2atkattributegslist_body, (VALUE)&args,
+              rbatk_rval2atkattributegslist_rescue, (VALUE)&args);
+
+    return args.result;
+}
+
+#define RVAL2ATKATTRIBUTEGSLIST(value) rbatk_rval2atkattributegslist(value)
+
+static VALUE
+rg_set_run_attributes(VALUE self,
+                              VALUE attributes,
+                              VALUE rbstart_offset,
+                              VALUE rbend_offset)
+{
+    AtkEditableText *editable;
+    gint start_offset, end_offset;
+    AtkAttributeSet *list;
+    gboolean result;
+
+    if (NIL_P(attributes))
+        return Qfalse;
+
+    editable = _SELF(self);
+    start_offset = NUM2INT(rbstart_offset);
+    end_offset = NUM2INT(rbend_offset);
+    list = RVAL2ATKATTRIBUTEGSLIST(attributes);
+    result = atk_editable_text_set_run_attributes(editable, list, start_offset, end_offset);
+    rbatk_atkattributegslist_free(list);
+
+    return CBOOL2RVAL(result);
 }
 
 static VALUE
-rbatk_edit_set_text_contents(VALUE self, VALUE str)
+rg_set_text_contents(VALUE self, VALUE str)
 {
     atk_editable_text_set_text_contents(_SELF(self), RVAL2CSTR(str));
     return self;
 }
 
 static VALUE
-rbatk_edit_insert_text(VALUE self, VALUE str, VALUE position)
+rg_insert_text(VALUE self, VALUE str, VALUE position)
 {
     gint pos = NUM2INT(position);
 
@@ -51,45 +135,45 @@ rbatk_edit_insert_text(VALUE self, VALUE str, VALUE position)
 }
 
 static VALUE
-rbatk_edit_copy_text(VALUE self, VALUE start_pos, VALUE end_pos)
+rg_copy_text(VALUE self, VALUE start_pos, VALUE end_pos)
 {
     atk_editable_text_copy_text(_SELF(self), NUM2INT(start_pos), NUM2INT(end_pos));
     return self;
 }
 
 static VALUE
-rbatk_edit_cut_text(VALUE self, VALUE start_pos, VALUE end_pos)
+rg_cut_text(VALUE self, VALUE start_pos, VALUE end_pos)
 {
     atk_editable_text_cut_text(_SELF(self), NUM2INT(start_pos), NUM2INT(end_pos));
     return self;
 }
 
 static VALUE
-rbatk_edit_delete_text(VALUE self, VALUE start_pos, VALUE end_pos)
+rg_delete_text(VALUE self, VALUE start_pos, VALUE end_pos)
 {
     atk_editable_text_delete_text(_SELF(self), NUM2INT(start_pos), NUM2INT(end_pos));
     return self;
 }
 
 static VALUE
-rbatk_edit_paste_text(VALUE self, VALUE position)
+rg_paste_text(VALUE self, VALUE position)
 {
     atk_editable_text_paste_text(_SELF(self), NUM2INT(position));
     return self;
 }
 
 void
-Init_atk_editabletext()
+Init_atk_editabletext(VALUE mAtk)
 {
-    VALUE editable = G_DEF_INTERFACE(ATK_TYPE_EDITABLE_TEXT, "EditableText", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(ATK_TYPE_EDITABLE_TEXT, "EditableText", mAtk);
 
-   rb_define_method(editable, "set_run_attributes", rbatk_edit_set_run_attributes, 3);
-   rb_define_method(editable, "set_text_contents", rbatk_edit_set_text_contents, 1);
-   rb_define_method(editable, "insert_text", rbatk_edit_insert_text, 2);
-   rb_define_method(editable, "copy_text", rbatk_edit_copy_text, 2);
-   rb_define_method(editable, "cut_text", rbatk_edit_cut_text, 2);
-   rb_define_method(editable, "delete_text", rbatk_edit_delete_text, 2);
-   rb_define_method(editable, "paste_text", rbatk_edit_paste_text, 1);
+   RG_DEF_METHOD(set_run_attributes, 3);
+   RG_DEF_METHOD(set_text_contents, 1);
+   RG_DEF_METHOD(insert_text, 2);
+   RG_DEF_METHOD(copy_text, 2);
+   RG_DEF_METHOD(cut_text, 2);
+   RG_DEF_METHOD(delete_text, 2);
+   RG_DEF_METHOD(paste_text, 1);
 
-   G_DEF_SETTERS(editable);
+   G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/atk/rbatkgobjectaccessible.c

@@ -1,35 +1,46 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatkgobjectaccessible.c -
-
-  $Author: mutoh $
-  $Date: 2003/12/07 17:18:16 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_GOBJECT_ACCESSIBLE(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 cGObjectAccessible
+#define _SELF(s) (RVAL2ATKGOBJECTACCESSIBLE(s))
 
 static VALUE
-rbatk_gobjectaccessible_s_for_object(VALUE self, VALUE obj)
+rg_s_for_object(G_GNUC_UNUSED VALUE self, VALUE obj)
 {
     return GOBJ2RVAL(atk_gobject_accessible_for_object(RVAL2GOBJ(obj)));
 }
 
 static VALUE
-rbatk_gobjectaccessible_get_object(VALUE self)
+rg_object(VALUE self)
 {
     return GOBJ2RVAL(atk_gobject_accessible_get_object(_SELF(self)));
 }
 
 void
-Init_atk_gobjectaccessible()
+Init_atk_gobjectaccessible(VALUE mAtk)
 {
-    VALUE macc = G_DEF_CLASS(ATK_TYPE_GOBJECT_ACCESSIBLE, "GObjectAccessible", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_GOBJECT_ACCESSIBLE, "GObjectAccessible", mAtk);
 
-    rb_define_singleton_method(macc, "for_object", rbatk_gobjectaccessible_s_for_object, 1);
-    rb_define_method(macc, "object", rbatk_gobjectaccessible_get_object, 0);
+    RG_DEF_SMETHOD(for_object, 1);
+    RG_DEF_METHOD(object, 0);
 }