#include "bridge.h"
#include "accessible-register.h"
-#include "spi-common/spi-dbus.h"
+#include "common/spi-dbus.h"
static GArray *listener_ids = NULL;
#define ITF_EVENT_OBJECT "org.freedesktop.atspi.Event.Object"
#define ITF_EVENT_WINDOW "org.freedesktop.atspi.Event.Window"
-#define ITF_EVENT_DOCUMENT "org.freedekstop.atspi.Event.Document"
+#define ITF_EVENT_DOCUMENT "org.freedesktop.atspi.Event.Document"
#define ITF_EVENT_FOCUS "org.freedesktop.atspi.Event.Focus"
/*---------------------------------------------------------------------------*/
+static void
+set_reply (DBusPendingCall *pending, void *user_data)
+{
+ void **replyptr = (void **)user_data;
+
+ *replyptr = dbus_pending_call_steal_reply (pending);
+}
+
+static DBusMessage *
+send_and_allow_reentry (DBusConnection *bus, DBusMessage *message)
+{
+ DBusPendingCall *pending;
+ DBusMessage *reply = NULL;
+
+ if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
+ {
+ return NULL;
+ }
+ dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL);
+ while (!reply)
+ {
+ if (!dbus_connection_read_write_dispatch (bus, -1)) return NULL;
+ }
+ return reply;
+}
+
static gboolean
Accessibility_DeviceEventController_notifyListenersSync(const Accessibility_DeviceEvent *key_event)
{
DBusError error;
dbus_bool_t consumed = FALSE;
- message =
+ message =
dbus_message_new_method_call(SPI_DBUS_NAME_REGISTRY,
- SPI_DBUS_PATH_REGISTRY,
- SPI_DBUS_INTERFACE_DEC,
- "notifyListenersSync");
+ SPI_DBUS_PATH_DEC,
+ SPI_DBUS_INTERFACE_DEC,
+ "notifyListenersSync");
dbus_error_init(&error);
if (spi_dbus_marshal_deviceEvent(message, key_event))
{
- DBusMessage *reply = dbus_connection_send_with_reply_and_block(atk_adaptor_app_data->bus, message, 1000, &error);
+ DBusMessage *reply = send_and_allow_reentry (atk_adaptor_app_data->bus, message);
if (reply)
{
DBusError error;
{
gchar *path;
- path = atk_dbus_object_to_path (accessible);
+ /* TODO this is a hack, used becuase child-added events are not guaranteed.
+ * On recieving an event from a non-registered object we check if it can be safely
+ * registered before sending the event.
+ */
+ path = atk_dbus_object_attempt_registration (accessible);
/* Tough decision here
* We won't send events from accessible
* objects that have not yet been added to the accessible tree.
*/
if (path == NULL)
+ {
+#ifdef SPI_ATK_DEBUG
+ g_debug ("AT-SPI: Event recieved from non-registered object");
+#endif
return;
+ }
spi_dbus_emit_signal (atk_adaptor_app_data->bus, path, klass, major, minor, detail1, detail2, type, val);
g_free(path);
gchar *path, *cname, *t;
dbus_int32_t dummy = 0;
- path = atk_dbus_object_to_path (accessible);
+ path = atk_dbus_object_to_path (accessible, FALSE);
/* Tough decision here
* We won't send events from accessible
dbus_message_iter_close_container (&iter, &variant);
dbus_connection_send(atk_adaptor_app_data->bus, sig, NULL);
+
+ dbus_message_unref (sig);
}
/*---------------------------------------------------------------------------*/
AtkObject *otemp;
const gchar *stemp;
gint i;
-
+
accessible = g_value_get_object (¶m_values[0]);
values = (AtkPropertyValues*) g_value_get_pointer (¶m_values[1]);
pname = values[0].property_name;
+ if (strcmp (pname, "accessible-name") == 0 ||
+ strcmp (pname, "accessible-description") == 0 ||
+ strcmp (pname, "accessible-parent") == 0)
+ {
+ return TRUE;
+ }
/* TODO Could improve this control statement by matching
* on only the end of the signal names,
if (strcmp (pname, "accessible-table-summary") == 0)
{
otemp = atk_table_get_summary(ATK_TABLE (accessible));
- stemp = atk_dbus_object_to_path (otemp);
+ stemp = atk_dbus_object_to_path (otemp, FALSE);
if (stemp != NULL)
emit(accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, DBUS_TYPE_OBJECT_PATH_AS_STRING, stemp);
}
{
i = g_value_get_int (&(values->new_value));
otemp = atk_table_get_column_header(ATK_TABLE (accessible), i);
- stemp = atk_dbus_object_to_path (otemp);
+ stemp = atk_dbus_object_to_path (otemp, FALSE);
if (stemp != NULL)
emit(accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, DBUS_TYPE_OBJECT_PATH_AS_STRING, stemp);
}
{
i = g_value_get_int (&(values->new_value));
otemp = atk_table_get_row_header(ATK_TABLE (accessible), i);
- stemp = atk_dbus_object_to_path (otemp);
+ stemp = atk_dbus_object_to_path (otemp, FALSE);
if (stemp != NULL)
emit(accessible, ITF_EVENT_OBJECT, PCHANGE, pname, 0, 0, DBUS_TYPE_OBJECT_PATH_AS_STRING, stemp);
}
minor = g_quark_to_string (signal_hint->detail);
detail1 = atk_object_get_index_in_parent (child);
- s = atk_dbus_object_to_path (child);
+ s = atk_dbus_object_to_path (child, FALSE);
if (s == NULL)
{
g_free (s);
add_signal_listener (document_event_listener, "Gtk:AtkDocument:load-complete");
add_signal_listener (document_event_listener, "Gtk:AtkDocument:reload");
add_signal_listener (document_event_listener, "Gtk:AtkDocument:load-stopped");
+ /* TODO Fake this event on the client side */
add_signal_listener (state_event_listener, "Gtk:AtkObject:state-change");
+ /* TODO */
add_signal_listener (active_descendant_event_listener, "Gtk:AtkObject:active-descendant-changed");
add_signal_listener (bounds_event_listener, "Gtk:AtkComponent:bounds-changed");
add_signal_listener (text_selection_changed_event_listener, "Gtk:AtkText:text-selection-changed");