Support sending data with events

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / adaptors / component-adaptor.c

diff --git a/atk-adaptor/adaptors/component-adaptor.c b/atk-adaptor/adaptors/component-adaptor.c
index 3db9717..192a589 100644 (file)
--- a/atk-adaptor/adaptors/component-adaptor.c
+++ b/atk-adaptor/adaptors/component-adaptor.c
@@ -24,28 +24,27 @@
 
 #include <atk/atk.h>
 #include <droute/droute.h>
+#include "bridge.h"
 #include <string.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "object.h"
 #include "introspection.h"
 
 static DBusMessage *
-impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_Contains (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
   dbus_int32_t x, y;
   dbus_uint32_t coord_type;
-  DBusError error;
   dbus_bool_t retval;
   DBusMessage *reply;
 
   g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
                         droute_not_yet_handled_error (message));
 
-  dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
+      (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
        DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
@@ -69,15 +68,13 @@ impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
   dbus_int32_t x, y;
   dbus_uint32_t coord_type;
   DBusMessage *reply;
-  DBusError error;
   AtkObject *child;
 
   g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
                         droute_not_yet_handled_error (message));
 
-  dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
+      (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
        DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
@@ -86,7 +83,8 @@ impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
     atk_component_ref_accessible_at_point (component, x, y,
                                            (AtkCoordType) coord_type);
   reply = spi_object_return_reference (message, child);
-  g_object_unref (child);
+  if (child)
+    g_object_unref (child);
 
   return reply;
 }
@@ -95,16 +93,14 @@ static DBusMessage *
 impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
-  DBusError error;
   dbus_uint32_t coord_type;
   gint ix, iy, iwidth, iheight;
 
   g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
                         droute_not_yet_handled_error (message));
 
-  dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
+      (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
@@ -118,7 +114,6 @@ impl_GetPosition (DBusConnection * bus, DBusMessage * message,
                   void *user_data)
 {
   AtkComponent *component = (AtkComponent *) user_data;
-  DBusError error;
   dbus_uint32_t coord_type;
   gint ix = 0, iy = 0;
   dbus_int32_t x, y;
@@ -127,9 +122,8 @@ impl_GetPosition (DBusConnection * bus, DBusMessage * message,
   g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
                         droute_not_yet_handled_error (message));
 
-  dbus_error_init (&error);
   if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
+      (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
@@ -184,28 +178,28 @@ impl_GetLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
   switch (atklayer)
     {
     case ATK_LAYER_BACKGROUND:
-      rv = Accessibility_LAYER_BACKGROUND;
+      rv = ATSPI_LAYER_BACKGROUND;
       break;
     case ATK_LAYER_CANVAS:
-      rv = Accessibility_LAYER_CANVAS;
+      rv = ATSPI_LAYER_CANVAS;
       break;
     case ATK_LAYER_WIDGET:
-      rv = Accessibility_LAYER_WIDGET;
+      rv = ATSPI_LAYER_WIDGET;
       break;
     case ATK_LAYER_MDI:
-      rv = Accessibility_LAYER_MDI;
+      rv = ATSPI_LAYER_MDI;
       break;
     case ATK_LAYER_POPUP:
-      rv = Accessibility_LAYER_POPUP;
+      rv = ATSPI_LAYER_POPUP;
       break;
     case ATK_LAYER_OVERLAY:
-      rv = Accessibility_LAYER_OVERLAY;
+      rv = ATSPI_LAYER_OVERLAY;
       break;
     case ATK_LAYER_WINDOW:
-      rv = Accessibility_LAYER_WINDOW;
+      rv = ATSPI_LAYER_WINDOW;
       break;
     default:
-      rv = Accessibility_LAYER_INVALID;
+      rv = ATSPI_LAYER_INVALID;
       break;
     }
   reply = dbus_message_new_method_return (message);
@@ -252,7 +246,7 @@ impl_GrabFocus (DBusConnection * bus, DBusMessage * message, void *user_data)
   reply = dbus_message_new_method_return (message);
   if (reply)
     {
-      dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv,
+      dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
                                 DBUS_TYPE_INVALID);
     }
   return reply;
@@ -366,6 +360,34 @@ impl_SetPosition (DBusConnection * bus, DBusMessage * message, void *user_data)
   return reply;
 }
 
+static dbus_bool_t
+impl_get_ScreenExtents (DBusMessageIter * iter, void *user_data)
+{
+  AtkComponent *component = (AtkComponent *) user_data;
+  DBusMessageIter iter_variant, iter_struct;
+  gint ix = -1, iy = -1, iwidth = -1, iheight = -1;
+  dbus_uint32_t x, y, width, height;
+
+  g_return_val_if_fail (ATK_IS_COMPONENT (user_data), FALSE);
+
+  atk_component_get_extents (component, &ix, &iy, &iwidth, &iheight, ATK_XY_SCREEN);
+  x = ix;
+  y = iy;
+  width = iwidth;
+  height = iheight;
+  dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "(uuuu)",
+                                    &iter_variant);
+  dbus_message_iter_open_container (&iter_variant, DBUS_TYPE_STRUCT, NULL,
+                                    &iter_struct);
+  dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &x);
+  dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &y);
+  dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &width);
+  dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &height);
+  dbus_message_iter_close_container (&iter_variant, &iter_struct);
+  dbus_message_iter_close_container (iter, &iter_variant);
+  return TRUE;
+}
+
 static DBusMessage *
 impl_SetSize (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
@@ -397,7 +419,7 @@ impl_SetSize (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DRouteMethod methods[] = {
-  {impl_contains, "contains"},
+  {impl_Contains, "Contains"},
   {impl_GetAccessibleAtPoint, "GetAccessibleAtPoint"},
   {impl_GetExtents, "GetExtents"},
   {impl_GetPosition, "GetPosition"},
@@ -414,9 +436,13 @@ static DRouteMethod methods[] = {
   {NULL, NULL}
 };
 
+static DRouteProperty properties[] = {
+  {impl_get_ScreenExtents, NULL, "ScreenExtents"},
+  {NULL, NULL, NULL}
+};
 void
 spi_initialize_component (DRoutePath * path)
 {
-  droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_COMPONENT, spi_org_a11y_atspi_Component, methods, NULL);
+  spi_atk_add_interface (path,
+                         ATSPI_DBUS_INTERFACE_COMPONENT, spi_org_a11y_atspi_Component, methods, properties);
 };