#include <string.h>
#include <stdio.h>
+#include <unistd.h>
#include <stdlib.h>
#include <stdarg.h>
#include <libbonobo.h>
#include <libspi/spi-private.h>
#include "accessible.h"
#include "application.h"
-
#include <bonobo-activation/bonobo-activation-register.h>
#undef SPI_BRIDGE_DEBUG
#define DBG(a,b) if(_dbg>=(a))b
-static int _dbg = 0;
+int _dbg = 0;
static CORBA_Environment ev;
static Accessibility_Registry registry = CORBA_OBJECT_NIL;
static Accessibility_DeviceEventController device_event_controller = CORBA_OBJECT_NIL;
static gboolean registry_died = FALSE;
static gboolean atk_listeners_registered = FALSE;
static gint toplevels = 0;
+static gboolean exiting = FALSE;
static guint atk_signal_text_changed;
static guint atk_signal_children_changed;
*/
static guint atk_signal_link_selected;
+static guint atk_signal_bounds_changed;
static Accessibility_Registry spi_atk_bridge_get_registry (void);
static void spi_atk_bridge_do_registration (void);
static void spi_atk_bridge_exit_func (void);
static void spi_atk_register_event_listeners (void);
-static void spi_atk_deregister_event_listeners (void);
static void spi_atk_bridge_focus_tracker (AtkObject *object);
static void spi_atk_bridge_register_application (Accessibility_Registry registry);
static gboolean spi_atk_bridge_property_event_listener (GSignalInvocationHint *signal_hint,
extern void gnome_accessibility_module_shutdown (void);
static int atk_bridge_initialized = FALSE;
+static pid_t atk_bridge_pid = 0;
static guint atk_bridge_focus_tracker_id = 0;
static guint atk_bridge_key_event_listener_id = 0;
static GArray *listener_ids = NULL;
static void
spi_atk_bridge_init_event_type_consts ()
{
+ static gboolean done = FALSE;
+
+ if (done)
+ return;
+
atk_signal_children_changed = g_signal_lookup ("children_changed",
ATK_TYPE_OBJECT);
atk_signal_text_changed = g_signal_lookup ("text_changed",
ATK_TYPE_TEXT);
+ atk_signal_bounds_changed = g_signal_lookup ("bounds_changed",
+ ATK_TYPE_COMPONENT);
atk_signal_active_descendant_changed =
g_signal_lookup ("active_descendant_changed",
- ATK_TYPE_OBJECT);
+ ATK_TYPE_OBJECT);
atk_signal_link_selected = g_signal_lookup ("link_selected",
ATK_TYPE_HYPERTEXT);
atk_signal_text_selection_changed = g_signal_lookup ("text_selection_changed",
ATK_TYPE_TEXT);
+ done = TRUE;
}
static int
atk_bridge_init (gint *argc, gchar **argv[])
{
const char *debug_env_string = g_getenv ("AT_SPI_DEBUG");
+ gchar *fname;
if (atk_bridge_initialized)
{
return 0;
}
atk_bridge_initialized = TRUE;
+ atk_bridge_pid = getpid ();
- if (debug_env_string)
- _dbg = (int) g_ascii_strtod (debug_env_string, NULL);
+ if (g_getenv ("ATK_BRIDGE_REDIRECT_LOG"))
+ {
+ fname = g_strconcat ("/tmp/", g_get_prgname (), ".at-spi-log", NULL);
+ /* make sure we're not being redirected - security issue */
+ if (!g_file_test (fname, G_FILE_TEST_IS_SYMLINK))
+ freopen (fname, "w", stderr);
+ g_free (fname);
+ }
+
+ 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");
}
+ /* 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
{
spi_atk_bridge_do_registration ();
}
-
+ spi_atk_register_event_listeners ();
spi_atk_bridge_init_event_type_consts ();
-
+
return 0;
}
bonobo_activate ();
/* Create the accessible application server object */
-
- this_app = spi_application_new (atk_get_root ());
+ if (this_app == NULL)
+ this_app = spi_application_new (atk_get_root ());
DBG (1, g_message ("About to register application\n"));
AtkObject *child)
{
if (toplevels == 0)
- spi_atk_bridge_do_registration ();
+ {
+ spi_atk_bridge_do_registration ();
+ }
toplevels++;
}
if (toplevels == 0)
{
deregister_application (app);
- spi_atk_deregister_event_listeners ();
reinit_register_vars ();
}
if (toplevels < 0)
Accessibility_Registry_registerApplication (spi_atk_bridge_get_registry (),
BONOBO_OBJREF (this_app),
&ev);
- spi_atk_register_event_listeners ();
+}
+
+/*
+ * Returns a 'canonicalized' value for DISPLAY,
+ * with the screen number stripped off if present.
+ */
+static const gchar*
+spi_display_name (void)
+{
+ static const char *canonical_display_name = NULL;
+ if (!canonical_display_name)
+ {
+ const gchar *display_env = g_getenv ("AT_SPI_DISPLAY");
+ if (!display_env)
+ {
+ display_env = g_getenv ("DISPLAY");
+ if (!display_env || !display_env[0])
+ canonical_display_name = ":0";
+ else
+ {
+ gchar *display_p, *screen_p;
+ canonical_display_name = g_strdup (display_env);
+ display_p = strrchr (canonical_display_name, ':');
+ screen_p = strrchr (canonical_display_name, '.');
+ if (screen_p && display_p && ((guint) screen_p > (guint) display_p))
+ {
+ *screen_p = '\0';
+ }
+ }
+ }
+ else
+ {
+ canonical_display_name = display_env;
+ }
+ }
+ return canonical_display_name;
}
static Accessibility_Registry
if (registry_died || (registry == CORBA_OBJECT_NIL)) {
CORBA_exception_init (&ev);
if (registry_died)
- DBG (1, g_warning ("registry died! restarting..."));
+ {
+ if (exiting)
+ return CORBA_OBJECT_NIL;
+ 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);
if (BONOBO_EX (&ev))
{
- g_warning ("failure: no deviceeventcontroller found\n");
+ g_warning (_("failure: no device event controller found.\n"));
registry_died = TRUE;
device_event_controller = CORBA_OBJECT_NIL;
}
add_signal_listener ("Gtk:AtkObject:children-changed");
add_signal_listener ("Gtk:AtkObject:visible-data-changed");
add_signal_listener ("Gtk:AtkObject:active-descendant-changed");
+ add_signal_listener ("Gtk:AtkComponent:bounds-changed");
add_signal_listener ("Gtk:AtkSelection:selection-changed");
add_signal_listener ("Gtk:AtkText:text-selection-changed");
add_signal_listener ("Gtk:AtkText:text-changed");
}
static void
-spi_atk_deregister_event_listeners (void)
-{
- gint i;
- guint id;
-
- if (!atk_listeners_registered)
- return;
-
- atk_listeners_registered = FALSE;
-
- for (i = 0; i < listener_ids->len; i++)
- {
- id = g_array_index (listener_ids, guint, i);
- atk_remove_global_event_listener (id);
- }
- g_array_free (listener_ids, TRUE);
- listener_ids = NULL;
-
- atk_remove_focus_tracker (atk_bridge_focus_tracker_id);
- atk_bridge_focus_tracker_id = 0;
-
- atk_remove_key_event_listener (atk_bridge_key_event_listener_id);
- atk_bridge_key_event_listener_id = 0;
-}
-
-static void
deregister_application (BonoboObject *app)
{
Accessibility_Registry registry = spi_atk_bridge_get_registry ();
return;
}
this_app = NULL;
+ if (atk_bridge_pid != getpid ())
+ {
+ _exit (0);
+ }
+ exiting = TRUE;
/*
* Check whether we still have windows which have not been deleted.
*/
g_assert (bonobo_activate ());
}
- deregister_application (app);
+ if (!registry_died)
+ deregister_application (app);
DBG (1, g_message ("bridge exit func complete.\n"));
{
atk_bridge_init (NULL, NULL);
- g_print("Atk Accessibilty bridge initialized\n");
+ if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
+ {
+ g_print("Atk Accessibility bridge initialized\n");
+ }
}
void
atk_bridge_initialized = FALSE;
this_app = NULL;
- g_print("Atk Accessibilty bridge shutdown\n");
+ if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
+ {
+ g_print("Atk Accessibility bridge shutdown\n");
+ }
listener_ids = NULL;
atk_remove_focus_tracker (atk_bridge_focus_tracker_id);
Accessibility_Event e;
SpiAccessible *source;
AtkObject *aobject;
+ Accessibility_Registry registry;
#ifdef SPI_BRIDGE_DEBUG
CORBA_string s;
#endif
CORBA_free (s);
#endif
CORBA_exception_init (&ev);
- Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (),
+ registry = spi_atk_bridge_get_registry ();
+ if (registry_died)
+ return;
+
+ Accessibility_Registry_notifyEvent (registry,
&e, &ev);
#ifdef SPI_BRIDGE_DEBUG
if (ev._major != CORBA_NO_EXCEPTION)
else
#endif
if (!event)
- {
- g_print ("WARNING: NULL key event!");
+ { /* this doesn't really need translating */
+ g_print (_("WARNING: NULL key event reported."));
}
keystroke->id = (CORBA_long) event->keyval;
result = Accessibility_DeviceEventController_notifyListenersSync (
spi_atk_bridget_get_dec (), &key_event, &ev);
- CORBA_exception_free (&ev);
+ if (BONOBO_EX(&ev)) {
+ result = FALSE;
+ CORBA_exception_free (&ev);
+ }
return result;
}
detail1 = g_value_get_int (param_values + 1);
spi_init_any_nil (&any);
}
+ else if (signal_query.signal_id == atk_signal_bounds_changed)
+ {
+ AtkRectangle *atk_rect = NULL;
+
+ if (G_VALUE_HOLDS_BOXED (param_values + 1))
+ atk_rect = g_value_get_boxed (param_values + 1);
+ spi_init_any_rect (&any, atk_rect);
+ }
else if ((signal_query.signal_id == atk_signal_children_changed) && gobject)
{
ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject),
if (atk_state_set_contains_state (stateset, ATK_STATE_ACTIVE))
{
spi_atk_emit_eventv (G_OBJECT (child), 0, 0, &any, "window:deactivate");
+ if (registry_died)
+ return;
}
- g_free (stateset);
+ g_object_unref (stateset);
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