#include "config.h"
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
static guint atk_signal_bounds_changed;
static Accessibility_Registry spi_atk_bridge_get_registry (void);
-static void spi_atk_bridge_do_registration (void);
+static gboolean spi_atk_bridge_do_registration (void);
static void spi_atk_bridge_toplevel_added (AtkObject *object,
guint index,
AtkObject *child);
static void spi_atk_bridge_exit_func (void);
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 gboolean spi_atk_bridge_property_event_listener (GSignalInvocationHint *signal_hint,
guint n_param_values,
{
const char *debug_env_string = g_getenv ("AT_SPI_DEBUG");
gchar *fname;
+ gboolean success = FALSE;
if (atk_bridge_initialized)
{
}
else
{
- spi_atk_bridge_do_registration ();
+ success = spi_atk_bridge_do_registration ();
+ }
+ if (success)
+ {
+ spi_atk_register_event_listeners ();
+ spi_atk_bridge_init_event_type_consts ();
+ }
+ else
+ {
+ atk_bridge_initialized = FALSE;
}
- spi_atk_register_event_listeners ();
- spi_atk_bridge_init_event_type_consts ();
-
return 0;
}
-static void
+static gboolean
spi_atk_bridge_do_registration (void)
{
CORBA_Environment ev;
if (spi_atk_bridge_get_registry () == CORBA_OBJECT_NIL)
{
- g_error ("Could not locate registry");
+ g_warning ("Could not locate registry");
+ return FALSE;
}
bonobo_activate ();
g_atexit (spi_atk_bridge_exit_func);
DBG (1, g_message ("Application registered & listening\n"));
-
+ return TRUE;
}
static void
Accessibility_Registry_registerApplication (spi_atk_bridge_get_registry (),
BONOBO_OBJREF (this_app),
&ev);
+ if (ev._major != CORBA_NO_EXCEPTION)
+ CORBA_exception_free (&ev);
}
/*
return canonical_display_name;
}
+static Display *bridge_display = NULL;
+
+static gchar *
+spi_atk_bridge_get_registry_ior (void)
+{
+
+ Atom AT_SPI_IOR;
+ Atom actual_type;
+ int actual_format;
+ unsigned char *data = NULL;
+ unsigned long nitems;
+ unsigned long leftover;
+ if (!bridge_display)
+ bridge_display = XOpenDisplay (spi_display_name ());
+
+ AT_SPI_IOR = XInternAtom (bridge_display, "AT_SPI_IOR", False);
+ XGetWindowProperty(bridge_display,
+ XDefaultRootWindow (bridge_display),
+ AT_SPI_IOR, 0L,
+ (long)BUFSIZ, False,
+ (Atom) 31, &actual_type, &actual_format,
+ &nitems, &leftover, &data);
+ if (data == NULL)
+ g_warning (_("AT_SPI_REGISTRY was not started at session startup."));
+
+ return (gchar *) data;
+
+}
+
+
static Accessibility_Registry
spi_atk_bridge_get_registry (void)
{
CORBA_Environment ev;
+ char *ior = NULL;
if (registry_died || (registry == CORBA_OBJECT_NIL)) {
CORBA_exception_init (&ev);
else
DBG (1, g_warning ("registry died! restarting..."));
}
- bonobo_activation_set_activation_env_value ("AT_SPI_DISPLAY", spi_display_name ());
- registry = bonobo_activation_activate_from_id (
- "OAFIID:Accessibility_Registry:1.0", 0, NULL, &ev);
+ /* 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);
+ else {
+ g_warning ("IOR not set.");
+ registry = CORBA_OBJECT_NIL;
+ }
if (ev._major != CORBA_NO_EXCEPTION)
{
{
g_assert (!bonobo_debug_shutdown ());
}
+ if (bridge_display)
+ XCloseDisplay (bridge_display);
}
void
}
listener_ids = NULL;
- atk_remove_focus_tracker (atk_bridge_focus_tracker_id);
+ if (atk_bridge_focus_tracker_id)
+ atk_remove_focus_tracker (atk_bridge_focus_tracker_id);
for (i = 0; ids && i < ids->len; i++)
{
atk_remove_global_event_listener (g_array_index (ids, guint, i));
}
- atk_remove_key_event_listener (atk_bridge_key_event_listener_id);
+ if (atk_bridge_key_event_listener_id)
+ atk_remove_key_event_listener (atk_bridge_key_event_listener_id);
deregister_application (app);
}
#endif
CORBA_exception_init (&ev);
registry = spi_atk_bridge_get_registry ();
- if (registry_died) {
- g_free (e.type);
- return;
- }
- Accessibility_Registry_notifyEvent (registry,
- &e, &ev);
+ if (!registry_died)
+ {
+
+ Accessibility_Registry_notifyEvent (registry,
+ &e, &ev);
#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));
+ 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;
-
+ if (BONOBO_EX (&ev)) registry_died = TRUE;
+ }
+
if (source)
bonobo_object_unref (BONOBO_OBJECT (source));
else
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);
spi_atk_emit_eventv (gobject, 0, 0, &any,
"object:property-change:%s", prop_name);
+ if (s_ao)
+ bonobo_object_unref (BONOBO_OBJECT (s_ao));
return TRUE;
}
if (sp)
g_free (sp);
+ if (s_ao)
+ bonobo_object_unref (BONOBO_OBJECT (s_ao));
+
return TRUE;
}
stateset = atk_object_ref_state_set (child);
name = atk_object_get_name (child);
- spi_atk_bridge_init_string (&any, child, (gchar**) &name);
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;
}
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");
g_object_unref (child);
}
projects / platform / core / uifw / at-spi2-atk.git / blobdiff