X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=registryd%2Fregistry.c;h=a257a397a2e652b19653306c2e8c6edc090ce8ed;hp=c24eb37e4979571ae1f61b8ae9e2eb5ac3ee2a59;hb=fa9134cfafbbbb69a4aaa5ea280cd507c8e510ba;hpb=ee75de39f4e8247f694b328163fc974ba791305f diff --git a/registryd/registry.c b/registryd/registry.c index c24eb37..a257a39 100644 --- a/registryd/registry.c +++ b/registryd/registry.c @@ -56,14 +56,27 @@ typedef enum { ETYPE_WINDOW, ETYPE_TOOLKIT, ETYPE_LAST_DEFINED -} EventTypeMajor; +} EventTypeCategory; typedef struct { - EventTypeMajor major; + char *event_name; + EventTypeCategory type_cat; + char * major; char * minor; char * detail; + guint hash; } EventTypeStruct; +typedef struct { + Accessibility_EventListener listener; + guint event_type_hash; + EventTypeCategory event_type_cat; +} ListenerStruct; + +/* static function prototypes */ +static void registry_notify_listeners ( GList *listeners, + const Accessibility_Event *e, + CORBA_Environment *ev); /* * Implemented GObject::finalize @@ -97,7 +110,6 @@ impl_accessibility_registry_register_application (PortableServer_Servant servant #ifdef SPI_DEBUG fprintf (stderr, "registering app %p\n", application); #endif - ORBit_register_objref (application); registry->desktop->applications = g_list_append (registry->desktop->applications, CORBA_Object_duplicate (application, ev)); @@ -120,9 +132,98 @@ compare_object_hash (gconstpointer p1, gconstpointer p2) } static void +register_with_toolkits (Registry *registry_bonobo_object, EventTypeStruct *etype, CORBA_Environment *ev) +{ + gint n_desktops; + gint n_apps; + gint i, j; + Accessibility_Desktop desktop; + Accessibility_Application app; + Accessibility_Registry registry; + registry = bonobo_object_corba_objref (bonobo_object (registry_bonobo_object)); + + /* for each app in each desktop, call ...Application_registerToolkitEventListener */ + + n_desktops = Accessibility_Registry_getDesktopCount (registry, ev); + + for (i=0; ievent_name), + ev); + } + } +} + +static gint +compare_listener_hash (gconstpointer p1, gconstpointer p2) +{ + return (((ListenerStruct *)p2)->event_type_hash - ((ListenerStruct *)p1)->event_type_hash); +} + +static void parse_event_type (EventTypeStruct *etype, char *event_name) { - etype->major = ETYPE_FOCUS; + guint nbytes = 0; + gchar **split_string; + + split_string = g_strsplit(event_name, ":", 4); + etype->event_name = g_strndup(event_name, 255); + + if (!g_ascii_strncasecmp (event_name, "focus:", 6)) + { + etype->type_cat = ETYPE_FOCUS; + } + else if (!g_ascii_strncasecmp (event_name, "window:", 7)) + { + etype->type_cat = ETYPE_WINDOW; + } + else + { + etype->type_cat = ETYPE_TOOLKIT; + } + + if (split_string[1]) + { + etype->major = split_string[1]; + if (split_string[2]) + { + 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 ( 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 ! */ } /** @@ -158,37 +259,68 @@ impl_accessibility_registry_register_global_event_listener const CORBA_char *event_name, CORBA_Environment *ev) { - /** - * TODO: - * - * distinguish between event types - * register with app toolkits only for requested event types - * maintain list of requested types and number of listeners - * find non-strcmp method of matching event types to listeners - * - **/ - Registry *registry = REGISTRY (bonobo_object_from_servant (servant)); - /* fprintf(stderr, "registering %x/%x\n", listener, *listener); */ + ListenerStruct *ls = g_malloc (sizeof (ListenerStruct)); 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); + ls->event_type_hash = etype.hash; + ls->event_type_cat = etype.type_cat; - /* parse, check major event type */ - switch (etype.major) + switch (etype.type_cat) { case (ETYPE_FOCUS) : + ls->listener = CORBA_Object_duplicate (listener, ev); + registry->focus_listeners = + g_list_append (registry->focus_listeners, ls); break; case (ETYPE_WINDOW) : + /* Support for Window Manager Events is not yet implemented */ 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: break; } +} + +/* + * CORBA Accessibility::Registry::deregisterGlobalEventListenerAll method implementation + */ +static void +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); + + /* + * TODO : de-register with toolkit if the last instance of a listener + * to a particular toolkit event type has been deregistered. + */ - registry->listeners = g_list_append (registry->listeners, CORBA_Object_duplicate(listener, ev)); - /* fprintf(stderr, "there are now %d listeners registered.\n", g_list_length(registry->listeners)); */ - /* should use hashtable and CORBA_Object_hash (...) */ + 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); + } + list = g_list_find_custom (registry->toolkit_listeners, listener, compare_object_hash); + 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); + } } /* @@ -198,12 +330,40 @@ static void 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)); - /* TODO: this won't work since 'listener' is a duplicate ref */ - registry->listeners = g_list_remove (registry->listeners, listener); - /* fprintf(stderr, "deregister\n"); */ + ListenerStruct ls; + EventTypeStruct etype; + GList *list; + GList **listeners; + + parse_event_type (&etype, event_name); + switch (etype.type_cat) + { + case (ETYPE_FOCUS) : + listeners = ®istry->focus_listeners; + break; + case (ETYPE_WINDOW) : + /* Support for Window Manager Events is not yet implemented */ + break; + case (ETYPE_TOOLKIT) : + listeners = ®istry->toolkit_listeners; + break; + default: + break; + } + + ls.event_type_hash = etype.hash; + list = g_list_find_custom (*listeners, &ls, compare_listener_hash); + + while (list) + { + fprintf (stderr, "deregistering listener\n"); + *listeners = g_list_delete_link (*listeners, list); + list = g_list_find_custom (*listeners, &ls, compare_listener_hash); + } } @@ -282,31 +442,66 @@ impl_registry_notify_event (PortableServer_Servant servant, const Accessibility_Event *e, CORBA_Environment *ev) { - int n; - int len; Registry *registry = REGISTRY (bonobo_object_from_servant (servant)); + EventTypeStruct etype; + + parse_event_type (&etype, e->type); - /** - * TODO: - * - * distinguish between event types - * find non-strcmp method of matching event types to listeners - * - **/ + switch (etype.type_cat) + { + case (ETYPE_FOCUS) : + registry_notify_listeners (registry->focus_listeners, e, ev); + break; + case (ETYPE_WINDOW) : + registry_notify_listeners (registry->window_listeners, e, ev); + break; + case (ETYPE_TOOLKIT) : + registry_notify_listeners (registry->toolkit_listeners, e, ev); + break; + default: + break; + } + bonobo_object_release_unref (e->target, ev); +} - len = g_list_length (registry->listeners); - /* fprintf(stderr, "%d listeners registered\n", len); */ +static void +registry_notify_listeners ( GList *listeners, + const Accessibility_Event *e, + CORBA_Environment *ev) +{ + int n; + int len; + ListenerStruct *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); for (n=0; ntarget, ev)); + 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 - Accessibility_EventListener_notifyEvent ( - (Accessibility_EventListener) g_list_nth_data (registry->listeners, n), - e, - ev); + 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)); +#endif + bonobo_object_dup_ref ( e->target, ev); + Accessibility_EventListener_notifyEvent ((Accessibility_EventListener) ls->listener, + e, + ev); + if (ev->_major != CORBA_NO_EXCEPTION) { + fprintf(stderr, + ("Accessibility app error: exception during event notification: %s\n"), + CORBA_exception_id(ev)); + exit(-1); + } + } } } @@ -324,6 +519,7 @@ registry_class_init (RegistryClass *klass) 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->getDesktopCount = impl_accessibility_registry_get_desktop_count; epv->getDesktop = impl_accessibility_registry_get_desktop; epv->getDesktopList = impl_accessibility_registry_get_desktop_list; @@ -334,7 +530,9 @@ registry_class_init (RegistryClass *klass) static void registry_init (Registry *registry) { - registry->listeners = NULL; + registry->focus_listeners = NULL; + registry->window_listeners = NULL; + registry->toolkit_listeners = NULL; registry->applications = NULL; registry->desktop = desktop_new(); } @@ -358,10 +556,10 @@ registry_get_type (void) NULL /* value table */ }; /* - * Here we use bonobo_x_type_unique instead of + * 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_x_type_unique. + * use bonobo_type_unique. */ type = bonobo_type_unique ( PARENT_TYPE,