From 1e967c725bc2d37e5a9275193af9f7d132568fda Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Thu, 16 Apr 2009 11:49:25 -0500 Subject: [PATCH] * atk-adaptor/component-adaptor.c, atk-adaptor/image-adaptor.c, atk-adaptor/text-adaptor.c, xml/org.freedesktop.atspi.Accessible.xml, xml/org.freedesktop.atspi.Component.xml, xml/org.freedesktop.atspi.Image.xml, xml/org.freedesktop.atspi.Text.xml: Conver tenums to DBUS_TYPE_UINT32 for consistency. --- atk-adaptor/component-adaptor.c | 16 ++++++++-------- atk-adaptor/image-adaptor.c | 8 ++++---- atk-adaptor/text-adaptor.c | 18 +++++++++--------- xml/org.freedesktop.atspi.Accessible.xml | 9 +++++++++ xml/org.freedesktop.atspi.Component.xml | 8 ++++---- xml/org.freedesktop.atspi.Image.xml | 4 ++-- xml/org.freedesktop.atspi.Text.xml | 10 +++++----- 7 files changed, 41 insertions(+), 32 deletions(-) diff --git a/atk-adaptor/component-adaptor.c b/atk-adaptor/component-adaptor.c index d51c5fb..7e96ef9 100644 --- a/atk-adaptor/component-adaptor.c +++ b/atk-adaptor/component-adaptor.c @@ -33,7 +33,7 @@ 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; @@ -44,7 +44,7 @@ impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data) 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 droute_invalid_arguments_error (message); } @@ -65,7 +65,7 @@ impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message, { AtkComponent *component = (AtkComponent *) user_data; dbus_int32_t x, y; - dbus_int16_t coord_type; + dbus_uint32_t coord_type; DBusError error; AtkObject *child; @@ -75,7 +75,7 @@ impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message, 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 droute_invalid_arguments_error (message); } @@ -90,7 +90,7 @@ 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), @@ -98,7 +98,7 @@ impl_getExtents (DBusConnection * bus, DBusMessage * message, void *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 droute_invalid_arguments_error (message); } @@ -113,7 +113,7 @@ impl_getPosition (DBusConnection * bus, DBusMessage * message, { 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; @@ -123,7 +123,7 @@ impl_getPosition (DBusConnection * bus, DBusMessage * message, 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 droute_invalid_arguments_error (message); } diff --git a/atk-adaptor/image-adaptor.c b/atk-adaptor/image-adaptor.c index 7e6143e..966ec38 100644 --- a/atk-adaptor/image-adaptor.c +++ b/atk-adaptor/image-adaptor.c @@ -52,14 +52,14 @@ impl_getImageExtents (DBusConnection * bus, DBusMessage * message, { AtkImage *image = (AtkImage *) user_data; DBusError error; - dbus_int16_t coordType; + dbus_uint32_t coordType; gint ix, iy, iwidth, iheight; g_return_val_if_fail (ATK_IS_IMAGE (user_data), droute_not_yet_handled_error (message)); dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID)) + (message, &error, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -74,7 +74,7 @@ impl_getImagePosition (DBusConnection * bus, DBusMessage * message, { AtkImage *image = (AtkImage *) 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; @@ -83,7 +83,7 @@ impl_getImagePosition (DBusConnection * bus, DBusMessage * message, droute_not_yet_handled_error (message)); 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 droute_invalid_arguments_error (message); } diff --git a/atk-adaptor/text-adaptor.c b/atk-adaptor/text-adaptor.c index ae3eed6..4a43542 100644 --- a/atk-adaptor/text-adaptor.c +++ b/atk-adaptor/text-adaptor.c @@ -408,7 +408,7 @@ impl_getCharacterExtents (DBusConnection * bus, DBusMessage * message, { AtkText *text = (AtkText *) user_data; dbus_int32_t offset; - dbus_int16_t coordType; + dbus_uint32_t coordType; dbus_int32_t x, y, width, height; gint ix = 0, iy = 0, iw = 0, ih = 0; DBusError error; @@ -418,7 +418,7 @@ impl_getCharacterExtents (DBusConnection * bus, DBusMessage * message, droute_not_yet_handled_error (message)); dbus_error_init (&error); if (!dbus_message_get_args - (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INT16, &coordType, + (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); @@ -445,7 +445,7 @@ impl_getOffsetAtPoint (DBusConnection * bus, DBusMessage * message, { AtkText *text = (AtkText *) user_data; dbus_int32_t x, y; - dbus_int16_t coordType; + dbus_uint32_t coordType; dbus_int32_t rv; DBusError error; DBusMessage *reply; @@ -455,7 +455,7 @@ impl_getOffsetAtPoint (DBusConnection * bus, DBusMessage * message, dbus_error_init (&error); if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, - DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID)) + DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -615,7 +615,7 @@ impl_getRangeExtents (DBusConnection * bus, DBusMessage * message, { AtkText *text = (AtkText *) user_data; dbus_int32_t startOffset, endOffset; - dbus_int16_t coordType; + dbus_uint32_t coordType; AtkTextRectangle rect; dbus_int32_t x, y, width, height; DBusError error; @@ -626,7 +626,7 @@ impl_getRangeExtents (DBusConnection * bus, DBusMessage * message, dbus_error_init (&error); if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32, - &endOffset, DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID)) + &endOffset, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); } @@ -655,7 +655,7 @@ impl_getBoundedRanges (DBusConnection * bus, DBusMessage * message, { AtkText *text = (AtkText *) user_data; dbus_int32_t x, y, width, height; - dbus_int16_t coordType, xClipType, yClipType; + dbus_uint32_t coordType, xClipType, yClipType; DBusError error; AtkTextRange **range_list = NULL; AtkTextRectangle rect; @@ -667,8 +667,8 @@ impl_getBoundedRanges (DBusConnection * bus, DBusMessage * message, dbus_error_init (&error); if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, - DBUS_TYPE_INT32, &height, DBUS_TYPE_INT32, &width, DBUS_TYPE_INT16, - &coordType, DBUS_TYPE_INT32, &xClipType, DBUS_TYPE_INT32, &yClipType, + DBUS_TYPE_INT32, &height, DBUS_TYPE_INT32, &width, DBUS_TYPE_UINT32, + &coordType, DBUS_TYPE_UINT32, &xClipType, DBUS_TYPE_UINT32, &yClipType, DBUS_TYPE_INVALID)) { return droute_invalid_arguments_error (message); diff --git a/xml/org.freedesktop.atspi.Accessible.xml b/xml/org.freedesktop.atspi.Accessible.xml index 4a40d41..f34eba9 100644 --- a/xml/org.freedesktop.atspi.Accessible.xml +++ b/xml/org.freedesktop.atspi.Accessible.xml @@ -12,6 +12,15 @@ + + + + Used by Component, Image, and Text interfaces to specify whether coordinates are relative to the window or the screen. + + + + + Used by Component and Text interfaces, a struct defining a bounding rectangle. diff --git a/xml/org.freedesktop.atspi.Component.xml b/xml/org.freedesktop.atspi.Component.xml index 129e2dc..26ee741 100644 --- a/xml/org.freedesktop.atspi.Component.xml +++ b/xml/org.freedesktop.atspi.Component.xml @@ -96,7 +96,7 @@ - + Trueif the specified point lies within the Component's bounding box, False otherwise. @@ -106,7 +106,7 @@ - + The Accessible child whose bounding box contains the specified point. @@ -117,7 +117,7 @@ Obtain the Component's bounding box, in pixels, relative to the specified coordinate system. - + A BoundingBox which entirely contains the object's onscreen visual representation. @@ -130,7 +130,7 @@ by coord_type.

- +
  1. 0 indicates coord_type_xy_screen, coordinates are relative to the display screen, in pixels.
    2. diff --git a/xml/org.freedesktop.atspi.Image.xml b/xml/org.freedesktop.atspi.Image.xml index f9dea53..17b63e5 100644 --- a/xml/org.freedesktop.atspi.Image.xml +++ b/xml/org.freedesktop.atspi.Image.xml @@ -41,7 +41,7 @@ view, and not the nominal size of the source data in the event that the original image has been rescaled.

    - +

    If 0, the returned bounding box position is returned relative to the screen; if 1, the bounding box position is returned @@ -71,7 +71,7 @@ onscreen image (i.e. the minimum y coordinate) - + If 0, the returned x and y coordinates are returned relative to the screen; diff --git a/xml/org.freedesktop.atspi.Text.xml b/xml/org.freedesktop.atspi.Text.xml index ca26016..50ede9c 100644 --- a/xml/org.freedesktop.atspi.Text.xml +++ b/xml/org.freedesktop.atspi.Text.xml @@ -238,7 +238,7 @@ - The text-boundary delimiter which determines whether the returned text constitures + The text-boundary delimiter which determines whether the returned text constitutes a character, word, line, or sentence (and possibly attendant whitespace), and whether the start or ending of such a substring forms the boundary condition. @@ -406,7 +406,7 @@ the character at offset. - +

    If 0, the results will be reported in screen coordinates, i.e. in pixels relative to the upper-left corner of the screen, with the x axis pointing right @@ -423,7 +423,7 @@ - + If 0, the input coordinates are interpreted relative to the entire screen, if 1, they are relative to the toplevel window containing this Text object. @@ -554,7 +554,7 @@ An integer parameter which is back-filled with the vertical extent of the bounding box. - + If 0, the above coordinates are reported in pixels relative to corner of the screen; if 1, the coordinates are reported relative to the @@ -593,7 +593,7 @@ is (y + height); - + If 0, the above coordinates are interpreted as pixels relative to corner of the screen; if 1, the coordinates are interpreted as pixels relative to the -- 2.7.4