*/
#include "config.h"
+#include "dbus/dbus-glib-lowlevel.h"
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdarg.h>
-#include <libbonobo.h>
-#include <orbit/orbit.h>
#include <atk/atk.h>
#include <atk/atkobject.h>
#include <atk/atknoopobject.h>
-#include <libspi/Accessibility.h>
-#include <libspi/spi-private.h>
-#include "remoteobject.h"
#include "accessible.h"
-#include "application.h"
-#include <bonobo-activation/bonobo-activation-register.h>
#undef SPI_BRIDGE_DEBUG
#define bridge_threads_enter() \
if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_enter(misc);
+typedef struct _SpiAppData SpiAppData;
+struct _SpiAppData
+{
+ AtkObject *root;
+ DRouteData droute;
+};
+
int _dbg = 0;
-static CORBA_Environment ev;
-static Accessibility_Registry registry = CORBA_OBJECT_NIL;
-static Accessibility_DeviceEventController device_event_controller = CORBA_OBJECT_NIL;
-static SpiApplication *this_app = NULL;
+static const char *registry = NULL;
+static char *device_event_controller = NULL;
+static SpiAppData *this_app = NULL;
static gboolean registry_died = FALSE;
static gboolean atk_listeners_registered = FALSE;
static gint toplevels = 0;
static guint atk_signal_link_selected;
static guint atk_signal_bounds_changed;
-static Accessibility_Registry spi_atk_bridge_get_registry (void);
+static const char *spi_atk_bridge_get_registry (void);
static gboolean spi_atk_bridge_do_registration (void);
static void spi_atk_bridge_toplevel_added (AtkObject *object,
guint index,
static void spi_atk_register_event_listeners (void);
static void spi_atk_bridge_focus_tracker (AtkObject *object);
static gchar *spi_atk_bridge_get_registry_ior (void);
-static void spi_atk_bridge_register_application (Accessibility_Registry registry);
+static void spi_atk_bridge_register_application (const char *registry);
static gboolean spi_atk_bridge_property_event_listener (GSignalInvocationHint *signal_hint,
guint n_param_values,
const GValue *param_values,
gpointer data);
-static void spi_atk_bridge_init_nil (CORBA_any *any,
- AtkObject *obj);
-static void spi_atk_bridge_init_object (CORBA_any *any,
- AtkObject *obj,
- CORBA_Object *c_obj);
-static void spi_atk_bridge_init_string (CORBA_any *any,
- AtkObject *obj,
- gchar **string);
-static void spi_atk_bridge_init_rect (CORBA_any *any,
- AtkObject *obj,
- AtkRectangle *rect);
-
static gboolean
spi_atk_bridge_window_event_listener (GSignalInvocationHint *signal_hint,
guint n_param_values,
static gint spi_atk_bridge_key_listener (AtkKeyEventStruct *event,
gpointer data);
static void spi_atk_tidy_windows (void);
-static void deregister_application (BonoboObject *app);
-static void reinit_register_vars (void);
+static void deregister_application (SpiAppData *app);
+static void reinit_register_vars (void);
/* For automatic libgnome init */
extern void gnome_accessibility_module_init (void);
}
static gboolean
-post_init (void)
+post_init (gpointer data)
{
during_init_shutdown = FALSE;
return FALSE;
}
+static DBusObjectPathVTable droute_vtable =
+{
+ NULL,
+ &droute_message,
+ NULL, NULL, NULL, NULL
+};
+
+static SpiAppData *
+spi_app_init (AtkObject *root)
+{
+ DBusError error;
+ dbus_error_init(&error);
+ SpiAppData *ad = (SpiAppData *)calloc(sizeof(SpiAppData), 1);
+ if (!ad) return NULL;
+ ad->root = root;
+ ad->droute.bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
+ if (!ad->droute.bus)
+ {
+ g_warning("Couldn't connect to dbus: %s\n", error.message);
+ free(ad);
+ return NULL;
+ }
+ //dbus_connection_set_exit_on_disconnect(ad->droute.bus, FALSE);
+ //dbus_bus_register(ad->droute.bus, &error);
+ spi_dbus_initialize (&ad->droute);
+ /* Below line for testing -- it should be removed once at-spi-registryd is working */
+ if (dbus_bus_request_name(ad->droute.bus, "test.atspi.tree", 0, &error)) printf("Got test name.\n");
+ spi_register_tree_object(ad->droute.bus, "/org/freedesktop/atspi/tree");
+ if (!dbus_connection_try_register_fallback (ad->droute.bus, "/org/freedesktop/atspi/accessible/", &droute_vtable, &ad->droute, &error))
+ {
+ g_warning("Couldn't register droute.\n");
+ }
+ dbus_connection_setup_with_g_main(ad->droute.bus, g_main_context_default());
+ return ad;
+}
+
static int
atk_bridge_init (gint *argc, gchar **argv[])
{
if (debug_env_string)
_dbg = (int) g_ascii_strtod (debug_env_string, NULL);
- if (!bonobo_init (argc, argv ? *argv : NULL))
- {
- g_error ("Could not initialize Bonobo");
- }
+ /* Connect to dbus */
+ this_app = spi_app_init (atk_get_root ());
- /* Create the accessible application server object */
- this_app = spi_application_new (atk_get_root ());
/*
* We only want to enable the bridge for top level
* applications, we detect bonobo components by seeing
* if they were activated with the intention of extracting
* an impl. by IID - very solid.
*/
+#ifdef WITH_BONOBO
+ // TODO: Figure out if this is still needed
if (bonobo_activation_iid_get ())
+#else
+ if (0)
+#endif
{
DBG (1, g_message ("Found Bonobo component\n"));
g_signal_connect (atk_get_root (),
(GCallback) spi_atk_bridge_toplevel_removed,
NULL);
/* in this case we redefine 'success' to mean 'registry is present' */
- success = (spi_atk_bridge_get_registry () != CORBA_OBJECT_NIL);
+ success = (spi_atk_bridge_get_registry () != NULL);
}
else
{
return 0;
}
-
static gboolean
spi_atk_bridge_do_registration (void)
{
- CORBA_Environment ev;
-
- CORBA_exception_init(&ev);
-
- if (spi_atk_bridge_get_registry () == CORBA_OBJECT_NIL)
+ if (spi_atk_bridge_get_registry () == NULL)
{
g_warning ("Could not locate registry");
return FALSE;
}
- bonobo_activate ();
-
/* Create the accessible application server object */
if (this_app == NULL)
- this_app = spi_application_new (atk_get_root ());
+ this_app = spi_app_init (atk_get_root ());
DBG (1, g_message ("About to register application\n"));
guint index,
AtkObject *child)
{
- BonoboObject *app = (BonoboObject *) this_app;
-
toplevels--;
if (toplevels == 0)
{
- deregister_application (app);
+ deregister_application (this_app);
reinit_register_vars ();
}
if (toplevels < 0)
}
static void
-spi_atk_bridge_register_application (Accessibility_Registry registry)
+spi_atk_bridge_register_application (const char *registry)
{
bridge_threads_leave ();
- Accessibility_Registry_registerApplication (spi_atk_bridge_get_registry (),
- BONOBO_OBJREF (this_app),
- &ev);
+ // TODO: register
bridge_threads_enter ();
- if (ev._major != CORBA_NO_EXCEPTION)
- CORBA_exception_free (&ev);
}
/*
}
-static Accessibility_Registry
+static const char *
spi_atk_bridge_get_registry (void)
{
- CORBA_Environment ev;
- char *ior = NULL;
-
- if (registry_died || (registry == CORBA_OBJECT_NIL))
- {
- CORBA_exception_init (&ev);
- if (registry_died)
- {
- if (exiting)
- return CORBA_OBJECT_NIL;
- else
- DBG (1, g_warning ("registry died! restarting..."));
- }
-
- /* XXX: This presumes that the registry has successfully restarted itself already...*/
- ior = (char *) spi_atk_bridge_get_registry_ior ();
-
- if (ior != NULL)
- {
- registry = CORBA_ORB_string_to_object (bonobo_activation_orb_get (),
- ior, &ev);
- XFree (ior);
- }
- else
- {
- g_warning ("IOR not set.");
- registry = CORBA_OBJECT_NIL;
- }
-
- if (ev._major != CORBA_NO_EXCEPTION)
- {
- g_error ("Accessibility app error: exception during "
- "registry activation from id: %s\n",
- CORBA_exception_id (&ev));
- CORBA_exception_free (&ev);
- }
-
- if (registry_died && registry)
- {
- registry_died = FALSE;
- spi_atk_bridge_register_application (registry);
- }
- }
- return registry;
+ // TODO: check for registry dying, as the old code attempted to do
+ return "org.freedesktop.atspi.registry";
}
-static Accessibility_DeviceEventController
-spi_atk_bridget_get_dec (void)
+static const char *
+spi_atk_bridge_get_dec (void)
{
- CORBA_Environment ev;
-
- if (device_event_controller != CORBA_OBJECT_NIL)
- {
- if (ORBit_small_get_connection_status (device_event_controller)
- == ORBIT_CONNECTION_CONNECTED)
- return device_event_controller;
- }
-
- CORBA_exception_init (&ev);
-
- device_event_controller =
- Accessibility_Registry_getDeviceEventController (
- spi_atk_bridge_get_registry (), &ev);
-
- if (BONOBO_EX (&ev))
- {
- g_warning (_("failure: no device event controller found.\n"));
- registry_died = TRUE;
- device_event_controller = CORBA_OBJECT_NIL;
- }
-
- return device_event_controller;
+ return "/dec";
}
int
AtkObject *bo = atk_no_op_object_new (ao);
- if (atk_listeners_registered) return;
+ if (atk_listeners_registered)
+ {
+ g_object_unref (G_OBJECT (bo));
+ g_object_unref (ao);
+ return;
+ }
atk_listeners_registered = TRUE;
}
static void
-deregister_application (BonoboObject *app)
+deregister_application (SpiAppData *app)
{
- Accessibility_Registry registry = spi_atk_bridge_get_registry ();
+ const char *registry = spi_atk_bridge_get_registry ();
bridge_threads_leave ();
- Accessibility_Registry_deregisterApplication (registry, BONOBO_OBJREF (app), &ev);
+ // todo: deregister
bridge_threads_enter ();
-
- device_event_controller = bonobo_object_release_unref (device_event_controller, &ev);
- registry = bonobo_object_release_unref (registry, &ev);
-
- app = bonobo_object_unref (app);
}
static void
spi_atk_bridge_exit_func (void)
{
- BonoboObject *app = (BonoboObject *) this_app;
+ SpiAppData *app = (SpiAppData *) this_app;
DBG (1, g_message ("exiting bridge\n"));
{
return;
}
- this_app = NULL;
if (atk_bridge_pid != getpid ())
{
_exit (0);
* shutdown, until we can explicitly shutdown to get the ordering
* right.
*/
- if (!bonobo_is_initialized ())
- {
- DBG (1, g_warning ("Re-initializing bonobo\n"));
- g_assert (bonobo_init (0, NULL));
- g_assert (bonobo_activate ());
- }
-
if (!registry_died)
- deregister_application (app);
-
+ deregister_application (this_app);
+ this_app = NULL;
DBG (1, g_message ("bridge exit func complete.\n"));
if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
{
- g_assert (!bonobo_debug_shutdown ());
}
if (bridge_display)
XCloseDisplay (bridge_display);
void
gnome_accessibility_module_shutdown (void)
{
- BonoboObject *app = (BonoboObject *) this_app;
int i;
GArray *ids = listener_ids;
}
during_init_shutdown = TRUE;
atk_bridge_initialized = FALSE;
- this_app = NULL;
if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
{
if (atk_bridge_key_event_listener_id)
atk_remove_key_event_listener (atk_bridge_key_event_listener_id);
- deregister_application (app);
+ deregister_application (this_app);
+ this_app = NULL;
misc = NULL;
}
+static void emit(AtkObject *object, const char *name, int first_arg_type, ...)
+{
+ va_list args;
+ DBusMessage *sig;
+ char *path = spi_dbus_get_path(object);
+
+ spi_dbus_update_cache(&this_app->droute);
+ sig = dbus_message_new_signal(path, "org.freedesktop.atspi.Accessible", name);
+ va_start(args, first_arg_type);
+ if (first_arg_type != DBUS_TYPE_INVALID)
+ {
+ dbus_message_append_args_valist(sig, first_arg_type, args);
+ }
+ va_end(args);
+ dbus_connection_send(this_app->droute.bus, sig, NULL);
+ g_free(path);
+ dbus_message_unref(sig);
+}
+
static void
spi_atk_bridge_focus_tracker (AtkObject *object)
{
- SpiAccessible *source;
- Accessibility_Event e;
-
- source = spi_accessible_new (object);
-
- CORBA_exception_init (&ev);
-
- e.type = "focus:";
- e.source = BONOBO_OBJREF (source);
- e.detail1 = 0;
- e.detail2 = 0;
- spi_atk_bridge_init_nil (&e.any_data, object);
- if (BONOBO_EX (&ev))
- registry_died = TRUE;
- else
- {
- bridge_threads_leave ();
- Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (),
- &e, &ev);
- bridge_threads_enter ();
- }
- if (BONOBO_EX (&ev))
- registry_died = TRUE;
-
- bonobo_object_unref (source);
-
- if (e.any_data._release)
- CORBA_free (e.any_data._value);
-
- CORBA_exception_free (&ev);
+ emit(object, "focus", DBUS_TYPE_INVALID);
}
-static void
-spi_atk_emit_eventv (const GObject *gobject,
- long detail1,
- long detail2,
- CORBA_any *any,
- const char *format, ...)
+static void emit_property_change(AtkObject *object, const char *name, int type, void *val)
{
- va_list args;
- Accessibility_Event e;
- AtkObject *aobject;
- SpiAccessible *source = NULL;
- Accessibility_Registry registry;
- const gchar *name;
-#ifdef SPI_BRIDGE_DEBUG
- CORBA_string s = NULL;
-#endif
-
- va_start (args, format);
-
- if (ATK_IS_IMPLEMENTOR (gobject))
- {
- aobject = atk_implementor_ref_accessible (ATK_IMPLEMENTOR (gobject));
- source = spi_accessible_new (aobject);
- g_object_unref (G_OBJECT (aobject));
- }
- else if (ATK_IS_OBJECT (gobject))
- {
- aobject = ATK_OBJECT (gobject);
- if (SPI_IS_REMOTE_OBJECT (aobject))
- e.source = spi_remote_object_get_accessible (SPI_REMOTE_OBJECT (aobject));
- else
- source = spi_accessible_new (aobject);
- }
+ DBusMessage *sig;
+ char *path = spi_dbus_get_path(object);
+ DBusMessageIter iter, sub;
+ const char *type_as_string = NULL;
+
+ spi_dbus_update_cache(&this_app->droute);
+ if (type == DBUS_TYPE_OBJECT_PATH)
+ {
+ type_as_string = "o";
+ if (!val) val = "";
+ }
+ else if (type == DBUS_TYPE_STRING) type_as_string = "s";
+ else if (type == DBUS_TYPE_INT32) type_as_string = "i";
+ else if (type == DBUS_TYPE_UINT32) type_as_string = "o";
else
- {
- aobject = NULL;
- DBG (0, g_warning ("received property-change event from non-AtkImplementor"));
- va_end (args);
- return;
- }
- name = atk_object_get_name (aobject);
- e.type = g_strdup_vprintf (format, args);
- if (source) e.source = BONOBO_OBJREF (source);
- e.detail1 = detail1;
- e.detail2 = detail2;
- if (any) e.any_data = *any;
- else spi_atk_bridge_init_nil (&e.any_data, aobject);
+ {
+ g_warning("Unknown type %d in property change signal", type);
+ }
+ sig = dbus_message_new_signal(path, "org.freedesktop.atspi.Accessible", "PropertyChanged");
+ dbus_message_iter_init_append(sig, &iter);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &name);
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, type_as_string, &sub);
+ dbus_message_iter_append_basic(&sub, type, val);
+ dbus_message_iter_close_container(&iter, &sub);
+ dbus_connection_send(this_app->droute.bus, sig, NULL);
+ g_free(path);
+ dbus_message_unref(sig);
+}
-#ifdef SPI_BRIDGE_DEBUG
- if (e.source != CORBA_OBJECT_NIL)
- s = Accessibility_Accessible__get_name (e.source, &ev);
- g_message ("Emitting event '%s' (%lu, %lu) on %s",
- e.type, e.detail1, e.detail2, s);
- CORBA_free (s);
-#endif
- CORBA_exception_init (&ev);
- registry = spi_atk_bridge_get_registry ();
- if (!registry_died)
+static void emit_rect(AtkObject *object, const char *name, AtkRectangle *rect)
+{
+ DBusMessage *sig;
+ char *path = spi_dbus_get_path(object);
+ DBusMessageIter iter, sub;
+ dbus_uint32_t x, y, width, height;
+
+ spi_dbus_update_cache(&this_app->droute);
+ x = rect->x;
+ y = rect->y;
+ width = rect->width;
+ height = rect->height;
+ sig = dbus_message_new_signal(path, "org.freedesktop.atspi.Accessible", "PropertyChanged");
+ if (sig)
{
- bridge_threads_leave ();
- Accessibility_Registry_notifyEvent (registry,
- &e, &ev);
- bridge_threads_enter ();
-#ifdef SPI_BRIDGE_DEBUG
- if (ev._major != CORBA_NO_EXCEPTION)
- g_message ("error emitting event %s, (%d) %s",
- e.type,
- ev._major,
- CORBA_exception_id(&ev));
-#endif
- if (BONOBO_EX (&ev)) registry_died = TRUE;
+ dbus_message_iter_init_append (sig, &iter);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &name);
+ if (!dbus_message_iter_open_container
+ (&iter, DBUS_TYPE_STRUCT, NULL, &sub))
+ goto oom;
+ dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &x);
+ dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &y);
+ dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &width);
+ dbus_message_iter_append_basic (&sub, DBUS_TYPE_INT32, &height);
+ if (!dbus_message_iter_close_container (&iter, &sub))
+ goto oom;
}
-
- if (source)
- bonobo_object_unref (BONOBO_OBJECT (source));
- else
- Bonobo_Unknown_unref (e.source, &ev);
-
- CORBA_exception_free (&ev);
-
- g_free (e.type);
-
- if (!any && e.any_data._release) CORBA_free (e.any_data._value);
-
- if (any && any->_release) CORBA_free (any->_value);
-
- va_end (args);
-
+ dbus_connection_send(this_app->droute.bus, sig, NULL);
+oom:
+ g_free(path);
+ dbus_message_unref(sig);
}
static gboolean
gpointer data)
{
AtkPropertyValues *values;
- GObject *gobject;
+ AtkObject *obj;
const gchar *prop_name;
- CORBA_any any;
const gchar *sp = NULL;
AtkObject *ao;
- SpiAccessible *s_ao = NULL;
- CORBA_Object c_obj;
+ char *s_ao = NULL;
gint i;
const gchar *name = NULL;
#endif
- gobject = g_value_get_object (param_values + 0);
- name = atk_object_get_name (ATK_OBJECT (gobject));
+ obj = g_value_get_object (param_values + 0);
+ name = atk_object_get_name (obj);
values = (AtkPropertyValues*) g_value_get_pointer (param_values + 1);
prop_name = values->property_name;
if (strcmp (prop_name, "accessible-name") == 0)
{
- spi_atk_bridge_init_string (&any,
- ATK_OBJECT (gobject),
- (gchar **)&name);
+ spi_dbus_notify_change(obj, FALSE, &this_app->droute);
}
else if (strcmp (prop_name, "accessible-description") == 0)
{
- sp = atk_object_get_description (ATK_OBJECT (gobject));
- spi_atk_bridge_init_string (&any,
- ATK_OBJECT (gobject),
- (gchar **)&sp);
+ spi_dbus_notify_change(obj, FALSE, &this_app->droute);
}
else if (strcmp (prop_name, "accessible-parent") == 0)
{
- ao = atk_object_get_parent (ATK_OBJECT (gobject));
- if (ao)
- {
- s_ao = spi_accessible_new (ao);
- c_obj = BONOBO_OBJREF (s_ao);
- spi_atk_bridge_init_object (&any,
- ATK_OBJECT (gobject),
- &c_obj);
- }
- else
- {
- spi_atk_bridge_init_nil (&any,
- ATK_OBJECT (gobject));
- }
+ spi_dbus_notify_change(obj, FALSE, &this_app->droute);
}
else if (strcmp (prop_name, "accessible-table-summary") == 0)
{
- ao = atk_table_get_summary (ATK_TABLE (gobject));
- if (ao)
- {
- s_ao = spi_accessible_new (ao);
- c_obj = BONOBO_OBJREF (s_ao);
- spi_atk_bridge_init_object (&any,
- ATK_OBJECT (gobject),
- &c_obj);
- }
- else
- {
- spi_atk_bridge_init_nil (&any,
- ATK_OBJECT (gobject));
- }
+ ao = atk_table_get_summary (ATK_TABLE (obj));
+ s_ao = spi_dbus_get_path(ao);
+ emit_property_change(obj, prop_name, DBUS_TYPE_OBJECT_PATH, s_ao);
}
else if (strcmp (prop_name, "accessible-table-column-header") == 0)
{
i = g_value_get_int (&(values->new_value));
- ao = atk_table_get_column_header (ATK_TABLE (gobject), i);
- if (ao)
- {
- s_ao = spi_accessible_new (ao);
- c_obj = BONOBO_OBJREF (s_ao);
- spi_atk_bridge_init_object (&any,
- ATK_OBJECT (gobject),
- &c_obj);
- }
- else
- {
- spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject));
- }
+ ao = atk_table_get_column_header (ATK_TABLE (obj), i);
+ s_ao = spi_dbus_get_path(ao);
+ emit_property_change(obj, prop_name, DBUS_TYPE_OBJECT_PATH, s_ao);
}
else if (strcmp (prop_name, "accessible-table-row-header") == 0)
{
i = g_value_get_int (&(values->new_value));
- ao = atk_table_get_row_header (ATK_TABLE (gobject), i);
- if (ao)
- {
- s_ao = spi_accessible_new (ao);
- c_obj = BONOBO_OBJREF (s_ao);
- spi_atk_bridge_init_object (&any, ATK_OBJECT (gobject), &c_obj);
- }
- else
- {
- spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject));
- }
+ ao = atk_table_get_row_header (ATK_TABLE (obj), i);
+ s_ao = spi_dbus_get_path(ao);
+ emit_property_change(obj, prop_name, DBUS_TYPE_OBJECT_PATH, s_ao);
}
else if (strcmp (prop_name, "accessible-table-row-description") == 0)
{
i = g_value_get_int (&(values->new_value));
- sp = atk_table_get_row_description (ATK_TABLE (gobject), i);
- spi_atk_bridge_init_string (&any, ATK_OBJECT (gobject),
- (gchar **)&sp);
+ sp = atk_table_get_row_description (ATK_TABLE (obj), i);
+ emit_property_change(obj, prop_name, DBUS_TYPE_STRING, (void *)&sp);
}
else if (strcmp (prop_name, "accessible-table-column-description") == 0)
{
i = g_value_get_int (&(values->new_value));
- sp = atk_table_get_column_description (ATK_TABLE (gobject), i);
- spi_atk_bridge_init_string (&any, ATK_OBJECT (gobject),
- (gchar **)&sp);
+ sp = atk_table_get_column_description (ATK_TABLE(obj), i);
+ emit_property_change(obj, prop_name, DBUS_TYPE_STRING, (void *)&sp);
}
else if (strcmp (prop_name, "accessible-table-caption-object") == 0)
{
- ao = atk_table_get_caption (ATK_TABLE (gobject));
+ ao = atk_table_get_caption (ATK_TABLE(obj));
sp = atk_object_get_name (ao);
- spi_atk_bridge_init_string (&any, ATK_OBJECT (gobject),
- (gchar **)&sp);
+ emit_property_change(obj, prop_name, DBUS_TYPE_STRING, (void *)&sp);
}
else
{
- spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject));
+ long v = 0;
+ emit_property_change(obj, prop_name, DBUS_TYPE_INT32, &v);
}
-
- spi_atk_emit_eventv (gobject, 0, 0, &any,
- "object:property-change:%s", prop_name);
-
- if (s_ao)
- bonobo_object_unref (BONOBO_OBJECT (s_ao));
-
+ if (s_ao) g_free(s_ao);
return TRUE;
}
const GValue *param_values,
gpointer data)
{
- GObject *gobject;
+ AtkObject *obj;
gchar *property_name;
- gchar *type;
unsigned long detail1;
#ifdef SPI_BRIDGE_DEBUG
GSignalQuery signal_query;
g_type_name (signal_query.itype), name);
#endif
- gobject = g_value_get_object (param_values + 0);
+ obj = ATK_OBJECT(g_value_get_object (param_values + 0));
property_name = g_strdup (g_value_get_string (param_values + 1));
+ /* Ignore defunct for now; we'll send a tree update to remove it when
+ the object goes away */
+ /* Also ignore state changes for objects not yet broadcast */
+ if ((property_name && !strcmp(property_name, "defunct")) ||
+ !spi_dbus_object_is_known(obj))
+ {
+ g_free(property_name);
+ return TRUE;
+ }
detail1 = (g_value_get_boolean (param_values + 2))
? 1 : 0;
- type = g_strdup_printf ("object:state-changed:%s", property_name);
- spi_atk_emit_eventv (gobject,
- detail1,
- 0,
- NULL,
- type);
+ emit(obj, "StateChanged", DBUS_TYPE_STRING, &property_name, DBUS_TYPE_UINT32, &detail1, DBUS_TYPE_INVALID);
g_free (property_name);
- g_free (type);
return TRUE;
}
g_print (_("WARNING: NULL key event reported."));
}
- keystroke->id = (CORBA_long) event->keyval;
- keystroke->hw_code = (CORBA_short) event->keycode;
- keystroke->timestamp = (CORBA_unsigned_long) event->timestamp;
- keystroke->modifiers = (CORBA_unsigned_short) (event->state & 0xFFFF);
+ keystroke->id = (dbus_int32_t) event->keyval;
+ keystroke->hw_code = (dbus_int16_t) event->keycode;
+ keystroke->timestamp = (dbus_uint32_t) event->timestamp;
+ keystroke->modifiers = (dbus_uint16_t) (event->state & 0xFFFF);
if (event->string)
{
gunichar c;
- keystroke->event_string = CORBA_string_dup (event->string);
+ keystroke->event_string = g_strdup (event->string);
c = g_utf8_get_char_validated (event->string, -1);
if (c > 0 && g_unichar_isprint (c))
- keystroke->is_text = CORBA_TRUE;
+ keystroke->is_text = TRUE;
else
- keystroke->is_text = CORBA_FALSE;
+ keystroke->is_text = FALSE;
}
else
{
- keystroke->event_string = CORBA_string_dup ("");
- keystroke->is_text = CORBA_FALSE;
+ keystroke->event_string = g_strdup ("");
+ keystroke->is_text = FALSE;
}
switch (event->type)
{
#endif
}
+static gboolean Accessibility_DeviceEventController_notifyListenersSync(const Accessibility_DeviceEvent *key_event)
+{
+ DBusMessage *message = dbus_message_new_method_call(SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_REGISTRY, "org.freedesktop.atspi.DeviceEventController", "notifyListenersSync");
+ DBusError error;
+ dbus_bool_t consumed = FALSE;
+
+ dbus_error_init(&error);
+ if (spi_dbus_marshall_deviceEvent(message, key_event))
+ {
+ DBusMessage *reply = dbus_connection_send_with_reply_and_block(this_app->droute.bus, message, 1000, &error);
+ if (reply)
+ {
+ DBusError error;
+ dbus_error_init(&error);
+ dbus_message_get_args(reply, &error, DBUS_TYPE_BOOLEAN, &consumed, DBUS_TYPE_INVALID);
+ dbus_message_unref(reply);
+ }
+ }
+ dbus_message_unref(message);
+ return consumed;
+}
+
static gint
spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data)
{
- CORBA_boolean result;
+ gboolean result;
Accessibility_DeviceEvent key_event;
- CORBA_exception_init (&ev);
-
spi_init_keystroke_from_atk_key_event (&key_event, event);
- result = Accessibility_DeviceEventController_notifyListenersSync (
- spi_atk_bridget_get_dec (), &key_event, &ev);
-
- if (key_event.event_string) CORBA_free (key_event.event_string);
+ bridge_threads_leave ();
+ result = Accessibility_DeviceEventController_notifyListenersSync (&key_event);
+ bridge_threads_enter ();
- if (BONOBO_EX(&ev))
- {
- result = FALSE;
- CORBA_exception_free (&ev);
- }
+ if (key_event.event_string) g_free (key_event.event_string);
return result;
}
const GValue *param_values,
gpointer data)
{
- GObject *gobject;
+ AtkObject *obj;
GSignalQuery signal_query;
const gchar *name;
const gchar *detail;
- CORBA_any any;
- CORBA_Object c_obj;
char *sp = NULL;
AtkObject *ao;
gint detail1 = 0, detail2 = 0;
- SpiAccessible *s_ao = NULL;
+ char *s_ao = NULL;
+ gchar *sig_name;
+ char *p;
#ifdef SPI_BRIDGE_DEBUG
const gchar *s, *s2;
#endif
name = signal_query.signal_name;
if (signal_hint->detail)
+ {
detail = g_quark_to_string (signal_hint->detail);
+ sig_name = g_strdup_printf("object_%s_%s", name, detail);
+ }
else
+ {
detail = NULL;
+ sig_name = g_strdup_printf("object_%s", name);
+ }
+ while ((p = strchr(sig_name, '-')) != NULL) *p = '_';
#ifdef SPI_BRIDGE_DEBUG
s2 = g_type_name (G_OBJECT_TYPE (g_value_get_object (param_values + 0)));
detail ? detail : "<NULL>", s ? s : "<NULL>" , s2);
#endif
- gobject = g_value_get_object (param_values + 0);
+ obj = ATK_OBJECT(g_value_get_object (param_values + 0));
if (signal_query.signal_id == atk_signal_active_descendant_changed)
{
ao = ATK_OBJECT (child);
detail1 = atk_object_get_index_in_parent (ao);
- s_ao = spi_accessible_new (ao);
- c_obj = BONOBO_OBJREF (s_ao);
- spi_atk_bridge_init_object (&any, ATK_OBJECT (gobject), &c_obj);
+ s_ao = spi_dbus_get_path(child);
+ emit(obj, "name", DBUS_TYPE_OBJECT_PATH, s_ao, DBUS_TYPE_UINT32, &detail1, DBUS_TYPE_INVALID);
+ g_free(s_ao);
}
else if (signal_query.signal_id == atk_signal_link_selected)
{
if (G_VALUE_TYPE (param_values + 1) == G_TYPE_INT)
detail1 = g_value_get_int (param_values + 1);
- spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject));
+ emit(obj, "LinkSelected", DBUS_TYPE_UINT32, &detail1, DBUS_TYPE_INVALID);
}
else if (signal_query.signal_id == atk_signal_bounds_changed)
{
if (G_VALUE_HOLDS_BOXED (param_values + 1))
atk_rect = g_value_get_boxed (param_values + 1);
- spi_atk_bridge_init_rect (&any, ATK_OBJECT (gobject), atk_rect);
+ emit_rect(obj, "BoundsChanged", atk_rect);
}
- else if ((signal_query.signal_id == atk_signal_children_changed) && gobject)
+ else if ((signal_query.signal_id == atk_signal_children_changed) && obj)
{
- detail1 = g_value_get_uint (param_values + 1);
- ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject),
- detail1);
- if (ao)
- {
- s_ao = spi_accessible_new (ao);
- c_obj = BONOBO_OBJREF (s_ao);
- spi_atk_bridge_init_object (&any, ATK_OBJECT (gobject), &c_obj);
- g_object_unref (ao);
- }
- else
- {
- spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject));
- }
+ spi_dbus_notify_change(obj, FALSE, &this_app->droute);
}
else
{
if (signal_query.signal_id == atk_signal_text_changed)
{
- sp = atk_text_get_text (ATK_TEXT (gobject),
+ sp = atk_text_get_text (ATK_TEXT (obj),
detail1,
detail1+detail2);
- spi_atk_bridge_init_string (&any, ATK_OBJECT (gobject),
- (gchar **) &sp);
+ emit(obj, sig_name, DBUS_TYPE_UINT32, &detail1, DBUS_TYPE_UINT32, &detail2, DBUS_TYPE_STRING, &sp, DBUS_TYPE_INVALID);
}
else if (signal_query.signal_id == atk_signal_text_selection_changed)
{
/* Return NULL as the selected string */
- spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject));
+ // TODO
+ emit(obj, sig_name, DBUS_TYPE_INVALID);
}
else
{
- spi_atk_bridge_init_nil (&any, ATK_OBJECT (gobject));
+ emit(obj, sig_name, DBUS_TYPE_INVALID);
}
}
- if (detail)
- spi_atk_emit_eventv (gobject, detail1, detail2, &any,
- "object:%s:%s", name, detail);
- else
- spi_atk_emit_eventv (gobject, detail1, detail2, &any,
- "object:%s", name);
-
if (sp)
g_free (sp);
if (s_ao)
- bonobo_object_unref (BONOBO_OBJECT (s_ao));
+ g_free (s_ao);
+ g_free(sig_name);
return TRUE;
}
const GValue *param_values,
gpointer data)
{
- GObject *gobject;
+ AtkObject *obj;
GSignalQuery signal_query;
- CORBA_any any;
const gchar *name, *s;
#ifdef SPI_BRIDGE_DEBUG
const gchar *s2;
g_signal_query (signal_hint->signal_id, &signal_query);
name = signal_query.signal_name;
+ gchar *sig_name;
#ifdef SPI_BRIDGE_DEBUG
s2 = g_type_name (G_OBJECT_TYPE (g_value_get_object (param_values + 0)));
g_type_name (signal_query.itype), name, s ? s : "<NULL>" , s2);
#endif
- gobject = g_value_get_object (param_values + 0);
+ obj = ATK_OBJECT(g_value_get_object (param_values + 0));
+
+ s = atk_object_get_name (obj);
+ sig_name = g_strdup_printf("window_%s", name);
+ emit(obj, sig_name, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID);
+ g_free(sig_name);
- s = atk_object_get_name (ATK_OBJECT (gobject));
- spi_atk_bridge_init_string (&any, ATK_OBJECT (gobject), (gchar **) &s);
-
- spi_atk_emit_eventv (gobject, 0, 0, &any,
- "window:%s", name);
return TRUE;
}
const GValue *param_values,
gpointer data)
{
- GObject *gobject;
+ AtkObject *obj;
GSignalQuery signal_query;
- CORBA_any any;
const gchar *name, *s;
+ gchar *sig_name;
#ifdef SPI_BRIDGE_DEBUG
const gchar *s2;
#endif
g_type_name (signal_query.itype), name, s ? s : "<NULL>" , s2);
#endif
- gobject = g_value_get_object (param_values + 0);
+ obj = ATK_OBJECT(g_value_get_object (param_values + 0));
- s = atk_object_get_name (ATK_OBJECT (gobject));
- spi_atk_bridge_init_string (&any, ATK_OBJECT (gobject), (gchar **) &s);
-
- spi_atk_emit_eventv (gobject, 0, 0, &any,
- "document:%s", name);
+ s = atk_object_get_name (obj);
+ sig_name = g_strdup_printf("document_%s", name);
+ emit(obj, sig_name, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID);
+ g_free(sig_name);
return TRUE;
}
{
AtkObject *child;
AtkStateSet *stateset;
- CORBA_any any;
const gchar *name;
child = atk_object_ref_accessible_child (root, i);
name = atk_object_get_name (child);
if (atk_state_set_contains_state (stateset, ATK_STATE_ACTIVE))
{
- spi_atk_bridge_init_string (&any, child, (gchar**) &name);
- spi_atk_emit_eventv (G_OBJECT (child), 0, 0, &any, "window:deactivate");
- if (registry_died)
- return;
+ emit(child, "window:deactivate", DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
}
g_object_unref (stateset);
- spi_atk_bridge_init_string (&any, child, (gchar**) &name);
- spi_atk_emit_eventv (G_OBJECT (child), 0, 0, &any, "window:destroy");
+ emit(child, "window:destroy", DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
g_object_unref (child);
}
}
static void
reinit_register_vars (void)
{
- registry = CORBA_OBJECT_NIL;
- device_event_controller = CORBA_OBJECT_NIL;
+ registry = NULL;
+ device_event_controller = NULL;
this_app = NULL;
}
-
-static void
-spi_atk_bridge_init_base (CORBA_any *any, AtkObject *obj,
- Accessibility_Application *app, Accessibility_Role *role,
- CORBA_string *name)
-{
- const gchar *s = atk_object_get_name (obj);
- *app = spi_accessible_new_return (atk_get_root (), FALSE, NULL);
- *role = spi_role_from_atk_role (atk_object_get_role (obj));
- *name = s ? s : ""; /* string gets dup-ed in util.c spi_init_any_* */
-}
-
-static void
-spi_atk_bridge_init_nil (CORBA_any *any, AtkObject *obj)
-{
- Accessibility_Application app = CORBA_OBJECT_NIL;
- Accessibility_Role role = Accessibility_ROLE_UNKNOWN;
- CORBA_string name;
- spi_atk_bridge_init_base (any, obj, &app, &role, &name);
- spi_init_any_nil (any, app, role, name);
-}
-
-static void
-spi_atk_bridge_init_object (CORBA_any *any, AtkObject *obj, CORBA_Object *c_obj)
-{
- Accessibility_Application app = CORBA_OBJECT_NIL;
- Accessibility_Role role = Accessibility_ROLE_UNKNOWN;
- CORBA_string name;
- spi_atk_bridge_init_base (any, obj, &app, &role, &name);
- spi_init_any_object (any, app, role, name, c_obj);
-}
-
-static void
-spi_atk_bridge_init_string (CORBA_any *any, AtkObject *obj, gchar **string)
-{
- Accessibility_Application app = CORBA_OBJECT_NIL;
- Accessibility_Role role = Accessibility_ROLE_UNKNOWN;
- CORBA_string name;
- spi_atk_bridge_init_base (any, obj, &app, &role, &name);
- spi_init_any_string (any, app, role, name, string);
-}
-
-static void
-spi_atk_bridge_init_rect (CORBA_any *any, AtkObject *obj, AtkRectangle *rect)
-{
- Accessibility_Application app = CORBA_OBJECT_NIL;
- Accessibility_Role role = Accessibility_ROLE_UNKNOWN;
- CORBA_string name;
- spi_atk_bridge_init_base (any, obj, &app, &role, &name);
- spi_init_any_rect (any, app, role, name, rect);
-}
-
projects / platform / core / uifw / at-spi2-atk.git / blobdiff