* AT-SPI - Assistive Technology Service Provider Interface
* (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
*
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
cspi_object_hash (gconstpointer key)
{
CORBA_Object object = (CORBA_Object) key;
- guint retval;
-
- retval = CORBA_Object_hash (object, 0, &ev);
- return retval;
+ return CORBA_Object_hash (object, 0, &ev);
}
static gboolean
{
CORBA_Object objecta = (CORBA_Object) a;
CORBA_Object objectb = (CORBA_Object) b;
- gboolean retval;
-
- retval = CORBA_Object_is_equivalent (objecta, objectb, &ev);
- return retval;
+ return CORBA_Object_is_equivalent (objecta, objectb, &ev);
}
static void
-cspi_object_release (gpointer value)
+cspi_object_release (gpointer value)
{
Accessible *a = (Accessible *) value;
g_print ("releasing %p => %p\n", a, a->objref);
#endif
- cspi_release_unref (a->objref);
+ if (!a->on_loan)
+ {
+ cspi_release_unref (a->objref);
+ }
memset (a, 0xaa, sizeof (Accessible));
a->ref_count = -1;
}
SPIBoolean
-cspi_accessible_is_a (Accessible *obj,
+cspi_accessible_is_a (Accessible *accessible,
const char *interface_name)
{
SPIBoolean retval;
Bonobo_Unknown unknown;
- if (obj == NULL)
+ if (accessible == NULL)
{
return FALSE;
}
- unknown = Bonobo_Unknown_queryInterface (CSPI_OBJREF (obj),
+ unknown = Bonobo_Unknown_queryInterface (CSPI_OBJREF (accessible),
interface_name, cspi_ev ());
if (ev._major != CORBA_NO_EXCEPTION)
CORBA_Environment *
cspi_ev (void)
{
+ CORBA_exception_init (&ev);
return &ev;
}
cspi_registry (void)
{
if (!cspi_ping (registry))
- registry = cspi_init ();
+ {
+ registry = cspi_init ();
+ }
return registry;
}
return retval;
}
-Accessible *
-cspi_object_new (CORBA_Object corba_object)
+/*
+ * This method swallows the corba_object BonoboUnknown
+ * reference, and returns an Accessible associated with it.
+ * If the reference is loaned, it means it is only valid
+ * between a borrow / return pair.
+ */
+static Accessible *
+cspi_object_get_ref (CORBA_Object corba_object, gboolean on_loan)
{
Accessible *ref;
}
else
{
- ref = malloc (sizeof (Accessible));
-// ref->objref = CORBA_Object_duplicate (corba_object, cspi_ev ());
- ref->objref = corba_object;
- ref->ref_count = 1;
+ if ((ref = g_hash_table_lookup (cspi_get_live_refs (), corba_object)))
+ {
+ g_assert (ref->ref_count > 0);
+ ref->ref_count++;
+ if (!on_loan)
+ {
+ if (ref->on_loan) /* Convert to a permanant ref */
+ {
+ ref->on_loan = FALSE;
+ }
+ else
+ {
+ cspi_release_unref (corba_object);
+ }
+ }
+#ifdef DEBUG_OBJECTS
+ g_print ("returning cached %p => %p\n", ref, ref->objref);
+#endif
+ }
+ else
+ {
+ ref = malloc (sizeof (Accessible));
+ ref->objref = corba_object;
+ ref->ref_count = 1;
+ ref->on_loan = on_loan;
+#ifdef DEBUG_OBJECTS
+ g_print ("allocated %p => %p\n", ref, corba_object);
+#endif
+ g_hash_table_insert (cspi_get_live_refs (), ref->objref, ref);
+ }
}
return ref;
Accessible *
cspi_object_add (CORBA_Object corba_object)
{
- return cspi_object_add_ref (corba_object, FALSE);
+ return cspi_object_get_ref (corba_object, FALSE);
}
Accessible *
-cspi_object_add_ref (CORBA_Object corba_object, gboolean do_ref)
+cspi_object_borrow (CORBA_Object corba_object)
{
- Accessible *ref;
+ return cspi_object_get_ref (corba_object, TRUE);
+}
- if (corba_object == CORBA_OBJECT_NIL)
+void
+cspi_object_return (Accessible *accessible)
+{
+ g_return_if_fail (accessible != NULL);
+
+ if (!accessible->on_loan ||
+ accessible->ref_count == 1)
{
- ref = NULL;
+ cspi_object_unref (accessible);
}
- else if (!cspi_check_ev ("pre method check: add"))
+ else /* Convert to a permanant ref */
{
- ref = NULL;
+ accessible->on_loan = FALSE;
+ accessible->objref = cspi_dup_ref (accessible->objref);
+ accessible->ref_count--;
}
- else
- {
- if ((ref = g_hash_table_lookup (cspi_get_live_refs (), corba_object)))
- {
- g_assert (ref->ref_count > 0);
- ref->ref_count++;
- if (!do_ref)
- cspi_release_unref (corba_object);
-#ifdef DEBUG_OBJECTS
- g_print ("returning cached %p => %p\n", ref, ref->objref);
-#endif
- }
- else
- {
- ref = cspi_object_new (corba_object);
+}
-#ifdef DEBUG_OBJECTS
- g_print ("allocated %p => %p\n", ref, corba_object);
-#endif
- if (do_ref) {
-#ifdef JAVA_BRIDGE_BUG_IS_FIXED
- g_assert (CORBA_Object_is_a (corba_object,
- "IDL:Bonobo/Unknown:1.0", cspi_ev ()));
-#endif
- Bonobo_Unknown_ref (corba_object, cspi_ev ());
- }
- g_hash_table_insert (cspi_get_live_refs (), ref->objref, ref);
- }
+Accessible *
+cspi_object_take (CORBA_Object corba_object)
+{
+ Accessible *accessible;
+ accessible = cspi_object_borrow (corba_object);
+
+ cspi_object_ref (accessible);
+ /*
+ * if the remote object is dead,
+ * cspi_object_return will throw an exception.
+ * FIXME: what clears that exception context ever ?
+ */
+ cspi_object_return (accessible);
+ if (cspi_exception ())
+ {
+ cspi_object_unref (accessible);
+ accessible = NULL;
}
-
- return ref;
+ return accessible;
}
void
{
g_return_if_fail (accessible != NULL);
- if (g_hash_table_lookup (cspi_get_live_refs (), accessible->objref) == NULL) {
- accessible->objref = cspi_dup_ref (accessible->objref);
- g_hash_table_insert (cspi_get_live_refs (), accessible->objref, accessible);
- } else {
- accessible->ref_count++;
- }
+ accessible->ref_count++;
}
void
static void
report_leaked_ref (gpointer key, gpointer val, gpointer user_data)
{
- Accessible *a = (Accessible *) val;
- char *name, *role;
- name = Accessible_getName (a);
- if (cspi_exception ()) name = NULL;
- role = Accessible_getRoleName (a);
- if (cspi_exception ()) role = NULL;
- fprintf (stderr, "leaked object %s, role %s\n", (name) ? name : "<?>",
- (role) ? role : "<?>");
- if (name) SPI_freeString (name);
+ char *name, *role;
+ Accessible *a = (Accessible *) val;
+
+ name = Accessible_getName (a);
+ if (cspi_exception ())
+ {
+ name = NULL;
+ }
+
+ role = Accessible_getRoleName (a);
+ if (cspi_exception ())
+ {
+ role = NULL;
+ }
+
+ fprintf (stderr, "leaked %d references to object %s, role %s %p\n",
+ a->ref_count, name ? name : "<?>", role ? role : "<?>", a);
+
+ SPI_freeString (name);
}
*
* Free a character string returned from an at-spi call. Clients of
* at-spi should use this function instead of free () or g_free().
+ * A NULL string @s will be silently ignored.
* This API should not be used to free strings
* from other libraries or allocated by the client.
**/
void
SPI_freeString (char *s)
{
- CORBA_free (s);
+ if (s)
+ {
+ CORBA_free (s);
+ }
}