#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 gboolean
-Accessibility_DeviceEventController_notifyListenersSync(const Accessibility_DeviceEvent *key_event)
+Accessibility_DeviceEventController_NotifyListenersSync(const Accessibility_DeviceEvent *key_event)
{
DBusMessage *message;
DBusError error;
dbus_message_new_method_call(SPI_DBUS_NAME_REGISTRY,
SPI_DBUS_PATH_DEC,
SPI_DBUS_INTERFACE_DEC,
- "notifyListenersSync");
+ "NotifyListenersSync");
dbus_error_init(&error);
if (spi_dbus_marshal_deviceEvent(message, key_event))
spi_init_keystroke_from_atk_key_event (&key_event, event);
- result = Accessibility_DeviceEventController_notifyListenersSync (&key_event);
+ result = Accessibility_DeviceEventController_NotifyListenersSync (&key_event);
if (key_event.event_string) g_free (key_event.event_string);
* the AT-SPI event.
*/
+static gchar *
+DBusSignalName (const gchar *s)
+{
+ gchar *ret = g_strdup (s);
+ gchar *t;
+
+ if (!ret)
+ return NULL;
+ ret [0] = toupper (ret [0]);
+ while ((t = strchr (ret, '-')) != NULL)
+ {
+ memmove (t, t + 1, strlen (t));
+ *t = toupper (*t);
+ }
+ return ret;
+}
+
static void
emit(AtkObject *accessible,
const char *klass,
const void *val)
{
gchar *path;
+ gchar *cname;
/* 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
return;
}
- spi_dbus_emit_signal (atk_adaptor_app_data->bus, path, klass, major, minor, detail1, detail2, type, val);
+ cname = DBusSignalName (major);
+ spi_dbus_emit_signal (atk_adaptor_app_data->bus, path, klass, cname, minor, detail1, detail2, type, val);
+ g_free (cname);
g_free(path);
}
{
DBusMessage *sig;
DBusMessageIter iter, variant, sub;
- gchar *path, *cname, *t;
+ gchar *path, *cname;
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
* name in D-Bus (Why not??!?) The names need converting
* on this side, and again on the client side.
*/
- cname = g_strdup(major);
- while ((t = strchr(cname, '-')) != NULL) *t = '_';
+ cname = DBusSignalName (major);
sig = dbus_message_new_signal(path, klass, cname);
g_free(path);
dbus_message_iter_close_container (&iter, &variant);
dbus_connection_send(atk_adaptor_app_data->bus, sig, NULL);
+
+ dbus_message_unref (sig);
}
/*---------------------------------------------------------------------------*/
pname = values[0].property_name;
if (strcmp (pname, "accessible-name") == 0 ||
strcmp (pname, "accessible-description") == 0 ||
+ strcmp (pname, "accessible-role") == 0 ||
strcmp (pname, "accessible-parent") == 0)
{
return TRUE;
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 (link_selected_event_listener, "Gtk:AtkHypertext:link-selected");
add_signal_listener (generic_event_listener, "Gtk:AtkObject:visible-data-changed");
add_signal_listener (generic_event_listener, "Gtk:AtkSelection:selection-changed");
+ add_signal_listener (generic_event_listener, "Gtk:AtkText:text-attributes-changed");
add_signal_listener (generic_event_listener, "Gtk:AtkText:text-caret-moved");
add_signal_listener (generic_event_listener, "Gtk:AtkTable:row-inserted");
add_signal_listener (generic_event_listener, "Gtk:AtkTable:row-reordered");