X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atspi%2Fatspi-types.h;h=45b815cfa2d978092d7a31b19abd062897d14da7;hb=69e5ff7f2c6833af43ac2e36da4c7fb84c923034;hp=076019ed76f835998660070f92c79592ed12737a;hpb=56b5b8e5721d2f2ef427e107d5e3bee8dcf69457;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/atspi/atspi-types.h b/atspi/atspi-types.h
index 076019e..45b815c 100644
--- a/atspi/atspi-types.h
+++ b/atspi/atspi-types.h
@@ -30,16 +30,20 @@
 #include "atspi-constants.h"
 
 typedef struct _AtspiAccessible AtspiAccessible;
-typedef struct _AtspiAccessible AtspiAction;
-typedef struct _AtspiAccessible AtspiCollection;
+typedef struct _AtspiAction AtspiAction;
+typedef struct _AtspiCollection AtspiCollection;
 typedef struct _AtspiComponent AtspiComponent;
-typedef struct _AtspiAccessible AtspiDocument;
-typedef struct _AtspiAccessible AtspiEditableText;
-typedef struct _AtspiAccessible AtspiHypertext;
-typedef struct _AtspiAccessible AtspiSelection;
-typedef struct _AtspiAccessible AtspiTable;
-typedef struct _AtspiAccessible AtspiText;
-typedef struct _AtspiAccessible AtspiValue;
+typedef struct _AtspiDocument AtspiDocument;
+typedef struct _AtspiEditableText AtspiEditableText;
+typedef struct _AtspiHyperlink AtspiHyperlink;
+typedef struct _AtspiHypertext AtspiHypertext;
+typedef struct _AtspiImage AtspiImage;
+typedef struct _AtspiSelection AtspiSelection;
+typedef struct _AtspiTable AtspiTable;
+typedef struct _AtspiTableCell AtspiTableCell;
+typedef struct _AtspiText AtspiText;
+typedef struct _AtspiValue AtspiValue;
+typedef struct _AtspiAccessibleReadingMaterial AtspiAccessibleReadingMaterial;
 
 typedef guint AtspiControllerEventMask;
 
@@ -89,7 +93,14 @@ struct _AtspiEvent
 };
 
 /**
- * ATSPI_TYPE_RECT:
+ * ATSPI_TYPE_DEVICE_EVENT:
+ * 
+ * The #GType for a boxed type holding a #AtspiDeviceEvent.
+ */
+#define	ATSPI_TYPE_DEVICE_EVENT (atspi_device_event_get_type ())
+
+/**
+ * ATSPI_TYPE_EVENT:
  * 
  * The #GType for a boxed type holding a #AtspiEvent.
  */
@@ -116,14 +127,14 @@ typedef struct _AtspiKeySet
 
 /**
  *AtspiKeyListenerSyncType:
- *@SPI_KEYLISTENER_NOSYNC: Events may be delivered asynchronously, 
+  * @ATSPI_KEYLISTENER_NOSYNC: Events may be delivered asynchronously, 
  * which means in some cases they may already have been delivered to the 
  * application before the AT client receives the notification.  
- *@SPI_KEYLISTENER_SYNCHRONOUS: Events are delivered synchronously, before the 
+ * @ATSPI_KEYLISTENER_SYNCHRONOUS: Events are delivered synchronously, before the 
  * currently focussed application sees them.  
- *@ATSPI_KEYLISTENER_CANCONSUME: Events may be consumed by the AT client.  Presumes and
+ * @ATSPI_KEYLISTENER_CANCONSUME: Events may be consumed by the AT client.  Presumes and
  * requires #ATSPI_KEYLISTENER_SYNCHRONOUS, incompatible with #ATSPI_KEYLISTENER_NOSYNC.
- *@SPI_KEYLISTENER_ALL_WINDOWS: Events are received not from the application toolkit layer, but
+ * @ATSPI_KEYLISTENER_ALL_WINDOWS: Events are received not from the application toolkit layer, but
  * from the device driver or windowing system subsystem; such notifications are 'global' in the 
  * sense that they are not broken or defeated by applications that participate poorly
  * in the accessibility APIs, or not at all; however because of the intrusive nature of
@@ -131,8 +142,8 @@ typedef struct _AtspiKeySet
  * event notifications, even when inaccessible or "broken" applications have focus, are not
  * required, it may be best to avoid this enum value/flag.
  *
- *Specified the tyupe of a key listener event.
- * Certain of the values above can and should be bitwise-'OR'ed
+ * Specifies the type of a key listener event.
+ * The values above can and should be bitwise-'OR'-ed
  * together, observing the compatibility limitations specified in the description of
  * each value.  For instance, #ATSPI_KEYLISTENER_ALL_WINDOWS | #ATSPI_KEYLISTENER_CANCONSUME is
  * a commonly used combination which gives the AT complete control over the delivery of matching
@@ -141,8 +152,8 @@ typedef struct _AtspiKeySet
  **/
 typedef enum {
   ATSPI_KEYLISTENER_NOSYNC = 0,
-  ATSPI_KEYLISTENER_SYNCHRONOUS = 1,
-  ATSPI_KEYLISTENER_CANCONSUME = 2,
-  ATSPI_KEYLISTENER_ALL_WINDOWS = 4
+  ATSPI_KEYLISTENER_SYNCHRONOUS = 1 << 0,
+  ATSPI_KEYLISTENER_CANCONSUME = 1 << 1,
+  ATSPI_KEYLISTENER_ALL_WINDOWS = 1 << 2
 } AtspiKeyListenerSyncType;
 #endif	/* _ATSPI_TYPES_H_ */