*/
/*
- * registry.c: test for accessibility implementation
- *
+ * registry.c: the main accessibility service registry implementation
*/
#ifdef SPI_DEBUG
#include <libspi/Accessibility.h>
/*
+ * 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/gdkx.h>
+
+/*
* This pulls the definition for the BonoboObject (GType)
*/
#include "registry.h"
typedef enum {
ETYPE_FOCUS,
+ ETYPE_OBJECT,
+ ETYPE_PROPERTY,
ETYPE_WINDOW,
ETYPE_TOOLKIT,
ETYPE_LAST_DEFINED
-} EventTypeMajor;
+} EventTypeCategory;
typedef struct {
char *event_name;
- EventTypeMajor major;
+ EventTypeCategory type_cat;
+ char * major;
char * minor;
char * detail;
guint hash;
typedef struct {
Accessibility_EventListener listener;
guint event_type_hash;
- EventTypeMajor event_type_major;
+ EventTypeCategory event_type_cat;
} ListenerStruct;
/* 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 long _get_unique_id();
+
+static gboolean _device_event_controller_hook (gpointer source);
+
/*
* Implemented GObject::finalize
*/
fprintf (stderr, "registering app %p\n", application);
#endif
registry->desktop->applications = g_list_append (registry->desktop->applications,
- CORBA_Object_duplicate (application, ev));
+ bonobo_object_dup_ref (application, ev));
- /* TODO: create unique string here (with libuuid call ?) */
- Accessibility_Application__set_id (application, "test-some-unique-string", ev);
+ /* TODO: create unique string here (with libuuid call ?) and hash ? */
+ Accessibility_Application__set_id (application, _get_unique_id(), ev);
/*
* TODO: change the implementation below to a WM-aware one;
}
static gint
-compare_object_hash (gconstpointer p1, gconstpointer p2)
+compare_corba_objects (gconstpointer p1, gconstpointer p2)
{
CORBA_Environment ev;
- long long diff = ((CORBA_Object_hash ((CORBA_Object) p2, (CORBA_unsigned_long) 0, &ev)) -
- (CORBA_Object_hash ((CORBA_Object) p1, (CORBA_unsigned_long) 0, &ev)));
- return ((diff < 0) ? -1 : ((diff > 0) ? 1 : 0));
+ gint retval;
+ retval = !CORBA_Object_is_equivalent ((CORBA_Object) p1, (CORBA_Object) p2, &ev);
+
+#ifdef SPI_DEBUG
+ fprintf (stderr, "comparing %p to %p; result %d\n",
+ p1, p2,
+ retval);
+#endif
+ return retval;
}
-static gboolean
-toolkit_listener (GSignalInvocationHint *signal_hint,
- guint n_param_values,
- const GValue *param_values,
- gpointer data)
+static void
+register_with_toolkits (Registry *registry_bonobo_object, EventTypeStruct *etype, CORBA_Environment *ev)
{
- gchar *name =
- g_signal_name (signal_hint->signal_id);
- fprintf (stderr, "Received signal %s\n", name);
+ gint n_desktops;
+ gint n_apps;
+ gint i, j;
+ Accessibility_Desktop desktop;
+ Accessibility_Application app;
+ Accessibility_Registry registry;
+ registry = BONOBO_OBJREF (registry_bonobo_object);
- /* TODO: notify the actual listeners! */
+ /* for each app in each desktop, call ...Application_registerToolkitEventListener */
- return TRUE;
-}
+ n_desktops = Accessibility_Registry_getDesktopCount (registry, ev);
-static void
-register_with_toolkit (EventTypeStruct *etype)
-{
- guint listener_id;
- listener_id =
- atk_add_global_event_listener (toolkit_listener, etype->event_name);
-#ifdef SPI_DEBUG
- fprintf (stderr, "registered %d for toolkit events named: %s\n",
- listener_id,
- etype->event_name);
-#endif
+ for (i=0; i<n_desktops; ++i)
+ {
+ desktop = Accessibility_Registry_getDesktop (registry, i, ev);
+ n_apps = Accessibility_Desktop__get_childCount (desktop, ev);
+ for (j=0; j<n_apps; ++j)
+ {
+ app = (Accessibility_Application) Accessibility_Desktop_getChildAtIndex (desktop,
+ j,
+ ev);
+ Accessibility_Application_registerToolkitEventListener (app,
+ registry,
+ CORBA_string_dup (etype->event_name),
+
+ ev);
+ }
+ }
}
static gint
static void
parse_event_type (EventTypeStruct *etype, char *event_name)
{
- static gunichar delimiter = 0;
- char * major_delim_char;
- char * minor_delim_char;
guint nbytes = 0;
+ gchar **split_string;
+ split_string = g_strsplit(event_name, ":", 4);
etype->event_name = g_strndup(event_name, 255);
- if (!delimiter)
+ if (!g_ascii_strncasecmp (event_name, "focus:", 6))
{
- delimiter = g_utf8_get_char (":");
+ etype->type_cat = ETYPE_FOCUS;
}
-
- major_delim_char = g_utf8_strchr (event_name, (gssize) 32, delimiter);
- minor_delim_char = g_utf8_strrchr (event_name, (gssize) 255, delimiter);
-
- nbytes = (guint)((gint64) minor_delim_char -
- (gint64) major_delim_char);
-
- fprintf (stderr, "nbytes = %ld\n", (long) nbytes);
- if (!g_ascii_strncasecmp (event_name, "focus:", 6))
+ else if (!g_ascii_strncasecmp (event_name, "object:", 7))
{
- etype->major = ETYPE_FOCUS;
+ etype->type_cat = ETYPE_OBJECT;
}
else if (!g_ascii_strncasecmp (event_name, "window:", 7))
{
- etype->major = ETYPE_WINDOW;
+ etype->type_cat = ETYPE_WINDOW;
}
else
{
- etype->major = ETYPE_TOOLKIT;
+ etype->type_cat = ETYPE_TOOLKIT;
}
- if (major_delim_char != minor_delim_char)
- {
- etype->minor = g_strndup (major_delim_char, nbytes);
- etype->detail = g_strdup (minor_delim_char);
- etype->hash = g_str_hash (major_delim_char);
- }
- else
+ if (split_string[1])
{
- if (* (major_delim_char+1))
+ etype->major = split_string[1];
+ if (split_string[2])
{
- etype->minor = g_strdup (major_delim_char+1);
- etype->hash = g_str_hash (major_delim_char+1);
+ etype->minor = 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));
+ }
+ else
+ {
+ etype->detail = g_strdup ("");
+ etype->hash = g_str_hash ( g_strconcat (split_string[1], split_string[2], NULL));
+ }
}
else
{
etype->minor = g_strdup ("");
- etype->hash = g_str_hash ("");
+ etype->hash = g_str_hash ( split_string[1]);
}
+ }
+ else
+ {
+ etype->major = g_strdup ("");
+ etype->minor = g_strdup ("");
etype->detail = g_strdup ("");
+ etype->hash = g_str_hash ("");
}
/* TODO: don't forget to free the strings from caller when done ! */
CORBA_Environment * ev)
{
Registry *registry = REGISTRY (bonobo_object_from_servant (servant));
- GList *list = g_list_find_custom (registry->applications, application, compare_object_hash);
+ GList *list = g_list_find_custom (registry->desktop->applications, application, compare_corba_objects);
+
+#ifdef SPI_DEBUG
+ gint i;
+#endif
+
if (list)
{
- fprintf (stderr, "deregistering application\n");
- registry->applications = g_list_delete_link (registry->applications, list);
+#ifdef SPI_DEBUG
+ fprintf (stderr, "deregistering application %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 Accessibility::Registry::registerGlobalEventListener method implementation
*/
static void
-impl_accessibility_registry_register_global_event_listener
- (PortableServer_Servant servant,
+impl_accessibility_registry_register_global_event_listener (
+ PortableServer_Servant servant,
Accessibility_EventListener listener,
const CORBA_char *event_name,
CORBA_Environment *ev)
{
- /**
- * TODO:
- *
- * register with app toolkits only for requested event types
- *
- **/
-
Registry *registry = REGISTRY (bonobo_object_from_servant (servant));
- /* fprintf(stderr, "registering %x/%x\n", listener, *listener); */
ListenerStruct *ls = g_malloc (sizeof (ListenerStruct));
-
EventTypeStruct etype;
+ gboolean is_toolkit_specific = TRUE;
+
+ fprintf(stderr, "registering for events of type %s\n", event_name);
/* parse, check major event type and add listener accordingly */
parse_event_type (&etype, event_name);
ls->event_type_hash = etype.hash;
- ls->event_type_major = etype.major;
+ ls->event_type_cat = etype.type_cat;
- switch (etype.major)
+ switch (etype.type_cat)
{
case (ETYPE_FOCUS) :
+ case (ETYPE_OBJECT) :
+ case (ETYPE_PROPERTY) :
ls->listener = CORBA_Object_duplicate (listener, ev);
- registry->focus_listeners =
- g_list_append (registry->focus_listeners, ls);
+ registry->object_listeners =
+ g_list_append (registry->object_listeners, ls);
break;
case (ETYPE_WINDOW) :
/* Support for Window Manager Events is not yet implemented */
ls->listener = CORBA_Object_duplicate (listener, ev);
registry->toolkit_listeners =
g_list_append (registry->toolkit_listeners, ls);
- register_with_toolkit (&etype);
+ register_with_toolkits (registry, &etype, ev);
break;
default:
break;
* CORBA Accessibility::Registry::deregisterGlobalEventListenerAll method implementation
*/
static void
-impl_accessibility_registry_deregister_global_event_listener_all
- (PortableServer_Servant servant,
+impl_accessibility_registry_deregister_global_event_listener_all (
+ PortableServer_Servant servant,
Accessibility_EventListener listener,
CORBA_Environment *ev)
{
Registry *registry = REGISTRY (bonobo_object_from_servant (servant));
- GList *list = g_list_find_custom (registry->focus_listeners, listener, compare_object_hash);
+ GList *list = g_list_find_custom (registry->object_listeners, listener, compare_corba_objects);
/*
* TODO : de-register with toolkit if the last instance of a listener
while (list)
{
fprintf (stderr, "deregistering listener\n");
- registry->focus_listeners = g_list_delete_link (registry->focus_listeners, list);
- list = g_list_find_custom (registry->focus_listeners, listener, compare_object_hash);
+ registry->object_listeners = g_list_delete_link (registry->object_listeners, list);
+ list = g_list_find_custom (registry->object_listeners, listener, compare_corba_objects);
}
- list = g_list_find_custom (registry->toolkit_listeners, listener, compare_object_hash);
+ list = g_list_find_custom (registry->toolkit_listeners, listener, compare_corba_objects);
while (list)
{
fprintf (stderr, "deregistering listener\n");
registry->toolkit_listeners = g_list_delete_link (registry->toolkit_listeners, list);
- list = g_list_find_custom (registry->toolkit_listeners, listener, compare_object_hash);
+ list = g_list_find_custom (registry->toolkit_listeners, listener, compare_corba_objects);
}
}
* CORBA Accessibility::Registry::deregisterGlobalEventListener method implementation
*/
static void
-impl_accessibility_registry_deregister_global_event_listener
- (PortableServer_Servant servant,
+impl_accessibility_registry_deregister_global_event_listener (
+ PortableServer_Servant servant,
Accessibility_EventListener listener,
const CORBA_char * event_name,
CORBA_Environment *ev)
GList **listeners;
parse_event_type (&etype, event_name);
- switch (etype.major)
+ switch (etype.type_cat)
{
+ case (ETYPE_OBJECT) :
+ case (ETYPE_PROPERTY) :
case (ETYPE_FOCUS) :
- listeners = ®istry->focus_listeners;
+ listeners = ®istry->object_listeners;
break;
case (ETYPE_WINDOW) :
/* Support for Window Manager Events is not yet implemented */
if (n == 0)
{
return (Accessibility_Desktop)
- CORBA_Object_duplicate (
- bonobo_object_corba_objref (bonobo_object (registry->desktop)), ev);
+ CORBA_Object_duplicate (BONOBO_OBJREF (registry->desktop), ev);
}
else
{
return (Accessibility_DesktopSeq *) NULL;
}
-static CORBA_Object
+static Accessibility_DeviceEventController
impl_accessibility_registry_get_device_event_controller (PortableServer_Servant servant,
CORBA_Environment * ev)
{
- /* TODO: not yet implemented! */
- return CORBA_OBJECT_NIL;
+ Registry *registry = REGISTRY (bonobo_object_from_servant (servant));
+ if (!registry->device_event_controller)
+ registry->device_event_controller = g_object_new (DEVICE_EVENT_CONTROLLER_TYPE, NULL);
+ return CORBA_Object_duplicate (BONOBO_OBJREF (registry->device_event_controller), ev);
}
static void
parse_event_type (&etype, e->type);
- switch (etype.major)
+ switch (etype.type_cat)
{
+ case (ETYPE_OBJECT) :
+ case (ETYPE_PROPERTY) :
case (ETYPE_FOCUS) :
- registry_notify_listeners (registry->focus_listeners, e, ev);
+ _registry_notify_listeners (registry->object_listeners, e, ev);
break;
case (ETYPE_WINDOW) :
- registry_notify_listeners (registry->window_listeners, e, ev);
+ _registry_notify_listeners (registry->window_listeners, e, ev);
break;
case (ETYPE_TOOLKIT) :
- registry_notify_listeners (registry->toolkit_listeners, e, ev);
+ _registry_notify_listeners (registry->toolkit_listeners, e, ev);
break;
default:
break;
}
- bonobo_object_release_unref (e->target, ev);
+ /* Accessibility_Accessible_unref (e->source, ev);*/ /* This should be here! */
+}
+
+static long
+_get_unique_id ()
+{
+ static long id = 0;
+ return ++id;
}
static void
-registry_notify_listeners ( GList *listeners,
+_registry_notify_listeners ( GList *listeners,
const Accessibility_Event *e,
CORBA_Environment *ev)
{
EventTypeStruct etype;
guint minor_hash;
parse_event_type (&etype, e->type);
- minor_hash = g_str_hash (etype.minor);
+ minor_hash = g_str_hash (g_strconcat (etype.major, etype.minor, NULL));
len = g_list_length (listeners);
for (n=0; n<len; ++n)
{
ls = (ListenerStruct *) g_list_nth_data (listeners, n);
-#ifdef SPI_DEBUG
- fprintf(stderr, "event hashes: %lx %lx\n", ls->event_type_hash, etype.hash);
+#ifdef 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);
#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 name %s\n", Accessibility_Accessible__get_name(e->target, ev));
+ fprintf(stderr, "event source name %s\n", Accessibility_Accessible__get_name(e->source, ev));
#endif
- bonobo_object_dup_ref ( e->target, ev);
+ e->source = CORBA_Object_duplicate (e->source, ev);
+ Accessibility_Accessible_ref ( e->source, ev);
Accessibility_EventListener_notifyEvent ((Accessibility_EventListener) ls->listener,
e,
ev);
}
}
+static gboolean _device_event_controller_hook (gpointer p)
+{
+ Registry *registry = (Registry *)p;
+ DeviceEventController *controller = registry->device_event_controller;
+ if (controller)
+ device_event_controller_check_key_event (controller);
+ return TRUE;
+}
+
static void
registry_class_init (RegistryClass *klass)
{
epv->registerGlobalEventListener = impl_accessibility_registry_register_global_event_listener;
epv->deregisterGlobalEventListener = impl_accessibility_registry_deregister_global_event_listener;
epv->deregisterGlobalEventListenerAll = impl_accessibility_registry_deregister_global_event_listener_all;
+ epv->getDeviceEventController = impl_accessibility_registry_get_device_event_controller;
epv->getDesktopCount = impl_accessibility_registry_get_desktop_count;
epv->getDesktop = impl_accessibility_registry_get_desktop;
epv->getDesktopList = impl_accessibility_registry_get_desktop_list;
- epv->getDeviceEventController = impl_accessibility_registry_get_device_event_controller;
+
((ListenerClass *) klass)->epv.notifyEvent = impl_registry_notify_event;
}
static void
registry_init (Registry *registry)
{
- registry->focus_listeners = NULL;
+ registry->object_listeners = NULL;
registry->window_listeners = NULL;
registry->toolkit_listeners = NULL;
registry->applications = NULL;
registry->desktop = desktop_new();
+ registry->device_event_controller = NULL;
+ registry->kbd_event_hook = _device_event_controller_hook;
}
GType