* Boston, MA 02111-1307, USA.
*/
-/*
- * registry.c: test for accessibility implementation
- *
- */
+/* registry.c: the main accessibility service registry implementation */
+#include <config.h>
#ifdef SPI_DEBUG
-#include <stdio.h>
+# include <stdio.h>
#endif
-#include <config.h>
-#include <bonobo/Bonobo.h>
/*
- * This pulls the CORBA definitions for the "Accessibility::Registry" server
+ * 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 <libspi/Accessibility.h>
+#include <X11/Xlib.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
-/*
- * This pulls the definition for the BonoboObject (GType)
- */
-#include "registry.h"
+#include <libspi/registry.h>
-/*
- * Our parent GObject type
- */
-#define PARENT_TYPE LISTENER_TYPE
+/* Our parent GObject type */
+#define PARENT_TYPE SPI_LISTENER_TYPE
-/*
- * A pointer to our parent object class
- */
-static ListenerClass *registry_parent_class;
+/* A pointer to our parent object class */
+static SpiListenerClass *spi_registry_parent_class;
typedef enum {
ETYPE_FOCUS,
+ ETYPE_OBJECT,
+ ETYPE_PROPERTY,
ETYPE_WINDOW,
ETYPE_TOOLKIT,
+ ETYPE_KEYBOARD,
+
ETYPE_LAST_DEFINED
} EventTypeCategory;
Accessibility_EventListener listener;
guint event_type_hash;
EventTypeCategory event_type_cat;
-} ListenerStruct;
+} 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);
-/*
- * Implemented GObject::finalize
- */
-static void
-registry_object_finalize (GObject *object)
+static long _get_unique_id();
+
+static gboolean _device_event_controller_hook (gpointer source);
+
+SpiListenerStruct *
+spi_listener_struct_new (Accessibility_EventListener *listener, CORBA_Environment *ev)
{
-/* Registry *registry = REGISTRY (object); */
- GObjectClass *object_class = G_OBJECT_GET_CLASS( object);
+ 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)
+{
+ /* TODO: sanity check for ls */
+ Accessibility_EventListener_unref (ls->listener, ev);
+ g_free (ls);
+}
- printf("registry_object_finalize called\n");
+/* GObject::finalize */
+static void
+spi_registry_object_finalize (GObject *object)
+{
+ SpiRegistry *registry = SPI_REGISTRY (object);
- object_class->finalize (object);
+ printf("spi_registry_object_finalize called\n");
+ /* TODO: unref deviceeventcontroller, which disconnects key listener */
+ G_OBJECT_CLASS (spi_registry_parent_class)->finalize (object);
}
/**
const Accessibility_Application application,
CORBA_Environment * ev)
{
- Registry *registry = REGISTRY (bonobo_object_from_servant (servant));
+ SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
#ifdef SPI_DEBUG
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;
- * e.g. don't add all apps to the Desktop
+ * e.g. don't add all apps to the SpiDesktop
*/
}
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;
+
+#ifdef SPI_DEBUG
+ fprintf (stderr, "comparing %p to %p\n",
+ p1, p2);
+#endif
+
+ retval = !CORBA_Object_is_equivalent ((CORBA_Object) p1, (CORBA_Object) p2, &ev);
+ return retval;
}
static void
-register_with_toolkits (Registry *registry_bonobo_object, EventTypeStruct *etype, CORBA_Environment *ev)
+register_with_toolkits (SpiRegistry *spi_registry_bonobo_object, EventTypeStruct *etype, CORBA_Environment *ev)
{
gint n_desktops;
gint n_apps;
Accessibility_Desktop desktop;
Accessibility_Application app;
Accessibility_Registry registry;
- registry = bonobo_object_corba_objref (bonobo_object (registry_bonobo_object));
+ registry = BONOBO_OBJREF (spi_registry_bonobo_object);
/* for each app in each desktop, call ...Application_registerToolkitEventListener */
app = (Accessibility_Application) Accessibility_Desktop_getChildAtIndex (desktop,
j,
ev);
- /* TODO: should we be ref-ing the registry object before each call ? */
- Accessibility_Application_registerToolkitEventListener (app,
- registry,
- CORBA_string_dup (etype->event_name),
- ev);
+ Accessibility_Application_registerToolkitEventListener (app,
+ registry,
+ CORBA_string_dup (etype->event_name),
+
+ ev);
}
}
}
static gint
compare_listener_hash (gconstpointer p1, gconstpointer p2)
{
- return (((ListenerStruct *)p2)->event_type_hash - ((ListenerStruct *)p1)->event_type_hash);
+ return (((SpiListenerStruct *)p2)->event_type_hash - ((SpiListenerStruct *)p1)->event_type_hash);
+}
+
+static gint
+compare_listener_corbaref (gconstpointer p1, gconstpointer p2)
+{
+ return compare_corba_objects (((SpiListenerStruct *)p2)->listener,
+ ((SpiListenerStruct *)p1)->listener);
}
static void
parse_event_type (EventTypeStruct *etype, char *event_name)
{
- guint nbytes = 0;
gchar **split_string;
split_string = g_strsplit(event_name, ":", 4);
{
etype->type_cat = ETYPE_FOCUS;
}
+ else if (!g_ascii_strncasecmp (event_name, "object:", 7))
+ {
+ etype->type_cat = ETYPE_OBJECT;
+ }
else if (!g_ascii_strncasecmp (event_name, "window:", 7))
{
etype->type_cat = ETYPE_WINDOW;
const Accessibility_Application application,
CORBA_Environment * ev)
{
- Registry *registry = REGISTRY (bonobo_object_from_servant (servant));
- GList *list = g_list_find_custom (registry->applications, application, compare_object_hash);
+ 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
+
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 %p\n", application);
}
}
* 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)
{
- Registry *registry = REGISTRY (bonobo_object_from_servant (servant));
- ListenerStruct *ls = g_malloc (sizeof (ListenerStruct));
+ SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+ SpiListenerStruct *ls = spi_listener_struct_new (listener, ev);
EventTypeStruct etype;
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);
+ parse_event_type (&etype, (char*) event_name);
ls->event_type_hash = etype.hash;
ls->event_type_cat = etype.type_cat;
switch (etype.type_cat)
{
case (ETYPE_FOCUS) :
- ls->listener = CORBA_Object_duplicate (listener, ev);
- registry->focus_listeners =
- g_list_append (registry->focus_listeners, ls);
+ case (ETYPE_OBJECT) :
+ case (ETYPE_PROPERTY) :
+ 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 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);
+ SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+ SpiListenerStruct *spi_listener_struct, *ls = spi_listener_struct_new (listener, ev);
+ GList *list;
+ list = g_list_find_custom (registry->object_listeners, ls,
+ compare_listener_corbaref);
/*
* 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);
+ 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, listener, compare_object_hash);
+ 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, listener, compare_object_hash);
+ list = g_list_find_custom (registry->toolkit_listeners, ls, compare_listener_corbaref);
}
+ spi_listener_struct_free (ls, ev);
}
/*
* 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)
{
- Registry *registry = REGISTRY (bonobo_object_from_servant (servant));
- ListenerStruct ls;
+ SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+ SpiListenerStruct ls, *spi_listener_struct;
EventTypeStruct etype;
GList *list;
GList **listeners;
- parse_event_type (&etype, event_name);
+ parse_event_type (&etype, (char *) event_name);
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 */
listeners = ®istry->toolkit_listeners;
break;
default:
+ listeners = NULL;
break;
}
+ if (!listeners)
+ return;
+
ls.event_type_hash = etype.hash;
list = g_list_find_custom (*listeners, &ls, compare_listener_hash);
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);
}
const CORBA_short n,
CORBA_Environment * ev)
{
- Registry *registry = REGISTRY (bonobo_object_from_servant (servant));
+ SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
/* TODO: implement support for multiple virtual desktops */
if (n == 0)
{
return (Accessibility_Desktop)
- CORBA_Object_duplicate (
- bonobo_object_corba_objref (bonobo_object (registry->desktop)), ev);
+ bonobo_object_dup_ref (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;
+ SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
+ if (!registry->device_event_controller)
+ registry->device_event_controller = spi_device_event_controller_new (registry);
+
+ return bonobo_object_dup_ref (BONOBO_OBJREF (registry->device_event_controller), ev);
}
static void
const Accessibility_Event *e,
CORBA_Environment *ev)
{
- Registry *registry = REGISTRY (bonobo_object_from_servant (servant));
+ SpiRegistry *registry = SPI_REGISTRY (bonobo_object_from_servant (servant));
EventTypeStruct etype;
parse_event_type (&etype, e->type);
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;
+ case (ETYPE_KEYBOARD) :
default:
break;
}
- bonobo_object_release_unref (e->source, ev);
+ /* Accessibility_Accessible_unref (e->source, ev);*/ /* This should be here! */
}
+static long
+_get_unique_id ()
+{
+ static long id = 0;
+ return ++id;
+}
+
+#define SPI_DEBUG
+
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;
- ListenerStruct *ls;
+ SpiListenerStruct *ls;
EventTypeStruct etype;
+ Accessibility_Event *e_out;
guint minor_hash;
- parse_event_type (&etype, e->type);
+ parse_event_type (&etype, e_in->type);
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
+ ls = (SpiListenerStruct *) g_list_nth_data (listeners, n);
+#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);
#endif
{
#ifdef SPI_DEBUG
fprintf(stderr, "notifying listener #%d\n", n);
- fprintf(stderr, "event name %s\n", Accessibility_Accessible__get_name(e->source, ev));
+ fprintf(stderr, "event source name %s\n", Accessibility_Accessible__get_name(e_in->source, ev));
#endif
- bonobo_object_dup_ref ( e->source, ev);
+ e_out = ORBit_copy_value (e_in, TC_Accessibility_Event);
+ e_out->source = bonobo_object_dup_ref (e_in->source, ev);
Accessibility_EventListener_notifyEvent ((Accessibility_EventListener) ls->listener,
- e,
+ e_out,
ev);
+ /* is it safe to free e_out now ? notifyEvent is a oneway... */
+ CORBA_free (e_out);
if (ev->_major != CORBA_NO_EXCEPTION) {
fprintf(stderr,
("Accessibility app error: exception during event notification: %s\n"),
}
}
+static gboolean
+_device_event_controller_hook (gpointer p)
+{
+ SpiRegistry *registry = (SpiRegistry *)p;
+ SpiDeviceEventController *controller = registry->device_event_controller;
+ if (controller)
+ spi_device_event_controller_check_key_event (controller);
+ return TRUE;
+}
+
static void
-registry_class_init (RegistryClass *klass)
+spi_registry_class_init (SpiRegistryClass *klass)
{
GObjectClass * object_class = (GObjectClass *) klass;
POA_Accessibility_Registry__epv *epv = &klass->epv;
- registry_parent_class = g_type_class_ref (LISTENER_TYPE);
+ spi_registry_parent_class = g_type_class_ref (SPI_LISTENER_TYPE);
- object_class->finalize = registry_object_finalize;
+ object_class->finalize = spi_registry_object_finalize;
epv->registerApplication = impl_accessibility_registry_register_application;
epv->deregisterApplication = impl_accessibility_registry_deregister_application;
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;
+
+ ((SpiListenerClass *) klass)->epv.notifyEvent = impl_registry_notify_event;
}
static void
-registry_init (Registry *registry)
+spi_registry_init (SpiRegistry *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->desktop = spi_desktop_new();
+ registry->device_event_controller = NULL;
+ registry->kbd_event_hook = _device_event_controller_hook;
}
-GType
-registry_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (RegistryClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) registry_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (Registry),
- 0, /* n preallocs */
- (GInstanceInitFunc) registry_init,
- NULL /* value table */
- };
- /*
- * Here we use bonobo_type_unique instead of
- * gtk_type_unique, this auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- PARENT_TYPE,
- POA_Accessibility_Registry__init,
- NULL,
- G_STRUCT_OFFSET (RegistryClass, epv),
- &tinfo,
- "Registry");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiRegistry,
+ Accessibility_Registry,
+ PARENT_TYPE,
+ spi_registry);
-Registry *
-registry_new (void)
+SpiRegistry *
+spi_registry_new (void)
{
- Registry *retval =
- REGISTRY (g_object_new (registry_get_type (), NULL));
+ SpiRegistry *retval = g_object_new (SPI_REGISTRY_TYPE, NULL);
return retval;
}
projects / platform / core / uifw / at-spi2-atk.git / blobdiff