#include <droute/droute.h>
#include "accessible-marshaller.h"
-#include "spi-common/spi-dbus.h"
+#include "common/spi-dbus.h"
static DBusMessage *
impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
dbus_int32_t x, y;
- dbus_int16_t coord_type;
+ dbus_uint32_t coord_type;
DBusError error;
dbus_bool_t retval;
DBusMessage *reply;
dbus_error_init (&error);
if (!dbus_message_get_args
(message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
- DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID))
+ DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
- return SPI_DBUS_RETURN_ERROR (message, &error);
+ return droute_invalid_arguments_error (message);
}
retval =
atk_component_contains (component, x, y, (AtkCoordType) coord_type);
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
}
return reply;
}
static DBusMessage *
-impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
dbus_int32_t x, y;
- dbus_int16_t coord_type;
+ dbus_uint32_t coord_type;
DBusError error;
AtkObject *child;
dbus_error_init (&error);
if (!dbus_message_get_args
(message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
- DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID))
+ DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
- return SPI_DBUS_RETURN_ERROR (message, &error);
+ return droute_invalid_arguments_error (message);
}
child =
atk_component_ref_accessible_at_point (component, x, y,
- (AtkCoordType) coord_type);
- return spi_dbus_return_object (message, child, TRUE);
+ (AtkCoordType) coord_type);
+ return spi_dbus_return_object (message, child, TRUE, TRUE);
}
static DBusMessage *
-impl_getExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
DBusError error;
- dbus_int16_t coord_type;
+ dbus_uint32_t coord_type;
gint ix, iy, iwidth, iheight;
g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID))
+ (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
- return SPI_DBUS_RETURN_ERROR (message, &error);
+ return droute_invalid_arguments_error (message);
}
atk_component_get_extents (component, &ix, &iy, &iwidth, &iheight,
- (AtkCoordType) coord_type);
+ (AtkCoordType) coord_type);
return spi_dbus_return_rect (message, ix, iy, iwidth, iheight);
}
static DBusMessage *
-impl_getPosition (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+impl_GetPosition (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
DBusError error;
- dbus_int16_t coord_type;
+ dbus_uint32_t coord_type;
gint ix = 0, iy = 0;
dbus_int32_t x, y;
DBusMessage *reply;
dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID))
+ (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
- return SPI_DBUS_RETURN_ERROR (message, &error);
+ return droute_invalid_arguments_error (message);
}
atk_component_get_position (component, &ix, &iy, (AtkCoordType) coord_type);
x = ix;
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32,
- &y, DBUS_TYPE_INVALID);
+ &y, DBUS_TYPE_INVALID);
}
return reply;
}
static DBusMessage *
-impl_getSize (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetSize (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
gint iwidth = 0, iheight = 0;
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_INT32, &width,
- DBUS_TYPE_INT32, &height, DBUS_TYPE_INVALID);
+ DBUS_TYPE_INT32, &height, DBUS_TYPE_INVALID);
}
return reply;
}
static DBusMessage *
-impl_getLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
AtkLayer atklayer;
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
}
return reply;
}
static DBusMessage *
-impl_getMDIZOrder (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+impl_GetMDIZOrder (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
dbus_int16_t rv;
}
static DBusMessage *
-impl_grabFocus (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GrabFocus (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
dbus_bool_t rv;
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
}
return reply;
}
#if 0
static DBusMessage *
impl_registerFocusHandler (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+ void *user_data)
{
}
static DBusMessage *
impl_deregisterFocusHandler (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+ void *user_data)
{
}
#endif
static DBusMessage *
-impl_getAlpha (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetAlpha (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
double rv;
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_DOUBLE, &rv,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
}
return reply;
}
static DRouteMethod methods[] = {
{impl_contains, "contains"},
- {impl_getAccessibleAtPoint, "getAccessibleAtPoint"},
- {impl_getExtents, "getExtents"},
- {impl_getPosition, "getPosition"},
- {impl_getSize, "getSize"},
- {impl_getLayer, "getLayer"},
- {impl_getMDIZOrder, "getMDIZOrder"},
- {impl_grabFocus, "grabFocus"},
+ {impl_GetAccessibleAtPoint, "GetAccessibleAtPoint"},
+ {impl_GetExtents, "GetExtents"},
+ {impl_GetPosition, "GetPosition"},
+ {impl_GetSize, "GetSize"},
+ {impl_GetLayer, "GetLayer"},
+ {impl_GetMDIZOrder, "GetMDIZOrder"},
+ {impl_GrabFocus, "GrabFocus"},
//{impl_registerFocusHandler, "registerFocusHandler"},
//{impl_deregisterFocusHandler, "deregisterFocusHandler"},
- {impl_getAlpha, "getAlpha"},
+ {impl_GetAlpha, "GetAlpha"},
{NULL, NULL}
};