X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=registryd%2Fregistry.c;h=51aaa4d3cb7e7f10560073a5bf6eef96267e501d;hp=b5610fe160c533fed8590a3128c46e571c0de00a;hb=95ac4886d1b6649d54daffa7191be1b2bbaf2989;hpb=7a975e34b329ce50c37545609cb7e8a6eaae88c5 diff --git a/registryd/registry.c b/registryd/registry.c index b5610fe..51aaa4d 100644 --- a/registryd/registry.c +++ b/registryd/registry.c @@ -28,6 +28,12 @@ #include "registry.h" +enum +{ + REGISTRY_APPLICATION_REMOVE = 0, + REGISTRY_APPLICATION_ADD = 1 +}; + /*---------------------------------------------------------------------------*/ G_DEFINE_TYPE(SpiRegistry, spi_registry, G_TYPE_OBJECT) @@ -59,57 +65,38 @@ static void emit(SpiRegistry *reg, const char *itf, const char *name, int ftype, /*---------------------------------------------------------------------------*/ -static void -add_bus_name_cb (gpointer item, gpointer data) +static gint +data_str_cmp (gpointer a, gpointer b, gpointer data) { - DBusMessageIter *iter_array = (DBusMessageIter *) data; - - dbus_message_iter_append_basic (iter_array, DBUS_TYPE_STRING, (gchar **) &item); + return g_strcmp0(a, b); } -static DBusMessage * -impl_getApplications (DBusConnection *bus, DBusMessage *message, void *user_data) +static gboolean +seq_add_string (GSequence *seq, gchar *str) { - DBusMessage *reply; - DBusMessageIter iter, iter_array; - SpiRegistry *reg = SPI_REGISTRY (user_data); - - reply = dbus_message_new_method_return (message); - - dbus_message_iter_init_append (reply, &iter); - dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &iter_array); - g_sequence_foreach (reg->apps, add_bus_name_cb, &iter_array); - dbus_message_iter_close_container(&iter, &iter_array); - return reply; -} + GSequenceIter *iter; + gchar *item; + gboolean res = FALSE; -static DBusHandlerResult -message_handler (DBusConnection *bus, DBusMessage *message, void *user_data) -{ - DBusMessage *reply = NULL; + iter = g_sequence_search (seq, str, (GCompareDataFunc) data_str_cmp, NULL); + iter = g_sequence_iter_prev (iter); - if (dbus_message_is_method_call (message, SPI_DBUS_INTERFACE_REGISTRY, "getApplications")) + if (!g_sequence_iter_is_end (iter)) { - reply = impl_getApplications (bus, message, user_data); - if (reply) + item = g_sequence_get (iter); + if (g_strcmp0 (item, str)) { - dbus_connection_send (bus, reply, NULL); - dbus_message_unref (reply); + g_sequence_insert_sorted (seq, g_strdup(str), (GCompareDataFunc) data_str_cmp, NULL); + res = TRUE; } - return DBUS_HANDLER_RESULT_HANDLED; } else { - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + g_sequence_insert_sorted (seq, g_strdup(str), (GCompareDataFunc) data_str_cmp, NULL); + res = TRUE; } -} -/*---------------------------------------------------------------------------*/ - -static gint -data_str_cmp (gpointer a, gpointer b, gpointer data) -{ - return g_strcmp0(a, b); + return res; } static gboolean @@ -135,75 +122,123 @@ seq_remove_string (GSequence *seq, gchar *str) } static void -handle_register_application (SpiRegistry *reg, DBusMessage *message) +add_application (DBusConnection *bus, SpiRegistry *reg, gchar *app) +{ + guint add = REGISTRY_APPLICATION_ADD; + + if (seq_add_string (reg->apps, app)) + { + emit (reg, + SPI_DBUS_INTERFACE_REGISTRY, + "updateApplications", + DBUS_TYPE_INT32, + &add, + DBUS_TYPE_STRING, + &app, + DBUS_TYPE_INVALID); + } +} + +static void +remove_application (DBusConnection *bus, SpiRegistry *reg, gchar *app) +{ + guint remove = REGISTRY_APPLICATION_REMOVE; + + if (seq_remove_string (reg->apps, app)) + { + /*TODO spi_remove_device_listeners (registry->de_controller, old);*/ + emit (reg, + SPI_DBUS_INTERFACE_REGISTRY, + "updateApplications", + DBUS_TYPE_INT32, + &remove, + DBUS_TYPE_STRING, + &app, + DBUS_TYPE_INVALID); + } +} + +/*---------------------------------------------------------------------------*/ + +static void +add_bus_name_cb (gpointer item, gpointer data) +{ + DBusMessageIter *iter_array = (DBusMessageIter *) data; + + dbus_message_iter_append_basic (iter_array, DBUS_TYPE_STRING, (gchar **) &item); +} + +static DBusMessage * +impl_getApplications (DBusConnection *bus, DBusMessage *message, void *user_data) +{ + DBusMessage *reply; + DBusMessageIter iter, iter_array; + SpiRegistry *reg = SPI_REGISTRY (user_data); + + reply = dbus_message_new_method_return (message); + + dbus_message_iter_init_append (reply, &iter); + dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &iter_array); + g_sequence_foreach (reg->apps, add_bus_name_cb, &iter_array); + dbus_message_iter_close_container(&iter, &iter_array); + return reply; +} + +/*---------------------------------------------------------------------------*/ + +static void +impl_registerApplication (DBusConnection *bus, DBusMessage *message, void *user_data) { gchar *app_name; + SpiRegistry *reg = SPI_REGISTRY (user_data); if (dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &app_name, DBUS_TYPE_INVALID)) - g_sequence_insert_sorted (reg->apps, app_name, (GCompareDataFunc) data_str_cmp, NULL); + add_application(bus, reg, app_name); } static void -handle_deregister_application (SpiRegistry *reg, DBusMessage *message) +impl_deregisterApplication (DBusConnection *bus, DBusMessage *message, void *user_data) { gchar *app_name; + SpiRegistry *reg = SPI_REGISTRY (user_data); if (dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &app_name, DBUS_TYPE_INVALID)) - seq_remove_string (reg->apps, app_name); + remove_application(bus, reg, app_name); } +/*---------------------------------------------------------------------------*/ + static void -handle_disconnection (SpiRegistry *reg, DBusMessage *message) +handle_disconnection (DBusConnection *bus, DBusMessage *message, void *user_data) { char *name, *old, *new; + SpiRegistry *reg = SPI_REGISTRY (user_data); if (dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &old, DBUS_TYPE_STRING, &new, DBUS_TYPE_INVALID)) - { - if (*old != '\0' && *new == '\0') { - if (seq_remove_string (reg->apps, old)) + if (*old != '\0' && *new == '\0') { - /*Emit deregistered signal here*/ - emit (reg, SPI_DBUS_INTERFACE_TREE, "deregisterApplication", DBUS_TYPE_STRING, old); - /*TODO spi_remove_device_listeners (registry->de_controller, old);*/ + remove_application(bus, reg, old); } } - } } +/*---------------------------------------------------------------------------*/ + static DBusHandlerResult -signal_handler (DBusConnection *bus, DBusMessage *message, void *user_data) +signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) { SpiRegistry *registry = SPI_REGISTRY (user_data); guint res = DBUS_HANDLER_RESULT_HANDLED; const char *iface = dbus_message_get_interface (message); const char *member = dbus_message_get_member (message); - g_print ("\n%s", iface); - g_print ("\n%d", dbus_message_get_type (message)); - g_print ("\n%s\n", member); - -#if 0 - if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) - handle_disconnection (registry, message); - else if (dbus_message_is_signal (message, SPI_DBUS_INTERFACE_TREE, "registerApplication")) - handle_register_application (registry, message); - else if (dbus_message_is_signal (message, SPI_DBUS_INTERFACE_TREE, "deregisterApplication")) - handle_deregister_application (registry, message); - else - res = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -#endif - if (!g_strcmp0(iface, DBUS_INTERFACE_DBUS) && !g_strcmp0(member, "NameOwnerChanged")) - handle_disconnection (registry, message); - else if (!g_strcmp0(iface, SPI_DBUS_INTERFACE_TREE) && !g_strcmp0(member, "registerApplication")) - handle_register_application (registry, message); - else if (!g_strcmp0(iface, SPI_DBUS_INTERFACE_TREE) && !g_strcmp0(member, "deregisterApplication")) - handle_deregister_application (registry, message); + handle_disconnection (bus, message, user_data); else res = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -212,31 +247,38 @@ signal_handler (DBusConnection *bus, DBusMessage *message, void *user_data) /*---------------------------------------------------------------------------*/ -static gchar *app_reg_sig_match = "type='signal', interface='org.freedesktop.atspi.Tree', member='registerApplication'"; -static gchar *app_dereg_sig_match = "type='signal', interface='org.freedesktop.atspi.Tree', member='deregisterApplication'"; +static gchar *app_sig_match_name_owner = + "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged'"; -static gchar *app_sig_match_blank = ""; - -static DBusObjectPathVTable reg_vtable = +static DRouteMethod dev_methods[] = { - NULL, - &message_handler, - NULL, NULL, NULL, NULL + { impl_getApplications, "getApplications" }, + { impl_registerApplication, "registerApplication" }, + { impl_deregisterApplication, "deregisterApplication" }, + { NULL, NULL } }; SpiRegistry * -spi_registry_new (DBusConnection *bus) +spi_registry_new (DBusConnection *bus, DRouteContext *droute) { SpiRegistry *reg = g_object_new (SPI_REGISTRY_TYPE, NULL); + DRoutePath *path; reg->bus = bus; - dbus_connection_register_object_path(bus, SPI_DBUS_PATH_REGISTRY, ®_vtable, reg); + dbus_bus_add_match (bus, app_sig_match_name_owner, NULL); + dbus_connection_add_filter (bus, signal_filter, reg, NULL); + + path = droute_add_one (droute, + SPI_DBUS_PATH_REGISTRY, + reg); - //dbus_bus_add_match (bus, app_reg_sig_match, NULL); - //dbus_bus_add_match (bus, app_dereg_sig_match, NULL); - dbus_bus_add_match (bus, app_sig_match_blank, NULL); - dbus_connection_add_filter (bus, signal_handler, reg, NULL); + droute_path_add_interface (path, + SPI_DBUS_INTERFACE_DEC, + dev_methods, + NULL); return reg; } + +/*END------------------------------------------------------------------------*/