#include "accessible-register.h"
#include "accessible-marshaller.h"
+#include "bridge.h"
#include "adaptors.h"
/*---------------------------------------------------------------------------*/
+void
+spi_dbus_append_name_and_path_inner (DBusMessageIter *iter, const char *bus_name, const char *path)
+{
+ DBusMessageIter iter_struct;
+
+ if (!bus_name)
+ bus_name = "";
+
+ dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, &iter_struct);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &bus_name);
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
+ dbus_message_iter_close_container (iter, &iter_struct);
+}
+
+void
+spi_dbus_append_name_and_path (DBusMessage *message, DBusMessageIter *iter, AtkObject *obj, gboolean unref)
+{
+ gchar *path;
+ DBusMessageIter iter_struct;
+ const char *bus_name = dbus_message_get_sender (message);
+
+ path = atk_dbus_object_to_path (obj, FALSE);
+
+ if (!path)
+ path = g_strdup (SPI_DBUS_PATH_NULL);
+
+ spi_dbus_append_name_and_path_inner (iter, bus_name, path);
+
+ g_free (path);
+ if (obj && unref)
+ g_object_unref (obj);
+}
+
/*
* Marshals the D-Bus path of an AtkObject into a D-Bus message.
*
spi_dbus_return_object (DBusMessage *message, AtkObject *obj, gboolean do_register, gboolean unref)
{
DBusMessage *reply;
- gchar *path;
-
- path = atk_dbus_object_to_path (obj, do_register);
-
- if (obj && unref)
- g_object_unref (obj);
-
- if (!path)
- path = g_strdup (SPI_DBUS_PATH_NULL);
-
reply = dbus_message_new_method_return (message);
if (reply)
{
- dbus_message_append_args (reply, DBUS_TYPE_OBJECT_PATH, &path,
- DBUS_TYPE_INVALID);
+ DBusMessageIter iter;
+ dbus_message_iter_init_append (message, &iter);
+ spi_dbus_append_name_and_path (message, &iter, obj, unref);
}
- g_free (path);
-
return reply;
}
* Marshals the given AtkObject into the provided D-Bus iterator.
*
* The object is marshalled including all its client side cache data.
- * The format of the structure is (ooaoassusau).
+ * The format of the structure is (o(so)a(so)assusau).
* This is used in the updateTree signal and the GetTree method
* of the org.freedesktop.atspi.Tree interface.
*
* be registered with D-Bus and have been given a D-Bus object path.
*/
void
-spi_atk_append_accessible(AtkObject *obj, gpointer iter)
+spi_atk_append_accessible(AtkObject *obj, gpointer data)
{
- DBusMessageIter *iter_array;
DBusMessageIter iter_struct, iter_sub_array;
dbus_uint32_t states [2];
int count;
AtkStateSet *set;
+ DBusMessageIter *iter_array = (DBusMessageIter *)data;
const char *name, *desc;
dbus_uint32_t role;
- iter_array = (DBusMessageIter *) iter;
-
set = atk_object_ref_state_set (obj);
dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct);
{
/* Marshall object path */
path = atk_dbus_object_to_path (obj, FALSE);
- dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
/* Marshall parent */
parent = atk_object_get_parent(obj);
path_parent = atk_dbus_desktop_object_path ();
}
}
- dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path_parent);
+
+ dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
+ spi_dbus_append_name_and_path_inner (&iter_struct, NULL, path_parent);
g_free(path_parent);
/* Marshall children */
- dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "o", &iter_sub_array);
+ dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "(so)", &iter_sub_array);
if (!atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS))
{
gint childcount, i;
child_path = atk_dbus_object_to_path (child, FALSE);
if (child_path)
{
- dbus_message_iter_append_basic (&iter_sub_array, DBUS_TYPE_OBJECT_PATH, &child_path);
+ spi_dbus_append_name_and_path_inner (&iter_sub_array, NULL, child_path);
g_free (child_path);
}
g_object_unref(G_OBJECT(child));
Accessibility::Hypertext\n
Accessibility::Image\n
Accessibility::Selection\n
- Accessibility::StreamableContent\n
Accessibility::Table\n
Accessibility::Text\n
Accessibility::EditableText\n
/**
*
+Accessibility_COORD_TYPE:
+ * @Accessibility_COORD_TYPE_SCREEN: <![CDATA[]]>
+ * @Accessibility_COORD_TYPE_WINDOW: <![CDATA[]]>
+ *
+ * <![CDATA[ Used by Component, Image, and Text interfaces to specify whether coordinates are relative to the window or the screen. ]]>
+ *
+ * Bitfield/set of flags generated from the AT-SPI specification.
+ */
+typedef enum {
+ Accessibility_COORD_TYPE_SCREEN,
+ Accessibility_COORD_TYPE_WINDOW,
+} Accessibility_COORD_TYPE;
+
+/**
+ * NUM_ACCESSIBILITY_COORD_TYPES:
+ *
+ * 1 higher than the highest valid value of #Accessibility_COORD_TYPE.
+ */
+#define NUM_ACCESSIBILITY_COORD_TYPES (1+1)
+
+/**
+ *
Accessibility_Collection_SortOrder:
* @Accessibility_Collection_SORT_ORDER_INVALID: <![CDATA[]]>
* @Accessibility_Collection_SORT_ORDER_CANONICAL: <![CDATA[]]>
* @Accessibility_LAYER_BACKGROUND: <![CDATA[ The bottom-most layer, over which everything else is painted. The 'desktop background' is generally in this layer. ]]>
* @Accessibility_LAYER_CANVAS: <![CDATA[ The 'background' layer for most content renderers and UI Component containers. ]]>
* @Accessibility_LAYER_WIDGET: <![CDATA[ The layer in which the majority of ordinary 'foreground' widgets reside. ]]>
- * @Accessibility_LAYER_MDI: <![CDATA[ A special layer between LAYER_CANVAS and LAYER_WIDGET, in which the 'pseudo windows' (e.g. the MDI frames) reside. (See Component.getMDIZOrder) ]]>
+ * @Accessibility_LAYER_MDI: <![CDATA[ A special layer between LAYER_CANVAS and LAYER_WIDGET, in which the 'pseudo windows' (e.g. the MDI frames) reside. (See Component.GetMDIZOrder) ]]>
* @Accessibility_LAYER_POPUP: <![CDATA[ A layer for popup window content, above LAYER_WIDGET. ]]>
* @Accessibility_LAYER_OVERLAY: <![CDATA[ The topmost layer. ]]>
* @Accessibility_LAYER_WINDOW: <![CDATA[ The layer in which a toplevel window background usually resides. ]]>
/**
*
-Accessibility_SeekType:
- * @Accessibility_SEEK_SET: <![CDATA[ Seek from the start of the stream or data source. ]]>
- * @Accessibility_SEEK_CURRENT: <![CDATA[ Seek relative to the current position. ]]>
- * @Accessibility_SEEK_END: <![CDATA[ Seek from the end of the file, stream, or data source. ]]>
- *
- * <![CDATA[ Specifies the meaning of a seek 'offset'. Not all SeekTypes are supported by all StreamableContent data sources, for instance some streams may not support seeking from the beginning or other types of 'backwards' seeks. ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
- Accessibility_SEEK_SET,
- Accessibility_SEEK_CURRENT,
- Accessibility_SEEK_END,
-} Accessibility_SeekType;
-
-/**
- * NUM_ACCESSIBILITY_SEEKTYPES:
- *
- * 1 higher than the highest valid value of #Accessibility_SeekType.
- */
-#define NUM_ACCESSIBILITY_SEEKTYPES (2+1)
-
-/**
- *
Accessibility_TEXT_BOUNDARY_TYPE:
* @Accessibility_TEXT_BOUNDARY_CHAR: <![CDATA[ Text is bounded by this character only. Start and end offsets differ by one, by definition, for this value. ]]>
* @Accessibility_TEXT_BOUNDARY_WORD_START: <![CDATA[ Boundary condition is start of a word; i.e. range is from start of one word to the start of another word. ]]>
* @Accessibility_TEXT_BOUNDARY_LINE_START: <![CDATA[ Boundary condition is the start of a line; i.e. range is from start of one line to the start of another. This generally means that an end-of-line character will appear at the end of the range. ]]>
* @Accessibility_TEXT_BOUNDARY_LINE_END: <![CDATA[ Boundary condition is the end of a line; i.e. range is from start of one line to the start of another. This generally means that an end-of-line character will be the first character of the range. ]]>
*
- * <![CDATA[ Specifies the boundary conditions determining a run of text as returned from getTextAtOffset, getTextAfterOffset, and getTextBeforeOffset. ]]>
+ * <![CDATA[ Specifies the boundary conditions determining a run of text as returned from GetTextAtOffset, GetTextAfterOffset, and GetTextBeforeOffset. ]]>
*
* Bitfield/set of flags generated from the AT-SPI specification.
*/
* @Accessibility_KEY_PRESS: <![CDATA[ emulate the pressing of a hardware keyboard key. ]]>
* @Accessibility_KEY_RELEASE: <![CDATA[ emulate the release of a hardware keyboard key. ]]>
* @Accessibility_KEY_PRESSRELEASE: <![CDATA[ a hardware keyboard key is pressed and immediately released. ]]>
- * @Accessibility_KEY_SYM: <![CDATA[ a symbolic key event is generated, without specifying a hardware key. @note if the keysym is not present in the current keyboard map, the DeviceEventController instance has a limited ability to generate such keysyms on-the-fly. Reliability of generateKeyboardEvent calls using out-of-keymap keysyms will vary from system to system, and on the number of different out-of-keymap being generated in quick succession. In practice this is rarely significant, since the keysyms of interest to AT clients and keyboard emulators are usually part of the current keymap, i.e. present on the system keyboard for the current locale (even if a physical hardware keyboard is not connected. ]]>
+ * @Accessibility_KEY_SYM: <![CDATA[ a symbolic key event is generated, without specifying a hardware key. @note if the keysym is not present in the current keyboard map, the DeviceEventController instance has a limited ability to generate such keysyms on-the-fly. Reliability of GenerateKeyboardEvent calls using out-of-keymap keysyms will vary from system to system, and on the number of different out-of-keymap being generated in quick succession. In practice this is rarely significant, since the keysyms of interest to AT clients and keyboard emulators are usually part of the current keymap, i.e. present on the system keyboard for the current locale (even if a physical hardware keyboard is not connected. ]]>
* @Accessibility_KEY_STRING: <![CDATA[ a string is converted to its equivalent keyboard events and emitted. If the string consists of complex character or composed characters which are not in the current keymap, string emission is subject to the out-of-keymap limitations described for KeySynthType::KEY_SYM. In practice this limitation primarily effects Chinese and Japanese locales. ]]>
*
- * <![CDATA[ Used when synthesizing keyboard input via DeviceEventController:generateKeyboardEvent. ]]>
+ * <![CDATA[ Used when synthesizing keyboard input via DeviceEventController:GenerateKeyboardEvent. ]]>
*
* Bitfield/set of flags generated from the AT-SPI specification.
*/
* @Accessibility_RELATION_CONTROLLED_BY: <![CDATA[ Object state, position, etc. is modified/controlled by user interaction with one or more other objects. For instance a viewport or scroll pane may be CONTROLLED_BY scrollbars. ]]>
* @Accessibility_RELATION_MEMBER_OF: <![CDATA[ Object has a grouping relationship (e.g. 'same group as') to one or more other objects. ]]>
* @Accessibility_RELATION_TOOLTIP_FOR: <![CDATA[ Object is a tooltip associated with another object. ]]>
- * @Accessibility_RELATION_NODE_CHILD_OF: <![CDATA[ Reserved for future use. ]]>
+ * @Accessibility_RELATION_NODE_CHILD_OF: <![CDATA[ Object is a child of the target. ]]>
+ * @Accessibility_RELATION_NODE_PARENT_OF: <![CDATA[ Object is a parent of the target. ]]>
* @Accessibility_RELATION_EXTENDED: <![CDATA[ Used to indicate that a relationship exists, but its type is not specified in the enumeration and must be obtained via a call to getRelationTypeName. ]]>
* @Accessibility_RELATION_FLOWS_TO: <![CDATA[ Object renders content which flows logically to another object. For instance, text in a paragraph may flow to another object which is not the 'next sibling' in the accessibility hierarchy. ]]>
* @Accessibility_RELATION_FLOWS_FROM: <![CDATA[ Reciprocal of RELATION_FLOWS_TO. ]]>
Accessibility_RELATION_MEMBER_OF,
Accessibility_RELATION_TOOLTIP_FOR,
Accessibility_RELATION_NODE_CHILD_OF,
+ Accessibility_RELATION_NODE_PARENT_OF,
Accessibility_RELATION_EXTENDED,
Accessibility_RELATION_FLOWS_TO,
Accessibility_RELATION_FLOWS_FROM,
*
* 1 higher than the highest valid value of #Accessibility_RelationType.
*/
-#define NUM_ACCESSIBILITY_RELATIONTYPES (18+1)
+#define NUM_ACCESSIBILITY_RELATIONTYPES (19+1)
/**
*
*/
#define NUM_ACCESSIBILITY_ROLES (90+1)
-/**
- *
-Accessibility_LoginHelper_DeviceReq:
- * @Accessibility_LoginHelper_GUI_EVENTS: <![CDATA[ Needs access to the GUI event subsystem (e.g. Xserver) ]]>
- * @Accessibility_LoginHelper_CORE_KEYBOARD: <![CDATA[ Needs access to the system keyboard events (read and write) ]]>
- * @Accessibility_LoginHelper_CORE_POINTER: <![CDATA[ Needs access to the onscreen pointer (e.g. mouse pointer) ]]>
- * @Accessibility_LoginHelper_EXT_INPUT: <![CDATA[ Reads XInput extended input devices ]]>
- * @Accessibility_LoginHelper_POST_WINDOWS: <![CDATA[ Posts Windows, and needs for toplevel windows to be visible ]]>
- * @Accessibility_LoginHelper_AUDIO_OUT: <![CDATA[ Writes to audio device ]]>
- * @Accessibility_LoginHelper_AUDIO_IN: <![CDATA[ Reads from audio device ]]>
- * @Accessibility_LoginHelper_NETWORK: <![CDATA[ Requires access to general network services, including remote access ]]>
- * @Accessibility_LoginHelper_LOCALHOST: <![CDATA[ Requires network services hosted on LOCALHOST only ]]>
- * @Accessibility_LoginHelper_SERIAL_OUT: <![CDATA[ Writes to a serial port ]]>
- * @Accessibility_LoginHelper_SERIAL_IN: <![CDATA[ !<: Reads from a serial port ]]>
- *
- * <![CDATA[ The system and device access and services which the LoginHelper-implementing assistive technology requires in order to enable the user to use the system. ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
- Accessibility_LoginHelper_GUI_EVENTS,
- Accessibility_LoginHelper_CORE_KEYBOARD,
- Accessibility_LoginHelper_CORE_POINTER,
- Accessibility_LoginHelper_EXT_INPUT,
- Accessibility_LoginHelper_POST_WINDOWS,
- Accessibility_LoginHelper_AUDIO_OUT,
- Accessibility_LoginHelper_AUDIO_IN,
- Accessibility_LoginHelper_NETWORK,
- Accessibility_LoginHelper_LOCALHOST,
- Accessibility_LoginHelper_SERIAL_OUT,
- Accessibility_LoginHelper_SERIAL_IN,
-} Accessibility_LoginHelper_DeviceReq;
-
-/**
- * NUM_ACCESSIBILITY_DEVICEREQS:
- *
- * 1 higher than the highest valid value of #Accessibility_LoginHelper_DeviceReq.
- */
-#define NUM_ACCESSIBILITY_DEVICEREQS (10+1)
-
-/**
- *
-Accessibility_Selector_CommandResult:
- * @Accessibility_Selector_COMMAND_RESULT_INVALID: <![CDATA[ The command was invalid or ill-formed; usually indicates an error condition. ]]>
- * @Accessibility_Selector_COMMAND_RESULT_SUCCESS: <![CDATA[ The command was successfully activated. ]]>
- * @Accessibility_Selector_COMMAND_RESULT_FAILED: <![CDATA[ The command was valid, but could not be activated. This may be due to problems with permissions or error conditions. ]]>
- * @Accessibility_Selector_COMMAND_RESULT_OBSOLETE: <![CDATA[ The command is no longer valid in the current program context. This may mean that the application has changed state in such a way that the specified command it no longer applicable, or because changes to the application state have rendered it ambiguous. Commands should be re-fetched and a new selection made. ]]>
- * @Accessibility_Selector_COMMAND_RESULT_LAST_DEFINED: <![CDATA[ Defines size of enumeration; do not use this value as a parameter. ]]>
- *
- * <![CDATA[ A code returned by a call to activateCommand, indicating the result of the activation request. ]]>
- *
- * Bitfield/set of flags generated from the AT-SPI specification.
- */
-typedef enum {
- Accessibility_Selector_COMMAND_RESULT_INVALID,
- Accessibility_Selector_COMMAND_RESULT_SUCCESS,
- Accessibility_Selector_COMMAND_RESULT_FAILED,
- Accessibility_Selector_COMMAND_RESULT_OBSOLETE,
- Accessibility_Selector_COMMAND_RESULT_LAST_DEFINED,
-} Accessibility_Selector_CommandResult;
-
-/**
- * NUM_ACCESSIBILITY_COMMANDRESULTS:
- *
- * 1 higher than the highest valid value of #Accessibility_Selector_CommandResult.
- */
-#define NUM_ACCESSIBILITY_COMMANDRESULTS (4+1)
-
#ifdef __cplusplus
}
projects / platform / core / uifw / at-spi2-atk.git / commitdiff