Add atspi_accessible_get_reading_material

[platform/upstream/at-spi2-core.git] / atspi / atspi-types.h

diff --git a/atspi/atspi-types.h b/atspi/atspi-types.h
index f1ad80c..45b815c 100644 (file)
--- a/atspi/atspi-types.h
+++ b/atspi/atspi-types.h
@@ -40,8 +40,10 @@ 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;
 
@@ -54,7 +56,7 @@ typedef guint AtspiDeviceEventMask;
 typedef struct _AtspiDeviceEvent AtspiDeviceEvent;
 struct _AtspiDeviceEvent
 {
-  AtspiDeviceEventType type;
+  AtspiEventType type;
   guint id;
   gushort hw_code;
   gushort modifiers;
@@ -80,18 +82,10 @@ struct _AtspiKeyDefinition
   gint unused;
 };
 
-typedef struct _AtspiEventType AtspiEventType;
-struct _AtspiEventType
-{
-  gchar *klass;
-  gchar *major;
-  gchar *minor;
-};
-
 typedef struct _AtspiEvent AtspiEvent;
 struct _AtspiEvent
 {
-  AtspiEventType type;
+  gchar  *type;
   AtspiAccessible  *source;
   gint         detail1;
   gint         detail2;
@@ -99,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.
  */
@@ -126,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
@@ -141,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
@@ -151,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_ */