felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=1a7b5ecd9529d3c10fe6fd5873c9d24ee9f1c1fd
commit 1a7b5ecd9529d3c10fe6fd5873c9d24ee9f1c1fd
Author: Larry <larry....@gmail.com>
Date: Fri Jan 29 18:12:17 2016 -0200
move enum e structs defines of elm_atspi_text to eolian
---
src/lib/elm_interface_atspi_text.eo | 51 ++++++++++++++++++++++++++++----
src/lib/elm_interface_atspi_text.h | 58 ++++---------------------------------
2 files changed, 50 insertions(+), 59 deletions(-)
diff --git a/src/lib/elm_interface_atspi_text.eo
b/src/lib/elm_interface_atspi_text.eo
index eb358a5..249664d 100644
--- a/src/lib/elm_interface_atspi_text.eo
+++ b/src/lib/elm_interface_atspi_text.eo
@@ -1,3 +1,42 @@
+enum Elm.Atspi_Text.Granularity
+{
+ char,
+ word,
+ sentence,
+ line,
+ paragraph
+}
+
+enum Elm.Atspi_Text.Clip_Type
+{
+ legacy: elm_atspi_text_clip;
+ none,
+ min,
+ max,
+ both
+}
+
+struct Elm.Atspi_Text.Attribute
+{
+ name: const(char)*;
+ value: const(char)*;
+}
+
+struct Elm.Atspi_Text.Range
+{
+ start_offset: int;
+ end_offset : int;
+ content: char *;
+}
+
+struct Elm.Atspi_Text.Change_Info
+{
+ content: const(char)*;
+ inserted: Eina.Bool;
+ pos: size_t;
+ len: size_t;
+}
+
interface Elm.Interface_Atspi_Text ()
{
legacy_prefix: null;
@@ -19,7 +58,7 @@ interface Elm.Interface_Atspi_Text ()
[[Gets string, start and end offset in text according to given
initial offset and granulatity.]]
}
keys {
- granularity: Elm_Atspi_Text_Granularity;
+ granularity: Elm.Atspi_Text.Granularity;
start_offset: int * @nonull; [[Offset indicating start of string
according to given granularity. -1 in case of error.]]
end_offset: int *; [[Offset indicating end of string according to
given granularity. -1 in case of error.]]
}
@@ -73,14 +112,14 @@ interface Elm.Interface_Atspi_Text ()
end_offset: int *;
}
values {
- attributes: own(list<own(Elm_Atspi_Text_Attribute *)> *);
+ attributes: own(list<own(Elm.Atspi_Text.Attribute *)> *);
}
}
@property default_attributes @protected {
get {
}
values {
- attributes: own(list<own(Elm_Atspi_Text_Attribute *)>*);
+ attributes: own(list<own(Elm.Atspi_Text.Attribute *)>*);
}
}
@property character_extents @protected {
@@ -120,11 +159,11 @@ interface Elm.Interface_Atspi_Text ()
keys {
screen_coords: bool;
rect: Eina_Rectangle;
- xclip: Elm_Atspi_Text_Clip_Type;
- yclip: Elm_Atspi_Text_Clip_Type;
+ xclip: Elm.Atspi_Text.Clip_Type;
+ yclip: Elm.Atspi_Text.Clip_Type;
}
values {
- ranges: own(list<own(Elm_Atspi_Text_Range *)> *);
+ ranges: own(list<own(Elm.Atspi_Text.Range *)> *);
}
}
@property range_extents @protected {
diff --git a/src/lib/elm_interface_atspi_text.h
b/src/lib/elm_interface_atspi_text.h
index be1abc6..3b65d0e 100644
--- a/src/lib/elm_interface_atspi_text.h
+++ b/src/lib/elm_interface_atspi_text.h
@@ -3,59 +3,6 @@
#ifdef EFL_BETA_API_SUPPORT
-enum _Elm_Atspi_Text_Granulatity
-{
- ELM_ATSPI_TEXT_GRANULARITY_CHAR,
- ELM_ATSPI_TEXT_GRANULARITY_WORD,
- ELM_ATSPI_TEXT_GRANULARITY_SENTENCE,
- ELM_ATSPI_TEXT_GRANULARITY_LINE,
- ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH
-};
-
-typedef enum _Elm_Atspi_Text_Granulatity Elm_Atspi_Text_Granularity;
-
-struct _Elm_Atspi_Text_Attribute
-{
- const char *name;
- const char *value;
-};
-
-typedef struct _Elm_Atspi_Text_Attribute Elm_Atspi_Text_Attribute;
-
-struct _Elm_Atspi_Text_Range
-{
- int start_offset;
- int end_offset;
- char *content;
-};
-
-typedef struct _Elm_Atspi_Text_Range Elm_Atspi_Text_Range;
-
-enum _Elm_Atspi_Text_Clip_Type
-{
- ELM_ATSPI_TEXT_CLIP_NONE,
- ELM_ATSPI_TEXT_CLIP_MIN,
- ELM_ATSPI_TEXT_CLIP_MAX,
- ELM_ATSPI_TEXT_CLIP_BOTH
-};
-
-typedef enum _Elm_Atspi_Text_Clip_Type Elm_Atspi_Text_Clip_Type;
-
-/**
- * @brief Free Elm_Atspi_Text_Attribute structure
- */
-EAPI void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr);
-
-typedef struct _Elm_Atspi_Text_Change_Info Elm_Atspi_Text_Change_Info;
-
-struct _Elm_Atspi_Text_Change_Info
-{
- const char *content;
- Eina_Bool inserted;
- size_t pos;
- size_t len;
-};
-
#ifdef EFL_EO_API_SUPPORT
#include "elm_interface_atspi_text.eo.h"
#endif
@@ -63,5 +10,10 @@ struct _Elm_Atspi_Text_Change_Info
#include "elm_interface_atspi_text.eo.legacy.h"
#endif
+/**
+ * @brief Free Elm_Atspi_Text_Attribute structure
+ */
+EAPI void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr);
+
#endif
#endif
--
