atk 1.0.3 → 1.1.0

data/ext/atk/rbatktextattribute.c

@@ -0,0 +1,54 @@
+/* -*- 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
+ */
+
+#include "rbatkprivate.h"
+
+#define RG_TARGET_NAMESPACE cAttribute
+
+static VALUE
+rg_s_type_register(G_GNUC_UNUSED VALUE self, VALUE name)
+{
+    return ATKTEXTATTRIBUTE2RVAL(atk_text_attribute_register(RVAL2CSTR(name)));
+}
+
+static VALUE
+rg_s_for_name(G_GNUC_UNUSED VALUE self, VALUE name)
+{
+    return ATKTEXTATTRIBUTE2RVAL(atk_text_attribute_for_name(RVAL2CSTR(name)));
+}
+
+static VALUE
+rg_get_value(VALUE self, VALUE index)
+{
+    return CSTR2RVAL(atk_text_attribute_get_value(RVAL2ATKTEXTATTRIBUTE(self), 
+                                                  NUM2INT(index)));
+}
+
+void
+Init_atk_text_attribute(VALUE mText)
+{
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_TEXT_ATTRIBUTE, "Attribute", mText);
+    G_DEF_CONSTANTS(mText, ATK_TYPE_TEXT_ATTRIBUTE, "ATK_TEXT_");
+
+    RG_DEF_SMETHOD(type_register, 1);
+    RG_DEF_SMETHOD(for_name, 1);
+    RG_DEF_METHOD(get_value, 1);   
+}

data/ext/atk/rbatktextrange.c

@@ -1,28 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  Masao Mutoh
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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
+ */
 
-  rbatktextrange.c -
-
-  $Author: sakai $
-  $Date: 2007/07/16 03:01:02 $
-
-  Copyright (C) 2004 Masao Mutoh
-
-  This file is derived from rbgdkrange.c.
-  rbgdkrange.c -
-  Copyright (C) 2002,2003 Masao Mutoh
-
-  rbgdkrange.c file is derived from rbgdkregion.c.
-  rbgdkregion.c -
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
-
-#include "rbatk.h"
+#include "rbatkprivate.h"
 
 #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
-#define _SELF(r) ((AtkTextRange*)RVAL2BOXED(r, ATK_TYPE_TEXT_RANGE))
+#define RG_TARGET_NAMESPACE cTextRange
+#define _SELF(r) (RVAL2ATKTEXTRANGE(r))
 
 /**********************************/
 static AtkTextRange*
@@ -39,7 +44,7 @@ GType
 atk_text_range_get_type(void)
 {
     static GType our_type = 0;
-                                                                                
+
     if (our_type == 0)
         our_type = g_boxed_type_register_static ("AtkTextRange",
                     (GBoxedCopyFunc)atk_text_range_copy,
@@ -49,39 +54,39 @@ atk_text_range_get_type(void)
 /**********************************/
 /* Struct accessors */
 static VALUE
-atktextrange_bounds(VALUE self)
+rg_bounds(VALUE self)
 {
-    return BOXED2RVAL(&_SELF(self)->bounds, ATK_TYPE_TEXT_RECTANGLE);
+    return ATKTEXTRECTANGLE2RVAL(&_SELF(self)->bounds);
 }
 
 static VALUE
-atktextrange_start_offset(VALUE self)
+rg_start_offset(VALUE self)
 {
     return INT2NUM(_SELF(self)->start_offset);
 }
 
 static VALUE
-atktextrange_end_offset(VALUE self)
+rg_end_offset(VALUE self)
 {
     return INT2NUM(_SELF(self)->end_offset);
 }
 
 static VALUE
-atktextrange_content(VALUE self)
+rg_content(VALUE self)
 {
     return CSTR2RVAL(_SELF(self)->content);
 }
 #endif
 
 void
-Init_atk_text_range()
+Init_atk_text_range(VALUE mAtk)
 {
 #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
-    VALUE range = G_DEF_CLASS(ATK_TYPE_TEXT_RANGE, "TextRange",  mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_TEXT_RANGE, "TextRange",  mAtk);
 
-    rb_define_method(range, "bounds", atktextrange_bounds, 0);
-    rb_define_method(range, "start_offset", atktextrange_start_offset, 0);
-    rb_define_method(range, "end_offset", atktextrange_end_offset, 0);
-    rb_define_method(range, "content", atktextrange_content, 0);
+    RG_DEF_METHOD(bounds, 0);
+    RG_DEF_METHOD(start_offset, 0);
+    RG_DEF_METHOD(end_offset, 0);
+    RG_DEF_METHOD(content, 0);
 #endif
 }

data/ext/atk/rbatktextrectangle.c

@@ -1,28 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatktextrectangle.c -
-
-  $Author: mutoh $
-  $Date: 2004/10/19 13:33:43 $
-
-  Copyright (C) 2004 Masao Mutoh
-
-  This file is derived from rbgdkrectangle.c.
-  rbgdkrectangle.c -
-  Copyright (C) 2002,2003 Masao Mutoh
-
-  rbgdkrectangle.c file is derived from rbgdkregion.c.
-  rbgdkregion.c -
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
-
-#include "rbatk.h"
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  Masao Mutoh
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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"
 
 #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
-#define _SELF(r) ((AtkTextRectangle*)RVAL2BOXED(r, ATK_TYPE_TEXT_RECTANGLE))
+#define RG_TARGET_NAMESPACE cTextRectangle
+#define _SELF(r) (RVAL2ATKTEXTRECTANGLE(r))
 
 /**********************************/
 static AtkTextRectangle*
@@ -39,7 +44,7 @@ GType
 atk_text_rectangle_get_type(void)
 {
     static GType our_type = 0;
-                                                                                
+
     if (our_type == 0)
         our_type = g_boxed_type_register_static ("AtkTextRectangle",
                     (GBoxedCopyFunc)atk_text_rectangle_copy,
@@ -49,7 +54,7 @@ atk_text_rectangle_get_type(void)
 /**********************************/
 
 static VALUE
-atktextrect_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
+rg_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     AtkTextRectangle new;
 
@@ -64,59 +69,59 @@ atktextrect_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 
 /* Struct accessors */
 static VALUE
-atktextrect_x(VALUE self)
+rg_x(VALUE self)
 {
     return INT2NUM(_SELF(self)->x);
 }
 
 static VALUE
-atktextrect_y(VALUE self)
+rg_y(VALUE self)
 {
     return INT2NUM(_SELF(self)->y);
 }
 
 static VALUE
-atktextrect_w(VALUE self)
+rg_width(VALUE self)
 {
     return INT2NUM(_SELF(self)->width);
 }
 
 static VALUE
-atktextrect_h(VALUE self)
+rg_height(VALUE self)
 {
     return INT2NUM(_SELF(self)->height);
 }
 
 static VALUE
-atktextrect_set_x(VALUE self, VALUE x)
+rg_set_x(VALUE self, VALUE x)
 {
     _SELF(self)->x = NUM2INT(x);
     return self;
 }
 
 static VALUE
-atktextrect_set_y(VALUE self, VALUE y)
+rg_set_y(VALUE self, VALUE y)
 {
     _SELF(self)->y = NUM2INT(y);
     return self;
 }
 
 static VALUE
-atktextrect_set_w(VALUE self, VALUE width)
+rg_set_width(VALUE self, VALUE width)
 {
     _SELF(self)->width = NUM2INT(width);
     return self;
 }
 
 static VALUE
-atktextrect_set_h(VALUE self, VALUE height)
+rg_set_height(VALUE self, VALUE height)
 {
     _SELF(self)->height = NUM2INT(height);
     return self;
 }
 
 static VALUE
-atktextrect_to_a(VALUE self)
+rg_to_a(VALUE self)
 {
   AtkTextRectangle* a = _SELF(self);
   return rb_ary_new3(4, INT2FIX(a->x), INT2FIX(a->y),
@@ -125,22 +130,22 @@ atktextrect_to_a(VALUE self)
 #endif
 
 void
-Init_atk_text_rectangle()
+Init_atk_text_rectangle(VALUE mAtk)
 {
 #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
-    VALUE rect = G_DEF_CLASS(ATK_TYPE_TEXT_RECTANGLE, "TextRectangle", mAtk);
-
-    rb_define_method(rect, "initialize", atktextrect_initialize, 4);
-    rb_define_method(rect, "x", atktextrect_x, 0);
-    rb_define_method(rect, "y", atktextrect_y, 0);
-    rb_define_method(rect, "width", atktextrect_w, 0);
-    rb_define_method(rect, "height", atktextrect_h, 0);
-    rb_define_method(rect, "set_x", atktextrect_set_x, 1);
-    rb_define_method(rect, "set_y", atktextrect_set_y, 1);
-    rb_define_method(rect, "set_width", atktextrect_set_w, 1);
-    rb_define_method(rect, "set_height", atktextrect_set_h, 1);
-    rb_define_method(rect, "to_a", atktextrect_to_a, 0);
-
-    G_DEF_SETTERS(rect);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_TEXT_RECTANGLE, "TextRectangle", mAtk);
+
+    RG_DEF_METHOD(initialize, 4);
+    RG_DEF_METHOD(x, 0);
+    RG_DEF_METHOD(y, 0);
+    RG_DEF_METHOD(width, 0);
+    RG_DEF_METHOD(height, 0);
+    RG_DEF_METHOD(set_x, 1);
+    RG_DEF_METHOD(set_y, 1);
+    RG_DEF_METHOD(set_width, 1);
+    RG_DEF_METHOD(set_height, 1);
+    RG_DEF_METHOD(to_a, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }

data/ext/atk/rbatkutil.c

@@ -1,16 +1,27 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatkutil.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 02:51:52 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
-
-#include "rbatk.h"
-
+/*
+ *  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 cUtil
 static ID id_call;
 
 /* How can I implement them?
@@ -26,9 +37,9 @@ void        atk_remove_global_event_listener
 */
 
 static VALUE
-rbatk_focus_tracker_notify(VALUE self, VALUE obj)
+rg_s_focus_tracker_notify(VALUE self, VALUE obj)
 {
-    atk_focus_tracker_notify(ATK_OBJECT(RVAL2GOBJ(obj)));
+    atk_focus_tracker_notify(RVAL2ATKOBJECT(obj));
     return self;
 }
 
@@ -44,7 +55,7 @@ key_snoop_func(AtkKeyEventStruct* event, gpointer func)
 }
 
 static VALUE
-rbatk_add_key_event_listener(VALUE self)
+rg_s_add_key_event_listener(VALUE self)
 {
     guint ret;
     VALUE func = rb_block_proc();
@@ -54,64 +65,62 @@ rbatk_add_key_event_listener(VALUE self)
 }
 
 static VALUE
-rbatk_remove_key_event_listener(VALUE self, VALUE id)
+rg_s_remove_key_event_listener(VALUE self, VALUE id)
 {
     atk_remove_key_event_listener(NUM2UINT(id));
     return self;
 }
 
 static VALUE
-rbatk_get_root(VALUE self)
+rg_s_root(G_GNUC_UNUSED VALUE self)
 {
     return GOBJ2RVAL(atk_get_root());
 }
 
 #if ATK_CHECK_VERSION(1,6,0)
 static VALUE
-rbatk_get_focus_object(VALUE self)
+rg_s_focus_object(G_GNUC_UNUSED VALUE self)
 {
     return GOBJ2RVAL(atk_get_focus_object());
 }
 #endif
 
 static VALUE
-rbatk_get_toolkit_name(VALUE self)
+rg_s_toolkit_name(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(atk_get_toolkit_name());
 }
 
 static VALUE
-rbatk_get_toolkit_version(VALUE self)
+rg_s_toolkit_version(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(atk_get_toolkit_version());
 }
 
 void
-Init_atk_util()
+Init_atk_util(VALUE mAtk)
 {
-    VALUE coord;
-
-    VALUE util = G_DEF_CLASS(ATK_TYPE_UTIL, "Util", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_UTIL, "Util", mAtk);
 
     id_call = rb_intern("call");
 
-    rb_define_singleton_method(util, "focus_tracker_notify", rbatk_focus_tracker_notify, 1);
-    rb_define_singleton_method(util, "add_key_event_listener", rbatk_add_key_event_listener, 0);
-    rb_define_singleton_method(util, "remove_key_event_listener", rbatk_remove_key_event_listener, 1);
+    RG_DEF_SMETHOD(focus_tracker_notify, 1);
+    RG_DEF_SMETHOD(add_key_event_listener, 0);
+    RG_DEF_SMETHOD(remove_key_event_listener, 1);
 
-    rb_define_singleton_method(util, "root", rbatk_get_root, 0);
+    RG_DEF_SMETHOD(root, 0);
 #if ATK_CHECK_VERSION(1,6,0)
-    rb_define_singleton_method(util, "focus_object", rbatk_get_focus_object, 0);
+    RG_DEF_SMETHOD(focus_object, 0);
 #endif
-    rb_define_singleton_method(util, "toolkit_name", rbatk_get_toolkit_name, 0);
-    rb_define_singleton_method(util, "toolkit_version", rbatk_get_toolkit_version, 0);
+    RG_DEF_SMETHOD(toolkit_name, 0);
+    RG_DEF_SMETHOD(toolkit_version, 0);
 
     /* AtkCoordType */
-    coord = G_DEF_CLASS(ATK_TYPE_COORD_TYPE, "CoordType", util);
-    G_DEF_CONSTANTS(util, ATK_TYPE_COORD_TYPE, "ATK_");
+    G_DEF_CLASS(ATK_TYPE_COORD_TYPE, "CoordType", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, ATK_TYPE_COORD_TYPE, "ATK_");
 
     /* AtkKeyEventType */
-    coord = G_DEF_CLASS(ATK_TYPE_KEY_EVENT_TYPE, "KeyEventType", util);
-    G_DEF_CONSTANTS(util, ATK_TYPE_KEY_EVENT_TYPE, "ATK_");
+    G_DEF_CLASS(ATK_TYPE_KEY_EVENT_TYPE, "KeyEventType", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, ATK_TYPE_KEY_EVENT_TYPE, "ATK_");
 
 }