X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Fregistry.c;h=208cab5bd615ae7dd6170db92db22249356cf98c;hb=262e6e147178e8744ddb24296a3d41f889400590;hp=269365af1734b70635999237e6b16af5ce8116ab;hpb=838ffbd98cd6acfaad67fd6b3a08ac69b9f68f9d;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/libspi/registry.c b/libspi/registry.c index 269365a..208cab5 100644 --- a/libspi/registry.c +++ b/libspi/registry.c @@ -21,8 +21,7 @@ */ /* - * registry.c: test for accessibility implementation - * + * registry.c: the main accessibility service registry implementation */ #ifdef SPI_DEBUG @@ -37,6 +36,14 @@ #include /* + * 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 +#include + +/* * This pulls the definition for the BonoboObject (GType) */ #include "registry.h" @@ -74,10 +81,14 @@ typedef struct { } 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 */ @@ -113,8 +124,8 @@ impl_accessibility_registry_register_application (PortableServer_Servant servant registry->desktop->applications = g_list_append (registry->desktop->applications, CORBA_Object_duplicate (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; @@ -123,12 +134,18 @@ impl_accessibility_registry_register_application (PortableServer_Servant servant } 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 void @@ -241,20 +258,37 @@ impl_accessibility_registry_deregister_application (PortableServer_Servant serva 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) @@ -295,13 +329,13 @@ impl_accessibility_registry_register_global_event_listener * 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->focus_listeners, listener, compare_corba_objects); /* * TODO : de-register with toolkit if the last instance of a listener @@ -312,14 +346,14 @@ impl_accessibility_registry_deregister_global_event_listener_all { 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); + list = g_list_find_custom (registry->focus_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); } } @@ -327,8 +361,8 @@ impl_accessibility_registry_deregister_global_event_listener_all * 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) @@ -429,12 +463,16 @@ impl_accessibility_registry_get_desktop_list (PortableServer_Servant servant, 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_object_corba_objref ( + bonobo_object (registry->device_event_controller)), ev); } static void @@ -450,22 +488,29 @@ impl_registry_notify_event (PortableServer_Servant servant, switch (etype.type_cat) { case (ETYPE_FOCUS) : - registry_notify_listeners (registry->focus_listeners, e, ev); + _registry_notify_listeners (registry->focus_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->source, ev); + Accessibility_Accessible_unref (e->source, ev); +} + +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) { @@ -491,7 +536,7 @@ registry_notify_listeners ( GList *listeners, fprintf(stderr, "notifying listener #%d\n", n); fprintf(stderr, "event name %s\n", Accessibility_Accessible__get_name(e->source, ev)); #endif - bonobo_object_dup_ref ( e->source, ev); + Accessibility_Accessible_ref ( e->source, ev); Accessibility_EventListener_notifyEvent ((Accessibility_EventListener) ls->listener, e, ev); @@ -505,6 +550,15 @@ registry_notify_listeners ( GList *listeners, } } +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) { @@ -520,10 +574,11 @@ 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; } @@ -535,6 +590,8 @@ registry_init (Registry *registry) 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