#include <config.h>
#include <stdio.h>
#include <string.h>
-#include "desktop.h"
-#include "registry.h"
#include <atk/atkcomponent.h>
#include <gdk/gdkscreen.h>
#include <gdk/gdkx.h>
+#include <spi-common/spi-dbus.h>
+
+#include "desktop.h"
+#include "registry.h"
+
G_DEFINE_TYPE(SpiDesktop, spi_desktop, G_TYPE_OBJECT)
/* SpiDesktop signals */
/* Our parent Gtk object type */
#define PARENT_TYPE SPI_ACCESSIBLE_TYPE
-typedef struct {
- SpiDesktop *desktop;
- const char *path;
-} Application;
-
static gboolean exiting = FALSE;
/* A pointer to our parent object class */
while (desktop->applications)
{
- Application *app = desktop->applications->data;
+ SpiDesktopApplication *app = desktop->applications->data;
g_assert (app != NULL);
spi_desktop_remove_application (desktop, app->path);
}
SpiDesktop *desktop = SPI_REGISTRY(user_data)->desktop;
DBusError error;
dbus_int32_t index;
- Application *app;
+ SpiDesktopApplication *app;
const char *path;
DBusMessage *reply;
return reply;
}
+static DBusMessage *
+impl_desktop_get_children (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+ SpiDesktop *desktop = SPI_REGISTRY(user_data)->desktop;
+ DBusError error;
+ gint count;
+ gint i;
+ SpiDesktopApplication *app;
+ const char *path;
+ DBusMessage *reply;
+ DBusMessageIter iter, iter_array;
+
+ reply = dbus_message_new_method_return (message);
+ if (!reply) return NULL;
+ dbus_message_iter_init_append (reply, &iter);
+ if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "o", &iter_array))
+ {
+ goto oom;
+ }
+ count = g_list_length (desktop->applications);
+ for (i = 0; i < count; i++)
+ {
+ app = g_list_nth_data (desktop->applications, i);
+ path = (app? app->path: SPI_DBUS_PATH_NULL);
+ dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_OBJECT_PATH, &path);
+ }
+ if (!dbus_message_iter_close_container (&iter, &iter_array))
+ {
+ goto oom;
+ }
+ return reply;
+oom:
+ // TODO: Handle out of memory
+ return reply;
+}
+
static void
spi_desktop_exiting (void)
{
}
static void
-abnormal_application_termination (gpointer object, Application *app)
+abnormal_application_termination (gpointer object, SpiDesktopApplication *app)
{
g_return_if_fail (SPI_IS_DESKTOP (app->desktop));
spi_desktop_add_application (SpiDesktop *desktop,
const char *application)
{
- Application *app;
+ SpiDesktopApplication *app;
g_return_if_fail (SPI_IS_DESKTOP (desktop));
spi_desktop_remove_application (desktop, application);
- app = g_new (Application, 1);
+ app = g_new (SpiDesktopApplication, 1);
app->desktop = desktop;
app->path = application;
idx = 0;
for (l = desktop->applications; l; l = l->next)
{
- Application *app = (Application *) l->data;
+ SpiDesktopApplication *app = (SpiDesktopApplication *) l->data;
if (!strcmp(app->path, path))
{
if (l)
{
- Application *app = (Application *) l->data;
+ SpiDesktopApplication *app = (SpiDesktopApplication *) l->data;
desktop->applications = g_list_delete_link (desktop->applications, l);
static DRouteMethod methods[] =
{
{ impl_desktop_get_child_at_index, "getChildAtIndex" },
+ { impl_desktop_get_children, "getChildren" },
{ NULL, NULL }
};
void
spi_registry_initialize_desktop_interface (DRouteData * data)
{
- droute_add_interface (data, "org.freedesktop.atspi.Desktop", methods,
+ droute_add_interface (data, "org.freedesktop.atspi.Accessible", methods,
properties, NULL, NULL);
};