atk 0.90.7 → 0.90.8

data/ChangeLog

@@ -1,3 +1,16 @@
+2011-02-26  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/atk/extconf.rb: remove needless add_distcleanfile.
+	Patch by Vincent Carmona. Thanks!!!
+
+2011-02-05  Masaaki Aoyagi
+
+	* ext/atk/*.c: change to ANSI C style.
+
+2011-02-04  Masaaki Aoyagi
+
+	* ext/atk/rbatkstateset.c: fix declaration.
+
 2011-01-30  Kouhei Sutou  <kou@cozmixng.org>
 
 	* Rakefile, ext/atk/extconf.rb: share depended packages

data/ext/atk/extconf.rb

@@ -51,8 +51,6 @@ have_func('atk_text_clip_type_get_type', atk_header)
 
 have_func('atk_text_free_ranges', atk_header)
 
-add_distcleanfile("rbatkinits.c")
-
 make_version_header("ATK", package_id, ".")
 
 create_pkg_config_file("Ruby/ATK", package_id)

data/ext/atk/rbatkaction.c

@@ -14,52 +14,45 @@
 #define _SELF(s) (ATK_ACTION(RVAL2GOBJ(s)))
 
 static VALUE
-rbatk_action_do_action(self, i)
-    VALUE self, i;
+rbatk_action_do_action(VALUE self, VALUE i)
 {
     return CBOOL2RVAL(atk_action_do_action(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatk_action_get_n_actions(self)
-    VALUE self;
+rbatk_action_get_n_actions(VALUE self)
 {
     return INT2NUM(atk_action_get_n_actions(_SELF(self)));
 }
 
 static VALUE
-rbatk_action_get_description(self, i)
-    VALUE self, i;
+rbatk_action_get_description(VALUE self, VALUE i)
 {
     return CSTR2RVAL(atk_action_get_description(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatk_action_get_name(self, i)
-    VALUE self, i;
+rbatk_action_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(self, i)
-    VALUE self, i;
+rbatk_action_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(self, i)
-    VALUE self, i;
+rbatk_action_get_keybinding(VALUE self, VALUE i)
 {
     return CSTR2RVAL(atk_action_get_keybinding(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatk_action_set_description(self, i, desc)
-    VALUE self, i, desc;
+rbatk_action_set_description(VALUE self, VALUE i, VALUE desc)
 {
     return CBOOL2RVAL(atk_action_set_description(_SELF(self), NUM2INT(i), RVAL2CSTR(desc)));
 }

data/ext/atk/rbatkcomponent.c

@@ -15,16 +15,13 @@
 
 /*
 static void
-focus_handler(aobj, bool)
-    AtkObject* aobj;
-    gboolean bool;
+focus_handler(AtkObject *aobj, gboolean bool)
 {
     VALUE ret = rb_funcall((VALUE)func, id_call, 2,
                            GOBJ2RVAL(aobj), CBOOL2RVAL(bool));
 }
 static VALUE
-comp_add_focus_handler(self)
-     VALUE self;
+comp_add_focus_handler(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -33,8 +30,7 @@ comp_add_focus_handler(self)
 */
 
 static VALUE
-comp_contains(self, x, y, coord_type)
-    VALUE self, x, y, coord_type;
+comp_contains(VALUE self, VALUE x, VALUE y, VALUE coord_type)
 {
     return CBOOL2RVAL(atk_component_contains(_SELF(self),
                                              NUM2INT(x), NUM2INT(y),
@@ -42,8 +38,7 @@ comp_contains(self, x, y, coord_type)
 }
 
 static VALUE
-comp_get_extents(self, coord_type)
-    VALUE self, coord_type;
+comp_get_extents(VALUE self, VALUE coord_type)
 {
     gint x, y, width, height; 
     atk_component_get_extents(_SELF(self), &x, &y, &width, &height,
@@ -53,8 +48,7 @@ comp_get_extents(self, coord_type)
 
 #ifdef HAVE_ATK_COMPONENT_GET_LAYER
 static VALUE
-comp_get_layer(self)
-    VALUE self;
+comp_get_layer(VALUE self)
 {
     return GENUM2RVAL(atk_component_get_layer(_SELF(self)), ATK_TYPE_LAYER);
 }
@@ -62,16 +56,14 @@ comp_get_layer(self)
 
 #ifdef HAVE_ATK_COMPONENT_GET_MDI_ZORDER
 static VALUE
-comp_get_mdi_zorder(self)
-    VALUE self;
+comp_get_mdi_zorder(VALUE self)
 {
     return INT2NUM(atk_component_get_mdi_zorder(_SELF(self)));
 }
 
 #endif
 static VALUE
-comp_get_position(self, coord_type)
-    VALUE self, coord_type;
+comp_get_position(VALUE self, VALUE coord_type)
 {
     gint x, y;
     atk_component_get_position(_SELF(self), &x, &y,
@@ -80,8 +72,7 @@ comp_get_position(self, coord_type)
 }
 
 static VALUE
-comp_get_size(self)
-    VALUE self;
+comp_get_size(VALUE self)
 {
     gint width, height;
     atk_component_get_size(_SELF(self), &width, &height);
@@ -89,15 +80,13 @@ comp_get_size(self)
 }
 
 static VALUE
-comp_grab_focus(self)
-    VALUE self;
+comp_grab_focus(VALUE self)
 {
     return CBOOL2RVAL(atk_component_grab_focus(_SELF(self)));
 }
 
 static VALUE
-comp_ref_accessible_at_point(self, x, y, coord_type)
-    VALUE self, x, y, coord_type;
+comp_ref_accessible_at_point(VALUE self, VALUE x, VALUE y, VALUE coord_type)
 {
     return GOBJ2RVAL(atk_component_ref_accessible_at_point(
                          _SELF(self),
@@ -106,16 +95,14 @@ comp_ref_accessible_at_point(self, x, y, coord_type)
 }
 
 static VALUE
-comp_remove_focus_handler(self, handler_id)
-    VALUE self, handler_id;
+comp_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(self, x, y, width, height, coord_type)
-    VALUE self, x, y, width, height, coord_type;
+comp_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),
@@ -126,8 +113,7 @@ comp_set_extents(self, x, y, width, height, coord_type)
 }
 
 static VALUE
-comp_set_position(self, x, y, coord_type)
-    VALUE self, x, y, coord_type;
+comp_set_position(VALUE self, VALUE x, VALUE y, VALUE coord_type)
 {
     gboolean ret = atk_component_set_position(_SELF(self),
                                               NUM2INT(x), NUM2INT(y),
@@ -137,8 +123,7 @@ comp_set_position(self, x, y, coord_type)
 }
 
 static VALUE
-comp_set_size(self, width, height)
-    VALUE self, width, height;
+comp_set_size(VALUE self, VALUE width, VALUE height)
 {
     gboolean ret = atk_component_set_size(_SELF(self),
                                           NUM2INT(width), NUM2INT(height));
@@ -148,8 +133,7 @@ comp_set_size(self, width, height)
 
 #if ATK_CHECK_VERSION(1,12,0)
 static VALUE
-comp_get_alpha(self)
-    VALUE self;
+comp_get_alpha(VALUE self)
 {
     return rb_float_new(atk_component_get_alpha(_SELF(self)));
 }

data/ext/atk/rbatkdocument.c

@@ -14,8 +14,7 @@
 #define _SELF(s) (ATK_DOCUMENT(RVAL2GOBJ(s)))
 
 static VALUE
-rbatk_document_get_document_type(self)
-    VALUE self;
+rbatk_document_get_document_type(VALUE self)
 {
     return CSTR2RVAL(atk_document_get_document_type(_SELF(self)));
 }
@@ -23,8 +22,7 @@ rbatk_document_get_document_type(self)
 /*
 How can I implement this?
 static VALUE
-rbatk_document_get_document(self)
-    VALUE self;
+rbatk_document_get_document(VALUE self)
 {
     return GOBJ2RVAL(atk_document_get_document(_SELF(self)));
 }
@@ -32,16 +30,14 @@ rbatk_document_get_document(self)
 
 #if ATK_CHECK_VERSION(1,12,0)
 static VALUE
-rbatk_document_get_attribute_value(self, name)
-    VALUE self, name;
+rbatk_document_get_attribute_value(VALUE self, VALUE name)
 {
     return CSTR2RVAL(atk_document_get_attribute_value(_SELF(self), 
                                                       (const gchar*)RVAL2CSTR(name)));
 }
 
 static VALUE
-rbatk_document_set_attribute_value(self, name, value)
-    VALUE self, name, value;
+rbatk_document_set_attribute_value(VALUE self, VALUE name, VALUE value)
 {
     gboolean ret = atk_document_set_attribute_value(_SELF(self),
                                                     (const gchar*)RVAL2CSTR(name),
@@ -54,8 +50,7 @@ rbatk_document_set_attribute_value(self, name, value)
 }
 
 static VALUE
-rbatk_document_get_attributes(self)
-    VALUE self;
+rbatk_document_get_attributes(VALUE self)
 {
     AtkAttributeSet* list = atk_document_get_attributes(_SELF(self));
     VALUE ary = rb_ary_new();
@@ -68,8 +63,7 @@ rbatk_document_get_attributes(self)
 }
 
 static VALUE
-rbatk_document_get_locale(self)
-    VALUE self;
+rbatk_document_get_locale(VALUE self)
 {
     return CSTR2RVAL(atk_document_get_locale(_SELF(self)));
 }

data/ext/atk/rbatkeditabletext.c

@@ -13,8 +13,7 @@
 #define _SELF(s) (ATK_EDITABLE_TEXT(RVAL2GOBJ(s)))
 
 static VALUE
-rbatk_edit_set_run_attributes(self, attributes, start_offset, end_offset)
-     VALUE self, attributes, start_offset, end_offset;
+rbatk_edit_set_run_attributes(VALUE self, VALUE attributes, VALUE start_offset, VALUE end_offset)
 {
     long i;
     gboolean ret;
@@ -35,16 +34,14 @@ rbatk_edit_set_run_attributes(self, attributes, start_offset, end_offset)
 }
 
 static VALUE
-rbatk_edit_set_text_contents(self, str)
-    VALUE self, str;
+rbatk_edit_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(self, str, position)
-    VALUE self, str, position;
+rbatk_edit_insert_text(VALUE self, VALUE str, VALUE position)
 {
     gint pos = NUM2INT(position);
 
@@ -54,32 +51,28 @@ rbatk_edit_insert_text(self, str, position)
 }
 
 static VALUE
-rbatk_edit_copy_text(self, start_pos, end_pos)
-    VALUE self, start_pos, end_pos;
+rbatk_edit_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(self, start_pos, end_pos)
-    VALUE self, start_pos, end_pos;
+rbatk_edit_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(self, start_pos, end_pos)
-    VALUE self, start_pos, end_pos;
+rbatk_edit_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(self, position)
-    VALUE self, position;
+rbatk_edit_paste_text(VALUE self, VALUE position)
 {
     atk_editable_text_paste_text(_SELF(self), NUM2INT(position));
     return self;

data/ext/atk/rbatkgobjectaccessible.c

@@ -14,15 +14,13 @@
 #define _SELF(s) (ATK_GOBJECT_ACCESSIBLE(RVAL2GOBJ(s)))
 
 static VALUE
-rbatk_gobjectaccessible_s_for_object(self, obj)
-    VALUE self, obj;
+rbatk_gobjectaccessible_s_for_object(VALUE self, VALUE obj)
 {
     return GOBJ2RVAL(atk_gobject_accessible_for_object(RVAL2GOBJ(obj)));
 }
 
 static VALUE
-rbatk_gobjectaccessible_get_object(self)
-    VALUE self;
+rbatk_gobjectaccessible_get_object(VALUE self)
 {
     return GOBJ2RVAL(atk_gobject_accessible_get_object(_SELF(self)));
 }

data/ext/atk/rbatkhyperlink.c

@@ -13,60 +13,52 @@
 #define _SELF(s) (ATK_HYPERLINK(RVAL2GOBJ(s)))
 
 static VALUE
-rbatk_hl_get_uri(self, i)
-    VALUE self, i;
+rbatk_hl_get_uri(VALUE self, VALUE i)
 {
     return CSTR2RVAL(atk_hyperlink_get_uri(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatk_hl_get_object(self, i)
-    VALUE self, i;
+rbatk_hl_get_object(VALUE self, VALUE i)
 {
     return GOBJ2RVAL(atk_hyperlink_get_object(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatk_hl_get_end_index(self)
-    VALUE self;
+rbatk_hl_get_end_index(VALUE self)
 {
     return INT2NUM(atk_hyperlink_get_end_index(_SELF(self)));
 }
 
 static VALUE
-rbatk_hl_get_start_index(self)
-    VALUE self;
+rbatk_hl_get_start_index(VALUE self)
 {
     return INT2NUM(atk_hyperlink_get_start_index(_SELF(self)));
 }
 
 static VALUE
-rbatk_hl_is_valid(self)
-    VALUE self;
+rbatk_hl_is_valid(VALUE self)
 {
     return CBOOL2RVAL(atk_hyperlink_is_valid(_SELF(self)));
 }
 
 #ifdef HAVE_ATK_HYPERLINK_IS_INLINE
 static VALUE
-rbatk_hl_is_inline(self)
-    VALUE self;
+rbatk_hl_is_inline(VALUE self)
 {
     return CBOOL2RVAL(atk_hyperlink_is_inline(_SELF(self)));
 }
 #endif
 
 static VALUE
-rbatk_hl_get_n_anchors(self)
-    VALUE self;
+rbatk_hl_get_n_anchors(VALUE self)
 {
     return INT2NUM(atk_hyperlink_get_n_anchors(_SELF(self)));
 }
 
 #ifdef HAVE_ATK_HYPERLINK_IS_SELECTED_LINK
 static VALUE
-rbatk_hl_is_selected_link(self)
-    VALUE self;
+rbatk_hl_is_selected_link(VALUE self)
 {
     return CBOOL2RVAL(atk_hyperlink_is_selected_link(_SELF(self)));
 }

data/ext/atk/rbatkhypertext.c

@@ -13,22 +13,19 @@
 #define _SELF(s) (ATK_HYPERTEXT(RVAL2GOBJ(s)))
 
 static VALUE
-rbatk_ht_get_link(self, link_index)
-    VALUE self, link_index;
+rbatk_ht_get_link(VALUE self, VALUE link_index)
 {
     return GOBJ2RVAL(atk_hypertext_get_link(_SELF(self), NUM2INT(link_index)));
 }
 
 static VALUE
-rbatk_ht_get_n_links(self)
-    VALUE self;
+rbatk_ht_get_n_links(VALUE self)
 {
     return INT2NUM(atk_hypertext_get_n_links(_SELF(self)));
 }
 
 static VALUE
-rbatk_ht_get_link_index(self, char_index)
-    VALUE self, char_index;
+rbatk_ht_get_link_index(VALUE self, VALUE char_index)
 {
     return INT2NUM(atk_hypertext_get_link_index(_SELF(self), NUM2INT(char_index)));
 }