Added methods for Component Layer and MDI Z-Order information (see

[platform/core/uifw/at-spi2-atk.git] / cspi / spi-listener.h

diff --git a/cspi/spi-listener.h b/cspi/spi-listener.h
index 678ad55..a9677dc 100644 (file)
--- a/cspi/spi-listener.h
+++ b/cspi/spi-listener.h
@@ -1,42 +1,46 @@
 #ifndef _SPI_LISTENER_H_
 #define _SPI_LISTENER_H_
 
+#include <cspi/spi-impl.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "accessibleeventlistener.h"
-#include "keystrokelistener.h"
-
-#define SPI_KEYSET_ALL_KEYS ((void *)NULL)
-
+G_BEGIN_DECLS
 
 /*
- *
  * Structure used to encapsulate event information
- *
  */
-
-typedef Accessibility_Event AccessibleEvent;
+typedef struct {
+       const char  *type;
+       Accessible  *source;
+       long         detail1;
+       long         detail2;
+} AccessibleEvent;
+
+typedef enum {
+       SPI_KEY_PRESSED  = 1<<0,
+       SPI_KEY_RELEASED = 1<<1
+} AccessibleKeyEventType;
+
+
+typedef struct {
+       long                   keyID;
+       short                  keycode;
+       long                   timestamp;
+       AccessibleKeyEventType type;
+       unsigned short         modifiers;
+} AccessibleKeystroke;
 
 /*
- *
  * Function prototype typedefs for Event Listener Callbacks.
  * (see libspi/accessibleeventlistener.h for definition of SpiVoidEventListenerCB).
  *
  * usage: signatures should be
  * void (*AccessibleEventListenerCB) (AccessibleEvent *event);
  *
- * boolean (*AccessibleKeystrokeListenerCB) (AccessibleKeystrokeEvent *Event);
+ * SPIBoolean (*AccessibleKeystrokeListenerCB) (AccessibleKeystrokeEvent *Event);
  */
+typedef void    (*AccessibleEventListenerCB)     (AccessibleEvent     *event);
+typedef SPIBoolean (*AccessibleKeystrokeListenerCB) (AccessibleKeystroke *stroke);
 
-typedef VoidSpiEventListenerCB AccessibleEventListenerCB;
-typedef BooleanKeystrokeListenerCB    AccessibleKeystrokeListenerCB;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif