2007-03-02 Li Yuan <li.yuan@sun.com>

[platform/core/uifw/at-spi2-atk.git] / atk-bridge / bridge.c

diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index 901f5b3..ef4bb40 100644 (file)
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -46,6 +46,11 @@
 
 #define DBG(a,b) if(_dbg>=(a))b
 
+#define bridge_threads_leave() \
+  if (!during_init_shutdown) atk_misc_threads_leave(misc)
+#define bridge_threads_enter() \
+  if (!during_init_shutdown) atk_misc_threads_enter(misc)
+
 int _dbg = 0;
 static CORBA_Environment ev;
 static Accessibility_Registry registry = CORBA_OBJECT_NIL;
@@ -55,6 +60,8 @@ static gboolean registry_died = FALSE;
 static gboolean atk_listeners_registered = FALSE;
 static gint toplevels = 0;
 static gboolean exiting = FALSE;
+static AtkMisc *misc = NULL;
+static gboolean during_init_shutdown = TRUE;
 
 static guint atk_signal_text_changed;
 static guint atk_signal_children_changed;
@@ -170,6 +177,13 @@ spi_atk_bridge_init_event_type_consts ()
   done = TRUE;
 }
 
+static gboolean
+post_init (void)
+{
+  during_init_shutdown = FALSE;
+  return FALSE;
+}
+
 static int
 atk_bridge_init (gint *argc, gchar **argv[])
 {
@@ -184,6 +198,8 @@ atk_bridge_init (gint *argc, gchar **argv[])
   atk_bridge_initialized = TRUE;
   atk_bridge_pid = getpid ();
 
+  misc = atk_misc_get_instance();
+
   if (g_getenv ("ATK_BRIDGE_REDIRECT_LOG"))
   {
       fname = g_strconcat ("/tmp/", g_get_prgname (), ".at-spi-log", NULL);
@@ -220,11 +236,17 @@ atk_bridge_init (gint *argc, gchar **argv[])
                         "children-changed::remove",
                         (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);
     }
   else
     {
       success = spi_atk_bridge_do_registration ();
     }
+  /*
+   * we must emit events even if we are not registered as a
+   * full-fledged app; See bugzilla #400709.
+   */
   if (success) 
     {
       spi_atk_register_event_listeners ();
@@ -234,6 +256,8 @@ atk_bridge_init (gint *argc, gchar **argv[])
     {
       atk_bridge_initialized = FALSE;
     }
+  g_idle_add (post_init, NULL);
+
   return 0;
 }
 
@@ -302,9 +326,11 @@ spi_atk_bridge_toplevel_removed (AtkObject *object,
 static void
 spi_atk_bridge_register_application (Accessibility_Registry registry)
 {
+  bridge_threads_leave ();
   Accessibility_Registry_registerApplication (spi_atk_bridge_get_registry (),
                                               BONOBO_OBJREF (this_app),
                                               &ev);
+  bridge_threads_enter ();
   if (ev._major != CORBA_NO_EXCEPTION)
     CORBA_exception_free (&ev);
 }
@@ -554,8 +580,10 @@ spi_atk_register_event_listeners (void)
 static void
 deregister_application (BonoboObject *app)
 {
-  Accessibility_Registry registry = spi_atk_bridge_get_registry ();    
+  Accessibility_Registry registry = spi_atk_bridge_get_registry ();
+  bridge_threads_leave ();
   Accessibility_Registry_deregisterApplication (registry, BONOBO_OBJREF (app), &ev);
+  bridge_threads_enter ();
 
   device_event_controller = bonobo_object_release_unref (device_event_controller, &ev);
   registry = bonobo_object_release_unref (registry, &ev);
@@ -580,6 +608,7 @@ spi_atk_bridge_exit_func (void)
       _exit (0);
     }
 
+  during_init_shutdown = TRUE;
   exiting = TRUE;
   /*
    * Check whether we still have windows which have not been deleted.
@@ -632,6 +661,7 @@ gnome_accessibility_module_shutdown (void)
     {
       return;
     }
+  during_init_shutdown = TRUE;
   atk_bridge_initialized = FALSE;
   this_app = NULL;
 
@@ -653,6 +683,8 @@ gnome_accessibility_module_shutdown (void)
           atk_remove_key_event_listener (atk_bridge_key_event_listener_id);
 
   deregister_application (app);
+
+  misc = NULL;
 }
 
 static void
@@ -672,9 +704,12 @@ spi_atk_bridge_focus_tracker (AtkObject *object)
   spi_atk_bridge_init_nil (&e.any_data, object);
   if (BONOBO_EX (&ev))
       registry_died = TRUE;
-  else             
+  else {
+      bridge_threads_leave ();   
       Accessibility_Registry_notifyEvent (spi_atk_bridge_get_registry (), 
                                          &e, &ev);
+      bridge_threads_enter ();
+  }
   if (BONOBO_EX (&ev))
     registry_died = TRUE;
 
@@ -742,9 +777,10 @@ spi_atk_emit_eventv (const GObject         *gobject,
   registry = spi_atk_bridge_get_registry ();
   if (!registry_died)
   {
- 
+    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",