2007-03-29 Ariel Rios <ariel@gnu.org>

[platform/core/uifw/at-spi2-atk.git] / libspi / relation.c

diff --git a/libspi/relation.c b/libspi/relation.c
index c955317..6d487d4 100644 (file)
--- a/libspi/relation.c
+++ b/libspi/relation.c
@@ -2,7 +2,8 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -24,6 +25,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <libspi/accessible.h>
 #include <libspi/relation.h>
 
 
@@ -33,7 +35,7 @@ spi_init_relation_type_table (Accessibility_RelationType *types)
   gint i;
 
   for (i = 0; i < ATK_RELATION_LAST_DEFINED; i++)
-    types[i] = ATK_RELATION_NULL;
+    types[i] = Accessibility_RELATION_NULL;
 
   types[ATK_RELATION_CONTROLLED_BY] = Accessibility_RELATION_CONTROLLED_BY;
   types[ATK_RELATION_CONTROLLER_FOR] = Accessibility_RELATION_CONTROLLER_FOR;
@@ -41,6 +43,16 @@ spi_init_relation_type_table (Accessibility_RelationType *types)
   types[ATK_RELATION_LABELLED_BY] = Accessibility_RELATION_LABELLED_BY;
   types[ATK_RELATION_MEMBER_OF] = Accessibility_RELATION_MEMBER_OF;
   types[ATK_RELATION_NODE_CHILD_OF] = Accessibility_RELATION_NODE_CHILD_OF;
+  types[ATK_RELATION_FLOWS_TO] = Accessibility_RELATION_FLOWS_TO;
+  types[ATK_RELATION_FLOWS_FROM] = Accessibility_RELATION_FLOWS_FROM;
+  types[ATK_RELATION_SUBWINDOW_OF] = Accessibility_RELATION_SUBWINDOW_OF;
+  types[ATK_RELATION_EMBEDS] = Accessibility_RELATION_EMBEDS;
+  types[ATK_RELATION_EMBEDDED_BY] = Accessibility_RELATION_EMBEDDED_BY;
+  types[ATK_RELATION_POPUP_FOR] = Accessibility_RELATION_POPUP_FOR;
+  types[ATK_RELATION_PARENT_WINDOW_OF] = Accessibility_RELATION_PARENT_WINDOW_OF;
+  types[ATK_RELATION_DESCRIPTION_FOR] = Accessibility_RELATION_DESCRIPTION_FOR;
+  types[ATK_RELATION_DESCRIBED_BY] = Accessibility_RELATION_DESCRIBED_BY;
+
   return TRUE;
 }
 
@@ -83,21 +95,21 @@ impl_getRelationType (PortableServer_Servant servant,
   AtkRelation *relation = get_relation_from_servant (servant);
   AtkRelationType type;
 
-  g_return_val_if_fail (relation, 0);
+  g_return_val_if_fail (relation != NULL, 0);
   type = atk_relation_get_relation_type (relation);
   return spi_relation_type_from_atk_relation_type (type);
 }
 
 
-
 static CORBA_short
 impl_getNTargets (PortableServer_Servant servant,
                  CORBA_Environment * ev)
 {
   AtkRelation *relation = get_relation_from_servant(servant);
-  g_return_val_if_fail (relation, 0);
-}
+  g_return_val_if_fail (relation != NULL, 0);
 
+  return relation->target ? relation->target->len : 0;
+}
 
 
 static CORBA_Object
@@ -105,10 +117,21 @@ impl_getTarget (PortableServer_Servant servant,
                const CORBA_short index,
                CORBA_Environment * ev)
 {
+  AtkObject *atk_object;
   AtkRelation *relation = get_relation_from_servant (servant);
   g_return_val_if_fail (relation, NULL);
-}
 
+  if (!relation->target ||
+      index < 0 ||
+      index >= relation->target->len)
+    return CORBA_OBJECT_NIL;
+
+  atk_object = g_ptr_array_index (relation->target, index);
+  if (!atk_object)
+    return CORBA_OBJECT_NIL;
+
+  return spi_accessible_new_return (atk_object, FALSE, ev);
+}
 
 
 SpiRelation *
@@ -140,4 +163,4 @@ spi_relation_init (SpiRelation *relation)
 BONOBO_TYPE_FUNC_FULL (SpiRelation,
                       Accessibility_Relation,
                       SPI_TYPE_BASE,
-                      spi_relation);
+                      spi_relation)