*/
#include <string.h>
+#include <ctype.h>
#include <atk/atk.h>
#include <droute/droute.h>
+#include <atspi/atspi.h>
#include "bridge.h"
#include "accessible-register.h"
#include "common/spi-dbus.h"
+#include "event.h"
+#include "object.h"
static GArray *listener_ids = NULL;
static void
switch_main_context (GMainContext *cnx)
{
+/* This code won't work on dbus-glib earlier than 0.9.0 because of FDO#30574 */
+ if (spi_global_app_data->app_bus_addr [0] == '\0')
+ return;
+
GList *list;
- dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
- dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx);
+ atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
+ atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx);
for (list = spi_global_app_data->direct_connections; list; list = list->next)
- dbus_connection_setup_with_g_main (list->data, cnx);
+ atspi_dbus_connection_setup_with_g_main (list->data, cnx);
}
static void
SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data;
closure->reply = dbus_pending_call_steal_reply (pending);
+ dbus_pending_call_unref (pending);
switch_main_context (NULL);
g_main_loop_quit (closure->loop);
}
{
DBusPendingCall *pending;
SpiReentrantCallClosure closure;
+ GMainContext *main_context;
- closure.loop = g_main_loop_new (spi_global_app_data->main_context, FALSE);
- switch_main_context (spi_global_app_data->main_context);
+ main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL :
+ spi_global_app_data->main_context);
+ closure.loop = g_main_loop_new (main_context, FALSE);
+ switch_main_context (main_context);
- if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
+ if (!dbus_connection_send_with_reply (bus, message, &pending, -1) || !pending)
{
switch_main_context (NULL);
return NULL;
gboolean ret = FALSE;
GList *list;
+ if (!spi_global_app_data->events_initialized)
+ return TRUE;
+
data [0] = ensure_proper_format (klass + 21);
data [1] = ensure_proper_format (major);
data [2] = ensure_proper_format (minor);
void (*append_variant) (DBusMessageIter *, const char *, const void *))
{
DBusConnection *bus = spi_global_app_data->bus;
- const char *path = spi_register_object_to_path (spi_global_register,
- G_OBJECT (obj));
+ const char *path;
gchar *cname, *t;
DBusMessage *sig;
if (!signal_is_needed (klass, major, minor))
return;
+ path = spi_register_object_to_path (spi_global_register, G_OBJECT (obj));
+
/*
* This is very annoying, but as '-' isn't a legal signal
* name in D-Bus (Why not??!?) The names need converting
*/
cname = signal_name_to_dbus (major);
sig = dbus_message_new_signal(path, klass, cname);
- g_free(cname);
dbus_message_iter_init_append(sig, &iter);
if (g_strcmp0 (cname, "ChildrenChanged") != 0)
spi_object_lease_if_needed (G_OBJECT (obj));
+
+ g_free(cname);
+ g_free (path);
}
/*---------------------------------------------------------------------------*/
/*
* Handles the ATK signal 'Gtk:AtkText:text-changed' and
* converts it to the AT-SPI signal - 'object:text-changed'
+ * This signal is deprecated by Gtk:AtkText:text-insert
+ * and Gtk:AtkText:text-remove
*
*/
static gboolean
emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
DBUS_TYPE_STRING_AS_STRING, selected, append_basic);
+ g_free (selected);
+
+ return TRUE;
+}
+
+/*
+ * Handles the ATK signal 'Gtk:AtkText:text-insert' and
+ * converts it to the AT-SPI signal - 'object:text-changed'
+ *
+ */
+static gboolean
+text_insert_event_listener (GSignalInvocationHint * signal_hint,
+ guint n_param_values,
+ const GValue * param_values, gpointer data)
+{
+ AtkObject *accessible;
+ guint text_changed_signal_id;
+ GSignalQuery signal_query;
+ const gchar *name;
+ gchar *minor, *text;
+ gint detail1, detail2;
+
+ accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
+ /* Get signal name for 'Gtk:AtkText:text-changed' so
+ * we convert it to the AT-SPI signal - 'object:text-changed'
+ */
+ text_changed_signal_id = g_signal_lookup ("text-changed", G_OBJECT_TYPE (accessible));
+ g_signal_query (text_changed_signal_id, &signal_query);
+ name = signal_query.signal_name;
+
+
+ /* Add the insert and keep any detail coming from atk */
+ minor = g_quark_to_string (signal_hint->detail);
+ if (minor)
+ minor = g_strconcat ("insert:", minor, NULL);
+ else
+ minor = g_strdup ("insert");
+
+ if (G_VALUE_TYPE (¶m_values[1]) == G_TYPE_INT)
+ detail1 = g_value_get_int (¶m_values[1]);
+
+ if (G_VALUE_TYPE (¶m_values[2]) == G_TYPE_INT)
+ detail2 = g_value_get_int (¶m_values[2]);
+
+ if (G_VALUE_TYPE (¶m_values[3]) == G_TYPE_STRING)
+ text = g_value_get_string (¶m_values[3]);
+
+ emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
+ DBUS_TYPE_STRING_AS_STRING, text, append_basic);
+ g_free (minor);
return TRUE;
}
+/*
+ * Handles the ATK signal 'Gtk:AtkText:text-remove' and
+ * converts it to the AT-SPI signal - 'object:text-changed'
+ *
+ */
+static gboolean
+text_remove_event_listener (GSignalInvocationHint * signal_hint,
+ guint n_param_values,
+ const GValue * param_values, gpointer data)
+{
+ AtkObject *accessible;
+ guint text_changed_signal_id;
+ GSignalQuery signal_query;
+ const gchar *name;
+ gchar *minor, *text;
+ gint detail1, detail2;
+
+ accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
+ /* Get signal name for 'Gtk:AtkText:text-changed' so
+ * we convert it to the AT-SPI signal - 'object:text-changed'
+ */
+ text_changed_signal_id = g_signal_lookup ("text-changed", G_OBJECT_TYPE (accessible));
+ g_signal_query (text_changed_signal_id, &signal_query);
+ name = signal_query.signal_name;
+
+ minor = g_quark_to_string (signal_hint->detail);
+
+ /* Add the delete and keep any detail coming from atk */
+ minor = g_quark_to_string (signal_hint->detail);
+ if (minor)
+ minor = g_strconcat ("delete:", minor, NULL);
+ else
+ minor = g_strdup ("delete");
+
+ if (G_VALUE_TYPE (¶m_values[1]) == G_TYPE_INT)
+ detail1 = g_value_get_int (¶m_values[1]);
+
+ if (G_VALUE_TYPE (¶m_values[2]) == G_TYPE_INT)
+ detail2 = g_value_get_int (¶m_values[2]);
+
+ if (G_VALUE_TYPE (¶m_values[3]) == G_TYPE_STRING)
+ text = g_value_get_string (¶m_values[3]);
+
+ emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
+ DBUS_TYPE_STRING_AS_STRING, text, append_basic);
+ g_free (minor);
+ return TRUE;
+}
+
+
/*---------------------------------------------------------------------------*/
/*
"Gtk:AtkText:text-selection-changed");
add_signal_listener (text_changed_event_listener,
"Gtk:AtkText:text-changed");
+ add_signal_listener (text_insert_event_listener,
+ "Gtk:AtkText:text-insert");
+ add_signal_listener (text_remove_event_listener,
+ "Gtk:AtkText:text-remove");
add_signal_listener (link_selected_event_listener,
"Gtk:AtkHypertext:link-selected");
add_signal_listener (generic_event_listener,
projects / platform / core / uifw / at-spi2-atk.git / blobdiff