#include <config.h>
#include <string.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <ctype.h>
#include "paths.h"
#include "registry.h"
{
gchar *bus_name;
gchar **data;
+ GSList *properties;
};
static void
static void
spi_registry_class_init (SpiRegistryClass *klass)
{
- GObjectClass * object_class = (GObjectClass *) klass;
-
spi_registry_parent_class = g_type_class_ref (G_TYPE_OBJECT);
}
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)));
{
found = TRUE;
+ break;
}
}
{
SpiReference *ref = g_ptr_array_index (reg->apps, index);
- /*TODO spi_remove_device_listeners (registry->de_controller, old);*/
+ 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);
}
static void
remove_events (SpiRegistry *registry, const char *bus_name, const char *event)
{
- event_data *evdata;
gchar **remove_data;
GList *list;
gboolean mouse_found = FALSE;
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))
{
- list = list->next;
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);
}
{
if (needs_mouse_poll (evdata->data))
mouse_found = TRUE;
- list = list->next;
}
}
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))
{
- children_removed_listener (bus, i, old, ref->path);
- g_ptr_array_remove_index (reg->apps, i);
+ remove_application (reg, bus, i);
+ i--;
}
}
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 (type != DBUS_MESSAGE_TYPE_SIGNAL)
- return;
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
if (!g_strcmp0(iface, DBUS_INTERFACE_DBUS) &&
!g_strcmp0(member, "NameOwnerChanged"))
{
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;
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))
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;
}
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;
{
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;
+}
- return dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &rv);
+static dbus_bool_t
+impl_get_ToolkitName (DBusMessageIter * iter, void *user_data)
+{
+ return return_v_string (iter, "at-spi-registry");
+}
+
+static dbus_bool_t
+impl_get_ToolkitVersion (DBusMessageIter * iter, void *user_data)
+{
+ return return_v_string (iter, "2.0");
}
static DBusMessage *
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;
}
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.
gchar *name;
event_data *evdata;
gchar **data;
- GList *new_list;
DBusMessage *signal;
const char *sender = dbus_message_get_sender (message);
+ DBusMessageIter iter, iter_array;
+ const char *signature = dbus_message_get_signature (message);
- if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &orig_name,
- DBUS_TYPE_INVALID))
- return;
+ 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 = (event_data *) g_malloc (sizeof (*evdata));
- if (!evdata)
- return;
+ evdata = g_new0 (event_data, 1);
data = g_strsplit (name, ":", 3);
- if (!data)
- {
- g_free (evdata);
- return;
- }
- if (!data [0])
- data [1] = NULL;
- if (!data [1])
- data [2] = NULL;
evdata->bus_name = g_strdup (sender);
evdata->data = data;
- new_list = g_list_append (registry->events, evdata);
- if (new_list)
- registry->events = new_list;
+
+ 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))
{
signal = dbus_message_new_signal (SPI_DBUS_PATH_REGISTRY,
SPI_DBUS_INTERFACE_REGISTRY,
"EventListenerRegistered");
- dbus_message_append_args (signal, DBUS_TYPE_STRING, &sender,
- DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
- dbus_connection_send (bus, signal, NULL);
- dbus_message_unref (signal);
+ 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);
if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &orig_name,
DBUS_TYPE_INVALID))
- return;
+ return NULL;
name = ensure_proper_format (orig_name);
remove_events (registry, sender, name);
evdata = list->data;
str = g_strconcat (evdata->data [0],
":", (evdata->data [1]? evdata->data [1]: ""),
- ":", (evdata->data [2]? evdata->data [2]: ""), NULL);
+ ":", (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);
{
GString *output;
gchar *final;
- gint i;
const gchar *pathstr = SPI_DBUS_PATH_ROOT;
{
GString *output;
gchar *final;
- gint i;
const gchar *pathstr = SPI_DBUS_PATH_REGISTRY;
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
{
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
}
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;
+ }
+
+ 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);
+ }
+ return result;
+}
+
+static DBusHandlerResult
handle_method_registry (DBusConnection *bus, DBusMessage *message, void *user_data)
{
DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
NULL, NULL, NULL, NULL
};
+static DBusObjectPathVTable cache_vtable =
+{
+ NULL,
+ &handle_method_cache,
+ NULL, NULL, NULL, NULL
+};
+
static gchar *app_sig_match_name_owner =
"type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged'";
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);
projects / platform / upstream / at-spi2-core.git / blobdiff