*
* Copyright 2002 Ximian, Inc.
* 2002 Sun Microsystems Inc.
+ * Copyright 2010, 2011 Novell, Inc.
*
*
* This library is free software; you can redistribute it and/or
#include "atspi-types.h"
+G_BEGIN_DECLS
+
typedef struct _AtspiRange AtspiRange;
struct _AtspiRange
{
AtspiRange *
atspi_range_copy (AtspiRange *src);
-typedef struct _AtspiRangedAttributeSet AtspiRangedAttributeSet;
-struct _AtspiRangedAttributeSet
-{
- GHashTable *attributes;
- gint start_offset;
- gint end_offset;
-};
-
-/**
- * ATSPI_TYPE_RANGED_ATTRIBUTE_SET:
- *
- * The #GType for a boxed type holding an attribute set within a text block.
- */
-#define ATSPI_TYPE_RANGED_ATTRIBUTE_SET atspi_ranged_attribute_set_get_type ()
-
-GType atspi_ranged_attribute_set_get_type ();
-
typedef struct _AtspiTextRange AtspiTextRange;
struct _AtspiTextRange
{
gint start_offset;
gint end_offset;
- gchar *text;
+ gchar *content;
};
/**
gint atspi_text_get_caret_offset (AtspiText *obj, GError **error);
-AtspiRangedAttributeSet * atspi_text_get_attributes (AtspiText *obj, gint offset, GError **error);
+#ifndef ATSPI_DISABLE_DEPRECATED
+GHashTable *atspi_text_get_attributes (AtspiText *obj, gint offset, gint *start_offset, gint *end_offset, GError **error);
+#endif
+
+GHashTable *atspi_text_get_text_attributes (AtspiText *obj, gint offset, gint *start_offset, gint *end_offset, GError **error);
-AtspiRangedAttributeSet * atspi_text_get_attribute_run (AtspiText *obj, gint offset, gboolean include_defaults, GError **error);
+GHashTable *atspi_text_get_attribute_run (AtspiText *obj, gint offset, gboolean include_defaults, gint *start_offset, gint *end_offset, GError **error);
+#ifndef ATSPI_DISABLE_DEPRECATED
gchar * atspi_text_get_attribute_value (AtspiText *obj, gint offset, gchar *attribute_name, GError **error);
+#endif
-GHashTable * atspi_text_get_default_attributes (AtspiAccessible *obj, GError **error);
+gchar * atspi_text_get_text_attribute_value (AtspiText *obj, gint offset, gchar *attribute_name, GError **error);
+
+GHashTable * atspi_text_get_default_attributes (AtspiText *obj, GError **error);
gboolean atspi_text_set_caret_offset (AtspiText *obj, gint new_offset, GError **error);
+#ifndef ATSPI_DISABLE_DEPRECATED
AtspiTextRange * atspi_text_get_text_before_offset (AtspiText *obj, gint offset, AtspiTextBoundaryType type, GError **error);
AtspiTextRange * atspi_text_get_text_at_offset (AtspiText *obj, gint offset, AtspiTextBoundaryType type, GError **error);
AtspiTextRange * atspi_text_get_text_after_offset (AtspiText *obj, gint offset, AtspiTextBoundaryType type, GError **error);
+#endif
+
+AtspiTextRange * atspi_text_get_string_at_offset (AtspiText *obj, gint offset, AtspiTextGranularity granularity, GError **error);
guint atspi_text_get_character_at_offset (AtspiText *obj, gint offset, GError **error);
gboolean atspi_text_remove_selection (AtspiText *obj, gint selection_num, GError **error);
gboolean atspi_text_set_selection (AtspiText *obj, gint selection_num, gint start_offset, gint end_offset, GError **error);
+
+G_END_DECLS
+
#endif /* _ATSPI_TEXT_H_ */