Revised key event support to remove some invalid casts, fix bugs relating

[platform/core/uifw/at-spi2-atk.git] / registryd / deviceeventcontroller.h

diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h
index e3e8c97..a943063 100644 (file)
--- a/registryd/deviceeventcontroller.h
+++ b/registryd/deviceeventcontroller.h
@@ -26,33 +26,33 @@
 #include <bonobo/bonobo-object.h>
 #include <libspi/Accessibility.h>
 #include <libspi/keystrokelistener.h>
-#include <libspi/registry.h>
 
 G_BEGIN_DECLS
 
 #define SPI_DEVICE_EVENT_CONTROLLER_TYPE        (spi_device_event_controller_get_type ())
 #define SPI_DEVICE_EVENT_CONTROLLER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDeviceEventController))
 #define SPI_DEVICE_EVENT_CONTROLLER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDeviceEventControllerClass))
-#define IS_SPI_DEVICE_EVENT_CONTROLLER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_DEVICE_EVENT_CONTROLLER_TYPE))
-#define IS_SPI_DEVICE_EVENT_CONTROLLER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_DEVICE_EVENT_CONTROLLER_TYPE))
+#define SPI_IS_DEVICE_EVENT_CONTROLLER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_DEVICE_EVENT_CONTROLLER_TYPE))
+#define SPI_IS_DEVICE_EVENT_CONTROLLER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_DEVICE_EVENT_CONTROLLER_TYPE))
 #define SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDeviceEventControllerClass))
 
 typedef struct {
-        BonoboObject parent;
-       void  *registry;
-        GList *key_listeners;
-        GList *mouse_listeners;
-       GList *keymask_list;
+  BonoboObject parent;
+  void  *registry;
+  GList *key_listeners;
+  GList *mouse_listeners;
+  GList *keygrabs_list;
 } SpiDeviceEventController;
 
 typedef struct {
-        BonoboObjectClass parent_class;
-        POA_Accessibility_DeviceEventController__epv epv;
-       gboolean (*check_key_event) (SpiDeviceEventController *controller);
+  BonoboObjectClass parent_class;
+  POA_Accessibility_DeviceEventController__epv epv;
+  gboolean (*check_key_event) (SpiDeviceEventController *controller);
 } SpiDeviceEventControllerClass;
 
-GType                     spi_device_event_controller_get_type   (void);
-SpiDeviceEventController *spi_device_event_controller_new        (void *registry);
+GType                     spi_device_event_controller_get_type        (void);
+SpiDeviceEventController *spi_device_event_controller_new             (void *registry);
+gboolean                  spi_device_event_controller_check_key_event (SpiDeviceEventController *controller);
 
 G_END_DECLS