X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=registryd%2Fregistry.c;h=1cb44317624142a3552ce5677d605d5becd5a92b;hb=c2b7a29219b5d36c629deaca6e1ffdc1db6ecb68;hp=e2d84897395f33de1fea19c56ff796d607c036cf;hpb=ae6cdde4fc325b7a9fa83fb1de88a10e370467f6;p=platform%2Fupstream%2Fat-spi2-core.git diff --git a/registryd/registry.c b/registryd/registry.c index e2d8489..1cb4431 100644 --- a/registryd/registry.c +++ b/registryd/registry.c @@ -24,18 +24,27 @@ #include #include -#include +#include #include "paths.h" #include "registry.h" +#include "introspection.h" -static gboolean +typedef struct event_data event_data; +struct event_data +{ + gchar *bus_name; + gchar **data; + GSList *properties; +}; + +static void children_added_listener (DBusConnection * bus, gint index, const gchar * name, const gchar * path); -static gboolean +static void children_removed_listener (DBusConnection * bus, gint index, const gchar * name, @@ -76,8 +85,6 @@ G_DEFINE_TYPE(SpiRegistry, spi_registry, G_TYPE_OBJECT) static void spi_registry_class_init (SpiRegistryClass *klass) { - GObjectClass * object_class = (GObjectClass *) klass; - spi_registry_parent_class = g_type_class_ref (G_TYPE_OBJECT); } @@ -94,22 +101,27 @@ return_v_string (DBusMessageIter * iter, const gchar * str) { DBusMessageIter variant; - dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "s", - &variant); - dbus_message_iter_append_basic (&variant, DBUS_TYPE_STRING, &str); + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "s", + &variant)) + return FALSE; + + dbus_message_iter_append_basic (&variant, DBUS_TYPE_STRING, &str); dbus_message_iter_close_container (iter, &variant); + return TRUE; } -static void +static dbus_bool_t append_reference (DBusMessageIter * iter, const char * name, const char * path) { DBusMessageIter iter_struct; - dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, - &iter_struct); + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL, + &iter_struct)) + return FALSE; dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path); dbus_message_iter_close_container (iter, &iter_struct); + return TRUE; } /*---------------------------------------------------------------------------*/ @@ -133,11 +145,12 @@ find_index_of_reference (GPtrArray *arr, const gchar *name, const gchar * path, ref = spi_reference_new (name, path); - for (i = 0; i < arr->len && found == FALSE; i++) + for (i = 0; i < arr->len; i++) { - if (compare_reference (ref, g_ptr_array_index (arr, i))); + if (compare_reference (ref, g_ptr_array_index (arr, i))) { found = TRUE; + break; } } @@ -155,12 +168,108 @@ add_application (SpiRegistry *reg, DBusConnection *bus, const gchar *name, const } static void +set_id (SpiRegistry *reg, DBusConnection *bus, const gchar *name, const gchar *path) +{ + DBusMessage *message; + DBusMessageIter iter, iter_variant; + const char *iface_application = "org.a11y.atspi.Application"; + const char *id = "Id"; + + message = dbus_message_new_method_call (name, path, + DBUS_INTERFACE_PROPERTIES, "Set"); + if (!message) + return; + dbus_message_iter_init_append (message, &iter); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &iface_application); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &id); + dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "i", &iter_variant); + dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, ®->id); + /* TODO: This will cause problems if we cycle through 2^31 ids */ + reg->id++; + dbus_message_iter_close_container (&iter, &iter_variant); + dbus_connection_send (bus, message, NULL); + dbus_message_unref (message); +} + +static void remove_application (SpiRegistry *reg, DBusConnection *bus, guint index) { - const gchar *name = ""; + SpiReference *ref = g_ptr_array_index (reg->apps, index); + + spi_remove_device_listeners (reg->dec, ref->name); + children_removed_listener (bus, index, ref->name, ref->path); g_ptr_array_remove_index (reg->apps, index); - /*TODO spi_remove_device_listeners (registry->de_controller, old);*/ - children_removed_listener (bus, index, name, SPI_DBUS_PATH_NULL); +} + +static gboolean +event_is_subtype (gchar **needle, gchar **haystack) +{ + while (*haystack && **haystack) + { + if (g_strcmp0 (*needle, *haystack)) + return FALSE; + needle++; + haystack++; + } + return TRUE; +} + +static gboolean +needs_mouse_poll (char **event) +{ + if (g_strcmp0 (event [0], "Mouse") != 0) + return FALSE; + if (!event [1] || !event [1][0]) + return TRUE; + return (g_strcmp0 (event [1], "Abs") == 0); +} + +static void +remove_events (SpiRegistry *registry, const char *bus_name, const char *event) +{ + gchar **remove_data; + GList *list; + gboolean mouse_found = FALSE; + DBusMessage *signal; + + remove_data = g_strsplit (event, ":", 3); + if (!remove_data) + { + return; + } + + for (list = registry->events; list;) + { + event_data *evdata = list->data; + list = list->next; + if (!g_strcmp0 (evdata->bus_name, bus_name) && + event_is_subtype (evdata->data, remove_data)) + { + g_strfreev (evdata->data); + g_free (evdata->bus_name); + g_slist_free_full (evdata->properties, g_free); + g_free (evdata); + registry->events = g_list_remove (registry->events, evdata); + } + else + { + if (needs_mouse_poll (evdata->data)) + mouse_found = TRUE; + } + } + + if (!mouse_found) + spi_device_event_controller_stop_poll_mouse (); + + g_strfreev (remove_data); + + signal = dbus_message_new_signal (SPI_DBUS_PATH_REGISTRY, + SPI_DBUS_INTERFACE_REGISTRY, + "EventListenerDeregistered"); + dbus_message_append_args (signal, DBUS_TYPE_STRING, &bus_name, + DBUS_TYPE_STRING, &event, DBUS_TYPE_INVALID); + dbus_connection_send (registry->bus, signal, NULL); + dbus_message_unref (signal); } static void @@ -182,25 +291,66 @@ handle_disconnection (DBusConnection *bus, DBusMessage *message, void *user_data for (i = 0; i < reg->apps->len; i++) { SpiReference *ref = g_ptr_array_index (reg->apps, i); - while (!g_strcmp0 (old, ref->name)) + if (!g_strcmp0 (old, ref->name)) { - g_ptr_array_remove_index (reg->apps, i); - children_removed_listener (bus, i, old, SPI_DBUS_PATH_NULL); + remove_application (reg, bus, i); + i--; } } + + remove_events (reg, old, ""); } } } +/* + * Converts names of the form "active-descendant-changed" to + *" ActiveDescendantChanged" + */ +static gchar * +ensure_proper_format (const char *name) +{ + gchar *ret = (gchar *) g_malloc (strlen (name) * 2 + 2); + gchar *p = ret; + gboolean need_upper = TRUE; + + if (!ret) + return NULL; + while (*name) + { + if (need_upper) + { + *p++ = toupper (*name); + need_upper = FALSE; + } + else if (*name == '-') + need_upper = TRUE; + else if (*name == ':') + { + need_upper = TRUE; + *p++ = *name; + } + else + *p++ = *name; + name++; + } + *p = '\0'; + return ret; +} + static DBusHandlerResult signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data) { - SpiRegistry *registry = SPI_REGISTRY (user_data); guint res = DBUS_HANDLER_RESULT_HANDLED; + const gint type = dbus_message_get_type (message); const char *iface = dbus_message_get_interface (message); const char *member = dbus_message_get_member (message); - if (!g_strcmp0(iface, DBUS_INTERFACE_DBUS) && !g_strcmp0(member, "NameOwnerChanged")) + if (type != DBUS_MESSAGE_TYPE_SIGNAL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + if (!g_strcmp0(iface, DBUS_INTERFACE_DBUS) && + !g_strcmp0(member, "NameOwnerChanged")) handle_disconnection (bus, message, user_data); else res = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -216,13 +366,18 @@ impl_Embed (DBusConnection *bus, DBusMessage *message, void *user_data) { SpiRegistry *reg = SPI_REGISTRY (user_data); DBusMessageIter iter, iter_struct; - gchar *app_name, *obj_path; + const gchar *app_name, *obj_path; + + DBusMessage *reply = NULL; + DBusMessageIter reply_iter; dbus_message_iter_init (message, &iter); dbus_message_iter_recurse (&iter, &iter_struct); if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_STRING)) goto error; dbus_message_iter_get_basic (&iter_struct, &app_name); + if (!app_name) + app_name = dbus_message_get_sender (message); if (!dbus_message_iter_next (&iter_struct)) goto error; if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_OBJECT_PATH)) @@ -231,7 +386,15 @@ impl_Embed (DBusConnection *bus, DBusMessage *message, void *user_data) add_application(reg, bus, app_name, obj_path); - return NULL; + set_id (reg, bus, app_name, obj_path); + + reply = dbus_message_new_method_return (message); + dbus_message_iter_init_append (reply, &reply_iter); + append_reference (&reply_iter, + dbus_bus_get_unique_name (bus), + SPI_DBUS_PATH_ROOT); + + return reply; error: return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Invalid arguments"); } @@ -297,7 +460,6 @@ impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message, static DBusMessage * impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data) { - dbus_uint32_t coord_type; dbus_int32_t x = 0, y = 0, width = 1024, height = 768; DBusMessage *reply; DBusMessageIter iter, iter_struct; @@ -380,6 +542,30 @@ impl_GrabFocus (DBusConnection * bus, DBusMessage * message, void *user_data) } static DBusMessage * +impl_ClearHighlight (DBusConnection * bus, DBusMessage * message, void *user_data) +{ + DBusMessage *reply; + dbus_bool_t retval = FALSE; + + reply = dbus_message_new_method_return (message); + dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval, + DBUS_TYPE_INVALID); + return reply; +} + +static DBusMessage * +impl_GrabHighlight (DBusConnection * bus, DBusMessage * message, void *user_data) +{ + DBusMessage *reply; + dbus_bool_t retval = FALSE; + + reply = dbus_message_new_method_return (message); + dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval, + DBUS_TYPE_INVALID); + return reply; +} + +static DBusMessage * impl_GetAlpha (DBusConnection * bus, DBusMessage * message, void *user_data) { double rv = 1.0; @@ -412,9 +598,14 @@ static dbus_bool_t impl_get_Parent (DBusMessageIter * iter, void *user_data) { const gchar *name = ""; - append_reference (iter, + DBusMessageIter iter_variant; + + dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "(so)", + &iter_variant); + append_reference (&iter_variant, name, SPI_DBUS_PATH_NULL); + dbus_message_iter_close_container (iter, &iter_variant); return TRUE; } @@ -423,8 +614,27 @@ impl_get_ChildCount (DBusMessageIter * iter, void *user_data) { SpiRegistry *reg = SPI_REGISTRY (user_data); dbus_int32_t rv = reg->apps->len; + dbus_bool_t result; + DBusMessageIter iter_variant; + + if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "i", + &iter_variant)) + return FALSE; + result = dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, &rv); + dbus_message_iter_close_container (iter, &iter_variant); + return result; +} + +static dbus_bool_t +impl_get_ToolkitName (DBusMessageIter * iter, void *user_data) +{ + return return_v_string (iter, "at-spi-registry"); +} - dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &rv); +static dbus_bool_t +impl_get_ToolkitVersion (DBusMessageIter * iter, void *user_data) +{ + return return_v_string (iter, "2.0"); } static DBusMessage * @@ -448,8 +658,13 @@ impl_GetChildAtIndex (DBusConnection * bus, reply = dbus_message_new_method_return (message); dbus_message_iter_init_append (reply, &iter); - ref = g_ptr_array_index (reg->apps, i); - append_reference (&iter, ref->name, ref->path); + if (i < 0 || i >= reg->apps->len) + append_reference (&iter, SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_NULL); + else + { + ref = g_ptr_array_index (reg->apps, i); + append_reference (&iter, ref->name, ref->path); + } return reply; } @@ -484,7 +699,7 @@ impl_GetIndexInParent (DBusConnection * bus, dbus_uint32_t rv = 0; reply = dbus_message_new_method_return (message); - dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, DBUS_TYPE_INVALID); + dbus_message_append_args (reply, DBUS_TYPE_INT32, &rv, DBUS_TYPE_INVALID); return reply; } @@ -507,7 +722,7 @@ static DBusMessage * impl_GetRole (DBusConnection * bus, DBusMessage * message, void * user_data) { DBusMessage *reply; - dbus_uint32_t rv = 0; + dbus_uint32_t rv = 14; /* TODO: Get DESKTOP_FRAME from somewhere */ reply = dbus_message_new_method_return (message); dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, DBUS_TYPE_INVALID); @@ -519,7 +734,7 @@ impl_GetRoleName (DBusConnection * bus, DBusMessage * message, void *user_data) { DBusMessage *reply; - const char *role_name = "unknown"; + const char *role_name = "desktop frame"; reply = dbus_message_new_method_return (message); dbus_message_append_args (reply, DBUS_TYPE_STRING, &role_name, @@ -533,7 +748,7 @@ impl_GetLocalizedRoleName (DBusConnection * bus, { /* TODO - Localize this */ DBusMessage *reply; - const char *role_name = "unknown"; + const char *role_name = "desktop frame"; reply = dbus_message_new_method_return (message); dbus_message_append_args (reply, DBUS_TYPE_STRING, &role_name, @@ -616,6 +831,149 @@ impl_GetInterfaces (DBusConnection * bus, return reply; } +static DBusMessage * +impl_GetItems (DBusConnection * bus, DBusMessage * message, void *user_data) +{ + DBusMessage *reply; + DBusMessageIter iter, iter_array; + + reply = dbus_message_new_method_return (message); + + dbus_message_iter_init_append (reply, &iter); + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, + "((so)(so)(so)a(so)assusau)", &iter_array); + dbus_message_iter_close_container (&iter, &iter_array); + return reply; +} + +/* I would rather these two be signals, but I'm not sure that dbus-python + * supports emitting signals except for a service, so implementing as both + * a method call and signal for now. + */ +static DBusMessage * +impl_register_event (DBusConnection *bus, DBusMessage *message, void *user_data) +{ + SpiRegistry *registry = SPI_REGISTRY (user_data); + const char *orig_name; + gchar *name; + event_data *evdata; + gchar **data; + DBusMessage *signal; + const char *sender = dbus_message_get_sender (message); + DBusMessageIter iter, iter_array; + const char *signature = dbus_message_get_signature (message); + + if (strcmp (signature, "sas") != 0 && + strcmp (signature, "s") != 0) + { + g_warning ("got RegisterEvent with invalid signature '%s'", signature); + return NULL; + } + + dbus_message_iter_init (message, &iter); + dbus_message_iter_get_basic (&iter, &orig_name); + dbus_message_iter_next (&iter); + name = ensure_proper_format (orig_name); + + evdata = g_new0 (event_data, 1); + data = g_strsplit (name, ":", 3); + evdata->bus_name = g_strdup (sender); + evdata->data = data; + + if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_ARRAY) + { + dbus_message_iter_recurse (&iter, &iter_array); + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) + { + const char *property; + dbus_message_iter_get_basic (&iter_array, &property); + evdata->properties = g_slist_append (evdata->properties, + g_strdup (property)); + dbus_message_iter_next (&iter_array); + } + } + registry->events = g_list_append (registry->events, evdata); + + if (needs_mouse_poll (evdata->data)) + { + spi_device_event_controller_start_poll_mouse (registry); + } + + signal = dbus_message_new_signal (SPI_DBUS_PATH_REGISTRY, + SPI_DBUS_INTERFACE_REGISTRY, + "EventListenerRegistered"); + if (signal) + { + GSList *ls = evdata->properties; + dbus_message_iter_init_append (signal, &iter); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &sender); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &name); + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "s", &iter_array); + while (ls) + { + dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &ls->data); + ls = g_slist_next (ls); + } + dbus_message_iter_close_container (&iter, &iter_array); + dbus_connection_send (bus, signal, NULL); + dbus_message_unref (signal); + } + + g_free (name); + return dbus_message_new_method_return (message); +} + +static DBusMessage * +impl_deregister_event (DBusConnection *bus, DBusMessage *message, void *user_data) +{ + SpiRegistry *registry = SPI_REGISTRY (user_data); + const char *orig_name; + gchar *name; + const char *sender = dbus_message_get_sender (message); + + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &orig_name, + DBUS_TYPE_INVALID)) + return NULL; + name = ensure_proper_format (orig_name); + + remove_events (registry, sender, name); + + g_free (name); + return dbus_message_new_method_return (message); +} + +static DBusMessage * +impl_get_registered_events (DBusConnection *bus, DBusMessage *message, void *user_data) +{ + SpiRegistry *registry = SPI_REGISTRY (user_data); + event_data *evdata; + DBusMessage *reply; + DBusMessageIter iter, iter_struct, iter_array; + GList *list; + + reply = dbus_message_new_method_return (message); + if (!reply) + return NULL; + + dbus_message_iter_init_append (reply, &iter); + dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ss)", &iter_array); + for (list = registry->events; list; list = list->next) + { + gchar *str; + evdata = list->data; + str = g_strconcat (evdata->data [0], + ":", (evdata->data [1]? evdata->data [1]: ""), + ":", (evdata->data [1] && evdata->data [2]? evdata->data [2]: ""), NULL); + dbus_message_iter_open_container (&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &evdata->bus_name); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &str); + dbus_message_iter_close_container (&iter_array, &iter_struct); + g_free (str); + } + dbus_message_iter_close_container (&iter, &iter_array); + return reply; +} + /*---------------------------------------------------------------------------*/ static void @@ -635,6 +993,72 @@ emit_Available (DBusConnection * bus) /*---------------------------------------------------------------------------*/ +static const char *introspection_header = +"\n"; + +static const char *introspection_node_element = +"\n"; + +static const char *introspection_footer = +""; + +static DBusMessage * +impl_Introspect_root (DBusConnection * bus, + DBusMessage * message, void *user_data) +{ + GString *output; + gchar *final; + + const gchar *pathstr = SPI_DBUS_PATH_ROOT; + + DBusMessage *reply; + + output = g_string_new(introspection_header); + + g_string_append_printf(output, introspection_node_element, pathstr); + + g_string_append (output, spi_org_a11y_atspi_Accessible); + g_string_append (output, spi_org_a11y_atspi_Component); + + g_string_append(output, introspection_footer); + final = g_string_free(output, FALSE); + + reply = dbus_message_new_method_return (message); + dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID); + + g_free(final); + return reply; +} + +static DBusMessage * +impl_Introspect_registry (DBusConnection * bus, + DBusMessage * message, void *user_data) +{ + GString *output; + gchar *final; + + const gchar *pathstr = SPI_DBUS_PATH_REGISTRY; + + DBusMessage *reply; + + output = g_string_new(introspection_header); + + g_string_append_printf(output, introspection_node_element, pathstr); + + g_string_append (output, spi_org_a11y_atspi_Registry); + + g_string_append(output, introspection_footer); + final = g_string_free(output, FALSE); + + reply = dbus_message_new_method_return (message); + dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID); + + g_free(final); + return reply; +} + +/*---------------------------------------------------------------------------*/ + /* * Emits an AT-SPI event. * AT-SPI events names are split into three parts: @@ -662,9 +1086,6 @@ emit_event (DBusConnection *bus, dbus_message_iter_init_append(sig, &iter); - append_reference (&iter, - dbus_bus_get_unique_name (bus), - SPI_DBUS_PATH_ROOT); dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &minor); dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail1); dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail2); @@ -674,6 +1095,10 @@ emit_event (DBusConnection *bus, append_reference (&iter_variant, name, path); dbus_message_iter_close_container (&iter, &iter_variant); + append_reference (&iter, + dbus_bus_get_unique_name (bus), + SPI_DBUS_PATH_ROOT); + dbus_connection_send(bus, sig, NULL); dbus_message_unref(sig); } @@ -683,7 +1108,7 @@ emit_event (DBusConnection *bus, /* * Children changed signal converter and forwarder. * - * Klass (Interface) org.freedesktop.atspi.Event.Object + * Klass (Interface) org.a11y.atspi.Event.Object * Major is the signal name. * Minor is 'add' or 'remove' * detail1 is the index. @@ -691,7 +1116,7 @@ emit_event (DBusConnection *bus, * any_data is the child reference. */ -static gboolean +static void children_added_listener (DBusConnection * bus, gint index, const gchar * name, @@ -701,20 +1126,20 @@ children_added_listener (DBusConnection * bus, name, path); } -static gboolean +static void children_removed_listener (DBusConnection * bus, gint index, const gchar * name, const gchar * path) { emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "remove", index, 0, - name, SPI_DBUS_PATH_NULL); + name, path); } /*---------------------------------------------------------------------------*/ static DBusHandlerResult -handle_method (DBusConnection *bus, DBusMessage *message, void *user_data) +handle_method_root (DBusConnection *bus, DBusMessage *message, void *user_data) { DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -769,6 +1194,23 @@ handle_method (DBusConnection *bus, DBusMessage *message, void *user_data) reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); } } + else if (!strcmp (prop_iface, SPI_DBUS_INTERFACE_APPLICATION)) + { + if (!strcmp (prop_member, "ToolkitName")) + impl_get_ToolkitName (&iter, user_data); + else if (!strcmp (prop_member, "ToolkitVersion")) + impl_get_ToolkitVersion (&iter, user_data); + else + { + dbus_message_unref (reply); + reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); + } + } + else + { + dbus_message_unref (reply); + reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); + } } else { @@ -830,6 +1272,10 @@ handle_method (DBusConnection *bus, DBusMessage *message, void *user_data) reply = impl_GetMDIZOrder (bus, message, user_data); else if (!strcmp (member, "GrabFocus")) reply = impl_GrabFocus (bus, message, user_data); + else if (!strcmp (member, "GrabHighlight")) + reply = impl_GrabHighlight (bus, message, user_data); + else if (!strcmp (member, "ClearHighlight")) + reply = impl_ClearHighlight (bus, message, user_data); else if (!strcmp (member, "GetAlpha")) reply = impl_GetAlpha (bus, message, user_data); else @@ -844,6 +1290,61 @@ handle_method (DBusConnection *bus, DBusMessage *message, void *user_data) else if (!strcmp (member, "Unembed")) reply = impl_Unembed (bus, message, user_data); else + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) + { + result = DBUS_HANDLER_RESULT_HANDLED; + if (!strcmp (member, "Introspect")) + reply = impl_Introspect_root (bus, message, user_data); + else + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + if (result == DBUS_HANDLER_RESULT_HANDLED) + { + if (!reply) + { + reply = dbus_message_new_method_return (message); + } + + dbus_connection_send (bus, reply, NULL); + dbus_message_unref (reply); + } +#if 0 + else + { + g_print ("Registry | Unhandled message : %s|%s\n", iface, member); + } +#endif + + return result; +} + +static DBusHandlerResult +handle_method_cache (DBusConnection *bus, DBusMessage *message, void *user_data) +{ + DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + const gchar *iface = dbus_message_get_interface (message); + const gchar *member = dbus_message_get_member (message); + const gint type = dbus_message_get_type (message); + + DBusMessage *reply = NULL; + + /* Check for basic reasons not to handle */ + if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || + member == NULL || + iface == NULL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + if (!strcmp (iface, SPI_DBUS_INTERFACE_CACHE)) + { + result = DBUS_HANDLER_RESULT_HANDLED; + if (!strcmp (member, "GetItems")) + reply = impl_GetItems (bus, message, user_data); + else result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -857,16 +1358,88 @@ handle_method (DBusConnection *bus, DBusMessage *message, void *user_data) dbus_connection_send (bus, reply, NULL); dbus_message_unref (reply); } + return result; +} + +static DBusHandlerResult +handle_method_registry (DBusConnection *bus, DBusMessage *message, void *user_data) +{ + DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + const gchar *iface = dbus_message_get_interface (message); + const gchar *member = dbus_message_get_member (message); + const gint type = dbus_message_get_type (message); + + DBusMessage *reply = NULL; + + /* Check for basic reasons not to handle */ + if (type != DBUS_MESSAGE_TYPE_METHOD_CALL || + member == NULL || + iface == NULL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + if (!strcmp (iface, SPI_DBUS_INTERFACE_REGISTRY)) + { + result = DBUS_HANDLER_RESULT_HANDLED; + if (!strcmp(member, "RegisterEvent")) + reply = impl_register_event (bus, message, user_data); + else if (!strcmp(member, "DeregisterEvent")) + reply = impl_deregister_event (bus, message, user_data); + else if (!strcmp(member, "GetRegisteredEvents")) + reply = impl_get_registered_events (bus, message, user_data); + else + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + if (!strcmp (iface, "org.freedesktop.DBus.Introspectable")) + { + result = DBUS_HANDLER_RESULT_HANDLED; + if (!strcmp (member, "Introspect")) + reply = impl_Introspect_registry (bus, message, user_data); + else + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + if (result == DBUS_HANDLER_RESULT_HANDLED) + { + if (!reply) + { + reply = dbus_message_new_method_return (message); + } + + dbus_connection_send (bus, reply, NULL); + dbus_message_unref (reply); + } +#if 0 + else + { + g_print ("Registry | Unhandled message : %s|%s\n", iface, member); + } +#endif return result; } /*---------------------------------------------------------------------------*/ +static DBusObjectPathVTable root_vtable = +{ + NULL, + &handle_method_root, + NULL, NULL, NULL, NULL +}; + static DBusObjectPathVTable registry_vtable = { NULL, - &handle_method, + &handle_method_registry, + NULL, NULL, NULL, NULL +}; + +static DBusObjectPathVTable cache_vtable = +{ + NULL, + &handle_method_cache, NULL, NULL, NULL, NULL }; @@ -883,10 +1456,16 @@ spi_registry_new (DBusConnection *bus) dbus_bus_add_match (bus, app_sig_match_name_owner, NULL); dbus_connection_add_filter (bus, signal_filter, reg, NULL); - dbus_connection_register_object_path (bus, SPI_DBUS_PATH_ROOT, ®istry_vtable, reg); + dbus_connection_register_object_path (bus, SPI_DBUS_PATH_ROOT, &root_vtable, reg); + + dbus_connection_register_object_path (bus, SPI_DBUS_PATH_CACHE, &cache_vtable, reg); + + dbus_connection_register_object_path (bus, SPI_DBUS_PATH_REGISTRY, ®istry_vtable, reg); emit_Available (bus); + reg->events = NULL; + return reg; }