# include <stdio.h>
#endif
-/*
- * We'd like to replace the dependance on X-isms with a wrapper layer,
- * to the extent that it can't be done with pure GDK.
- * Anyone want to help?
- */
-#include <X11/Xlib.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-
#include <libspi/registry.h>
/* Our parent GObject type */
} SpiListenerStruct;
/* static function prototypes */
-static void _registry_notify_listeners ( GList *listeners,
+static void _registry_notify_listeners (GList *listeners,
const Accessibility_Event *e,
CORBA_Environment *ev);
static gboolean _device_event_controller_hook (gpointer source);
-/*
- * Implemented GObject::finalize
- */
+SpiListenerStruct *
+spi_listener_struct_new (Accessibility_EventListener listener, CORBA_Environment *ev)
+{
+ SpiListenerStruct *retval = g_malloc (sizeof (SpiListenerStruct));
+ retval->listener = bonobo_object_dup_ref (listener, ev);
+ return retval;
+}
+
+void
+spi_listener_struct_free (SpiListenerStruct *ls, CORBA_Environment *ev)
+{
+ bonobo_object_release_unref (ls->listener, ev);
+ g_free (ls);
+}
+
+/* GObject::finalize */
static void
spi_registry_object_finalize (GObject *object)
{
-/* SpiRegistry *registry = SPI_REGISTRY (object); */
- GObjectClass *object_class = G_OBJECT_GET_CLASS( object);
+ SpiRegistry *registry = SPI_REGISTRY (object);
printf("spi_registry_object_finalize called\n");
-
- object_class->finalize (object);
+ /* TODO: unref deviceeventcontroller, which disconnects key listener */
+ G_OBJECT_CLASS (spi_registry_parent_class)->finalize (object);
}
/**
#ifdef SPI_DEBUG
fprintf (stderr, "registering app %p\n", application);
#endif
- registry->desktop->applications = g_list_append (registry->desktop->applications,
- bonobo_object_dup_ref (application, ev));
+ spi_desktop_add_application (registry->desktop, application);
- /* TODO: create unique string here (with libuuid call ?) and hash ? */
Accessibility_Application__set_id (application, _get_unique_id(), ev);
/*
parse_event_type (EventTypeStruct *etype, char *event_name)
{
gchar **split_string;
+ gchar *s;
split_string = g_strsplit(event_name, ":", 4);
etype->event_name = g_strndup(event_name, 255);
if (split_string[1])
{
- etype->major = split_string[1];
+ etype->major = g_strdup (split_string[1]);
if (split_string[2])
{
- etype->minor = split_string[2];
+ etype->minor = g_strdup (split_string[2]);
if (split_string[3])
{
- etype->detail = split_string[3];
- etype->hash = g_str_hash ( g_strconcat (split_string[1], split_string[2], split_string[3], NULL));
+ etype->detail = g_strdup (split_string[3]);
+ s = g_strconcat (split_string[1], split_string[2], split_string[3], NULL);
+ etype->hash = g_str_hash (s);
+ g_free (s);
}
else
{
etype->detail = g_strdup ("");
- etype->hash = g_str_hash ( g_strconcat (split_string[1], split_string[2], NULL));
+ s = g_strconcat (split_string[1], split_string[2], NULL);
+ etype->hash = g_str_hash (s);
+ g_free (s);
}
}
else
etype->hash = g_str_hash ("");
}
- /* TODO: don't forget to free the strings from caller when done ! */
+ g_strfreev (split_string);
}
/**
CORBA_Environment * ev)
{
SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
- GList *list = g_list_find_custom (registry->desktop->applications, &application, compare_corba_objects);
-#ifdef SPI_DEBUG
- gint i;
-#endif
+ spi_desktop_remove_application (registry->desktop, application);
- if (list)
- {
#ifdef SPI_DEBUG
- fprintf (stderr, "deregistering application %p\n", application);
+ fprintf (stderr, "de-registered app %p\n", application);
#endif
- registry->desktop->applications = g_list_delete_link (registry->desktop->applications, list);
-#ifdef SPI_DEBUG
- fprintf (stderr, "there are now %d apps registered.\n", g_list_length (registry->desktop->applications));
- for (i = 0; i < g_list_length (registry->desktop->applications); ++i) {
- fprintf (stderr, "getting application %d\n", i);
- fprintf (stderr, "object address %p\n",
- g_list_nth_data (registry->desktop->applications, i));
- }
-#endif
- }
- else
- fprintf (stderr, "could not deregister application\n");
}
/*
CORBA_Environment *ev)
{
SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
- SpiListenerStruct *ls = g_malloc (sizeof (SpiListenerStruct));
+ SpiListenerStruct *ls = spi_listener_struct_new (listener, ev);
EventTypeStruct etype;
fprintf(stderr, "registering for events of type %s\n", event_name);
case (ETYPE_FOCUS) :
case (ETYPE_OBJECT) :
case (ETYPE_PROPERTY) :
- ls->listener = CORBA_Object_duplicate (listener, ev);
registry->object_listeners =
g_list_append (registry->object_listeners, ls);
break;
case (ETYPE_WINDOW) :
/* Support for Window Manager Events is not yet implemented */
+ spi_listener_struct_free (ls, ev);
break;
case (ETYPE_TOOLKIT) :
- ls->listener = CORBA_Object_duplicate (listener, ev);
registry->toolkit_listeners =
g_list_append (registry->toolkit_listeners, ls);
register_with_toolkits (registry, &etype, ev);
break;
default:
+ spi_listener_struct_free (ls, ev);
break;
}
}
CORBA_Environment *ev)
{
SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
- SpiListenerStruct *ls = g_malloc (sizeof (SpiListenerStruct));
+ SpiListenerStruct *ls = spi_listener_struct_new (listener, ev);
GList *list;
- ls->listener = listener;
list = g_list_find_custom (registry->object_listeners, ls,
compare_listener_corbaref);
while (list)
{
- fprintf (stderr, "deregistering listener\n");
+ spi_listener_struct_free ((SpiListenerStruct *) list->data, ev);
registry->object_listeners = g_list_delete_link (registry->object_listeners, list);
list = g_list_find_custom (registry->object_listeners, ls, compare_listener_corbaref);
}
list = g_list_find_custom (registry->toolkit_listeners, ls, compare_listener_corbaref);
while (list)
{
- fprintf (stderr, "deregistering listener\n");
+ spi_listener_struct_free ((SpiListenerStruct *) list->data, ev);
registry->toolkit_listeners = g_list_delete_link (registry->toolkit_listeners, list);
list = g_list_find_custom (registry->toolkit_listeners, ls, compare_listener_corbaref);
}
+ spi_listener_struct_free (ls, ev);
}
/*
break;
case (ETYPE_WINDOW) :
/* Support for Window Manager Events is not yet implemented */
+ listeners = NULL;
break;
case (ETYPE_TOOLKIT) :
listeners = ®istry->toolkit_listeners;
while (list)
{
- fprintf (stderr, "deregistering listener\n");
+ spi_listener_struct_free ((SpiListenerStruct *) list->data, ev);
*listeners = g_list_delete_link (*listeners, list);
list = g_list_find_custom (*listeners, &ls, compare_listener_hash);
}
if (n == 0)
{
return (Accessibility_Desktop)
- CORBA_Object_duplicate (BONOBO_OBJREF (registry->desktop), ev);
+ bonobo_object_dup_ref (BONOBO_OBJREF (registry->desktop), ev);
}
else
{
if (!registry->device_event_controller)
registry->device_event_controller = spi_device_event_controller_new (registry);
- return CORBA_Object_duplicate (BONOBO_OBJREF (registry->device_event_controller), ev);
+ return bonobo_object_dup_ref (BONOBO_OBJREF (registry->device_event_controller), ev);
}
static void
default:
break;
}
- /* Accessibility_Accessible_unref (e->source, ev);*/ /* This should be here! */
+ if (e->source != CORBA_OBJECT_NIL)
+ {
+ Accessibility_Accessible_unref (e->source, ev);
+ }
}
static long
}
static void
-_registry_notify_listeners ( GList *listeners,
- const Accessibility_Event *e,
+_registry_notify_listeners (GList *listeners,
+ const Accessibility_Event *e_in,
CORBA_Environment *ev)
{
- int n;
- int len;
- SpiListenerStruct *ls;
- EventTypeStruct etype;
- guint minor_hash;
- parse_event_type (&etype, e->type);
- minor_hash = g_str_hash (g_strconcat (etype.major, etype.minor, NULL));
- len = g_list_length (listeners);
+ GList *l;
+ Accessibility_Event e_out;
+ SpiListenerStruct *ls;
+ EventTypeStruct etype;
+ guint minor_hash;
+ CORBA_string s;
+
+ e_out = *e_in;
+ parse_event_type (&etype, e_in->type);
+
+ s = g_strconcat (etype.major, etype.minor, NULL);
+ minor_hash = g_str_hash (s);
+ g_free (s);
- for (n=0; n<len; ++n)
+ for (l = listeners; l; l = l->next)
{
- ls = (SpiListenerStruct *) g_list_nth_data (listeners, n);
+ ls = (SpiListenerStruct *) l->data;
+
#ifdef SPI_SPI_LISTENER_DEBUG
- fprintf(stderr, "event hashes: %lx %lx %lx\n", ls->event_type_hash, etype.hash, minor_hash);
- fprintf(stderr, "event name: %s\n", etype.event_name);
+ fprintf (stderr, "event hashes: %lx %lx %lx\n", ls->event_type_hash, etype.hash, minor_hash);
+ fprintf (stderr, "event name: %s\n", etype.event_name);
#endif
+
if ((ls->event_type_hash == etype.hash) || (ls->event_type_hash == minor_hash))
{
#ifdef SPI_DEBUG
- fprintf(stderr, "notifying listener #%d\n", n);
- fprintf(stderr, "event source name %s\n", Accessibility_Accessible__get_name(e->source, ev));
+ fprintf (stderr, "notifying listener %d\n", g_list_index (listeners, l->data));
+ s = Accessibility_Accessible__get_name (e_in->source, ev);
+ fprintf (stderr, "event source name %s\n", s);
+ CORBA_free (s);
#endif
- e->source = CORBA_Object_duplicate (e->source, ev);
- Accessibility_Accessible_ref ( e->source, ev);
+ e_out.source = bonobo_object_dup_ref (e_in->source, ev);
Accessibility_EventListener_notifyEvent ((Accessibility_EventListener) ls->listener,
- e,
+ &e_out,
ev);
- if (ev->_major != CORBA_NO_EXCEPTION) {
- fprintf(stderr,
- ("Accessibility app error: exception during event notification: %s\n"),
- CORBA_exception_id(ev));
- exit(-1);
- }
+ if (ev->_major != CORBA_NO_EXCEPTION)
+ {
+ g_warning ("Accessibility app error: exception during event notification: %s\n",
+ CORBA_exception_id (ev));
+ }
}
}
}
registry->object_listeners = NULL;
registry->window_listeners = NULL;
registry->toolkit_listeners = NULL;
- registry->applications = NULL;
registry->desktop = spi_desktop_new();
registry->device_event_controller = NULL;
registry->kbd_event_hook = _device_event_controller_hook;
spi_registry_new (void)
{
SpiRegistry *retval = g_object_new (SPI_REGISTRY_TYPE, NULL);
+ bonobo_object_set_immortal (BONOBO_OBJECT (retval), TRUE);
return retval;
}