#define _ATSPI_REGISTRY_H_
#include "atspi-accessible.h"
-#include "atspi-event-types.h"
-#include "atspi-listener.h"
+#include "atspi-types.h"
+#include "atspi-device-listener.h"
+
+G_BEGIN_DECLS
+
+GType atspi_key_definition_get_type ();
gint atspi_get_desktop_count ();
GArray *atspi_get_desktop_list ();
gboolean
-atspi_register_accessible_keystroke_listener (AtspiKeystrokeListener *listener,
- AtspiKeySet *keys,
+atspi_register_keystroke_listener (AtspiDeviceListener *listener,
+ GArray *key_set,
AtspiKeyMaskType modmask,
- AtspiKeyEventMask event_mask,
- AtspiKeyListenerSyncType sync_type, GError **error);
+ AtspiKeyEventMask event_types,
+ AtspiKeyListenerSyncType sync_type,
+ GError **error);
gboolean
-atspi_deregister_accessible_keystroke_listener (AtspiKeystrokeListener *listener,
- AtspiKeyMaskType modmask, GError **error);
+atspi_deregister_keystroke_listener (AtspiDeviceListener *listener,
+ GArray *key_set,
+ AtspiKeyMaskType modmask,
+ AtspiKeyEventMask event_types,
+ GError **error);
gboolean
atspi_register_device_event_listener (AtspiDeviceListener *listener,
- AtspiDeviceEventMask eventmask,
+ AtspiDeviceEventMask event_types,
void *filter, GError **error);
gboolean
gboolean
atspi_generate_mouse_event (glong x, glong y, const gchar *name, GError **error);
+G_END_DECLS
+
#endif /* _ATSPI_REGISTRY_H_ */