*
* Copyright 2002 Ximian Inc.
* Copyright 2002 Sun Microsystems, Inc.
+ * Copyright 2010, 2011 Novell, Inc.
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include "atspi-private.h"
+#include <stdio.h>
typedef struct
{
GObjectClass *device_parent_class;
-static guint32 _e_id = 0;
-
/*
* Misc. helpers.
*/
return TRUE;
}
-static void
-remove_listener (GObject *obj, gpointer data)
-{
- device_listeners = g_list_remove (device_listeners, obj);
-}
-
static AtspiDeviceEvent *
-atspi_device_event_copy (AtspiDeviceEvent *src)
+atspi_device_event_copy (const AtspiDeviceEvent *src)
{
AtspiDeviceEvent *dst = g_new0 (AtspiDeviceEvent, 1);
- if (!dst)
- return NULL;
dst->type = src->type;
dst->id = src->id;
dst->hw_code = src->hw_code;
static void
atspi_device_listener_init (AtspiDeviceListener *listener)
{
- GList *new_list;
do
{
listener->id = listener_id++;
} while (!id_is_free (listener->id));
- new_list = g_list_append (device_listeners, listener);
- if (new_list) device_listeners = new_list;
+ device_listeners = g_list_append (device_listeners, listener);
}
static void
/**
* atspi_device_listener_new:
- * @callback: (scope notify): an #AtspiDeviceListenerCB callback function,
+ * @callback: (scope notified): an #AtspiDeviceListenerCB callback function,
* or NULL.
- * @callback_destroyed: A #GDestroyNotify called when the listener is freed
- * and data associated with the callback should be freed. Can be NULL.
* @user_data: (closure): a pointer to data which will be passed to the
* callback when invoked.
+ * @callback_destroyed: A #GDestroyNotify called when the listener is freed
+ * and data associated with the callback should be freed. It can be NULL.
*
- * Create a new #AtspiDeviceListener with a specified callback function.
+ * Creates a new #AtspiDeviceListener with a specified callback function.
*
- * Returns: a pointer to a newly-created #AtspiDeviceListener.
+ * Returns: (transfer full): a pointer to a newly-created #AtspiDeviceListener.
*
**/
AtspiDeviceListener *
atspi_device_listener_new (AtspiDeviceListenerCB callback,
- GDestroyNotify callback_destroyed,
- void *user_data)
+ void *user_data,
+ GDestroyNotify callback_destroyed)
{
AtspiDeviceListener *listener = g_object_new (atspi_device_listener_get_type (), NULL);
}
/**
- * atspi_device_listener_new_simple:
- * @callback: (scope notify): an #AtspiDeviceListenerCB callback function,
+ * atspi_device_listener_new_simple: (skip)
+ * @callback: (scope notified): an #AtspiDeviceListenerCB callback function,
* or NULL.
* @callback_destroyed: A #GDestroyNotify called when the listener is freed
- * and data associated with the callback should be freed. Can be NULL.
+ * and data associated with the callback should be freed. It an be NULL.
*
- * Create a new #AtspiDeviceListener with a specified callback function.
- * Like atspi_device_listener_new, but callback takes no user data.
+ * Creates a new #AtspiDeviceListener with a specified callback function.
+ * This method is similar to #atspi_device_listener_new, but callback
+ * takes no user data.
*
* Returns: a pointer to a newly-created #AtspiDeviceListener.
*
atspi_device_listener_new_simple (AtspiDeviceListenerSimpleCB callback,
GDestroyNotify callback_destroyed)
{
- return atspi_device_listener_new (device_remove_datum, callback_destroyed, callback);
+ return atspi_device_listener_new (device_remove_datum, callback, callback_destroyed);
}
/**
* atspi_device_listener_add_callback:
* @listener: the #AtspiDeviceListener instance to modify.
- * @callback: (scope notify): an #AtspiDeviceListenerCB function pointer.
- * @user_data: (closure): a pointer to data which will be passed to the
- * callback when invoked.
+ * @callback: (scope notified): an #AtspiDeviceListenerCB function pointer.
* @callback_destroyed: A #GDestroyNotify called when the listener is freed
- * and data associated with the callback should be freed. Can be NULL.
- *
- * Add an in-process callback function to an existing #AtspiDeviceListener.
+ * and data associated with the callback should be freed. It can be NULL.
+ * @user_data: (closure): a pointer to data which will be passed to the
+ * callback when invoked.
*
- * Returns: #TRUE if successful, otherwise #FALSE.
+ * Adds an in-process callback function to an existing #AtspiDeviceListener.
*
**/
void
new_handler = device_event_handler_new (callback,
callback_destroyed, user_data);
- if (new_handler)
- {
- GList *new_list;
- new_list = g_list_prepend (listener->callbacks, new_handler);
- if (new_list)
- listener->callbacks = new_list;
- }
+ listener->callbacks = g_list_prepend (listener->callbacks, new_handler);
}
/**
* @listener: the #AtspiDeviceListener instance to modify.
* @callback: (scope call): an #AtspiDeviceListenerCB function pointer.
*
- * Remove an in-process callback function from an existing #AtspiDeviceListener.
- *
- * Returns: #TRUE if successful, otherwise #FALSE.
+ * Removes an in-process callback function from an existing
+ * #AtspiDeviceListener.
*
**/
void
listener->callbacks = event_list_remove_by_cb (listener->callbacks, (void *) callback);
}
-static const char *device_event_type = "(uinnisb)";
-
static void
read_device_event_from_iter (DBusMessageIter *iter, AtspiDeviceEvent *event)
{
dbus_uint32_t type;
dbus_int32_t id;
- dbus_int16_t hw_code;
- dbus_int16_t modifiers;
+ dbus_int32_t hw_code;
+ dbus_int32_t modifiers;
dbus_int32_t timestamp;
- char *event_string;
dbus_bool_t is_text;
DBusMessageIter iter_struct;
event->id = id;
dbus_message_iter_next (&iter_struct);
+ /* TODO: Remove cast from next two on ABI break */
dbus_message_iter_get_basic (&iter_struct, &hw_code);
- event->hw_code = hw_code;
+ event->hw_code = (gushort) hw_code;
dbus_message_iter_next (&iter_struct);
dbus_message_iter_get_basic (&iter_struct, &modifiers);
- event->modifiers = modifiers;
+ event->modifiers = (gushort) modifiers;
dbus_message_iter_next (&iter_struct);
dbus_message_iter_get_basic (&iter_struct, ×tamp);
event->is_text = is_text;
}
-/*
- * atspi_dbus_handle_DeviceEvent: (skip)
- */
DBusHandlerResult
-atspi_dbus_handle_DeviceEvent (DBusConnection *bus, DBusMessage *message, void *data)
+_atspi_dbus_handle_DeviceEvent (DBusConnection *bus, DBusMessage *message, void *data)
{
const char *path = dbus_message_get_path (message);
int id;
dbus_bool_t retval = FALSE;
GList *l;
DBusMessage *reply;
- void *p = &event;
- if (strcmp (dbus_message_get_signature (message), "(uinnisb)") != 0)
+ if (strcmp (dbus_message_get_signature (message), "(uiuuisb)") != 0)
{
- g_warning ("Atspi: Unknown signature for an event");
+ g_warning ("AT-SPI: Unknown signature for an event");
goto done;
}
if (sscanf (path, "/org/a11y/atspi/listeners/%d", &id) != 1)
{
- g_warning ("Atspi: Bad listener path: %s\n", path);
+ g_warning ("AT-SPI: Bad listener path: %s\n", path);
goto done;
}
if (klass->device_event)
{
retval = (*klass->device_event) (listener, &event);
+ if (retval != 0 && retval != 1)
+ {
+ g_warning ("AT-SPI: device event handler returned %d; should be 0 or 1", retval);
+ retval = 0;
+ }
}
done:
reply = dbus_message_new_method_return (message);
gchar *
_atspi_device_listener_get_path (AtspiDeviceListener *listener)
-{
- return g_strdup_printf ("/org/a11y/atspi/listeners/%d", listener->id);
+{ return g_strdup_printf ("/org/a11y/atspi/listeners/%d", listener->id);
}
G_DEFINE_BOXED_TYPE (AtspiDeviceEvent,
projects / platform / upstream / at-spi2-core.git / blobdiff