summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-03-09 16:36:21 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-03-09 16:39:06 +0100
commit1c62ed5349b3c2897d4385eea440f51f45a09adb (patch)
tree64dff81b092faecb835506a44f9397dac8a88725
parente655d20d2426b88f72b93f157556fb2c7dae673e (diff)
efl: ensure legacy is only relying on stable types
Summary: This commit changes the beta ness of a few types, those types are looking quite stable. Edje types will likely not change. The Efl.Gfx.Join types are actaully already stable since the last release, since evas_vg was stable back then and those enums have been in there. The elementary stuff looks a bit unthought, and we have the chance to change the API in the backend, so maybe we want to not declare it stable, but rather reintroduce the legacy types. With this we can enable eolian generation of beta tags for types. ref T7726 Depends on D8276 Reviewers: cedric, segfaultxavi, zmike, stefan_schmidt, q66 Reviewed By: segfaultxavi, q66 Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7726 Differential Revision: https://phab.enlightenment.org/D8277
-rw-r--r--src/bin/eolian/types.c3
-rw-r--r--src/lib/edje/edje_types.eot2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_types.eot12
-rw-r--r--src/lib/efl/interfaces/efl_input_types.eot4
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/elm_cnp.h58
6 files changed, 43 insertions, 38 deletions
diff --git a/src/bin/eolian/types.c b/src/bin/eolian/types.c
index d9a9bc2a45..c2a2ea654f 100644
--- a/src/bin/eolian/types.c
+++ b/src/bin/eolian/types.c
@@ -157,14 +157,11 @@ _type_generate(const Eolian_State *state, const Eolian_Typedecl *tp,
157 break; 157 break;
158 } 158 }
159 eina_strbuf_append_char(buf, ';'); 159 eina_strbuf_append_char(buf, ';');
160#if 0
161 /* can't enable this yet, as this would trigger brokenness in our tree */
162 if (eolian_typedecl_is_beta(tp)) 160 if (eolian_typedecl_is_beta(tp))
163 { 161 {
164 eina_strbuf_prepend(buf, "#ifdef EFL_BETA_API_SUPPORT\n"); 162 eina_strbuf_prepend(buf, "#ifdef EFL_BETA_API_SUPPORT\n");
165 eina_strbuf_append(buf, "\n#endif /* EFL_BETA_API_SUPPORT */"); 163 eina_strbuf_append(buf, "\n#endif /* EFL_BETA_API_SUPPORT */");
166 } 164 }
167#endif
168 return buf; 165 return buf;
169} 166}
170 167
diff --git a/src/lib/edje/edje_types.eot b/src/lib/edje/edje_types.eot
index 87a5cc3b1d..bd58febd61 100644
--- a/src/lib/edje/edje_types.eot
+++ b/src/lib/edje/edje_types.eot
@@ -1,4 +1,4 @@
1enum @beta Efl.Canvas.Layout_Part_Type 1enum Efl.Canvas.Layout_Part_Type
2{ 2{
3 [[Type of a part in an Efl.Canvas.Layout object (edje object).]] 3 [[Type of a part in an Efl.Canvas.Layout object (edje object).]]
4 none = 0, [[None type value, indicates invalid parts.]] 4 none = 0, [[None type value, indicates invalid parts.]]
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot
index b01562c94a..af9d3d6bb6 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -30,7 +30,7 @@ enum Efl.Gfx.Render_Op {
30 last [[Sentinel value to indicate last enum field during iteration]] 30 last [[Sentinel value to indicate last enum field during iteration]]
31} 31}
32 32
33enum @beta Efl.Gfx.Path_Command_Type { 33enum Efl.Gfx.Path_Command_Type {
34 [[These values determine how the points are interpreted in a stream of points. 34 [[These values determine how the points are interpreted in a stream of points.
35 @since 1.14 35 @since 1.14
36 ]] 36 ]]
@@ -42,7 +42,7 @@ enum @beta Efl.Gfx.Path_Command_Type {
42 last [[Sentinel value to indicate last enum field during iteration]] 42 last [[Sentinel value to indicate last enum field during iteration]]
43} 43}
44 44
45enum @beta Efl.Gfx.Cap { 45enum Efl.Gfx.Cap {
46 [[These values determine how the end of opened sub-paths are rendered in a 46 [[These values determine how the end of opened sub-paths are rendered in a
47 stroke. 47 stroke.
48 @Efl.Gfx.Shape.stroke_cap.set 48 @Efl.Gfx.Shape.stroke_cap.set
@@ -54,7 +54,7 @@ enum @beta Efl.Gfx.Cap {
54 last [[Sentinel value to indicate last enum field during iteration]] 54 last [[Sentinel value to indicate last enum field during iteration]]
55} 55}
56 56
57enum @beta Efl.Gfx.Join 57enum Efl.Gfx.Join
58{ 58{
59 [[These values determine how two joining lines are rendered in a stroker. 59 [[These values determine how two joining lines are rendered in a stroker.
60 @Efl.Gfx.Shape.stroke_join.set 60 @Efl.Gfx.Shape.stroke_join.set
@@ -66,7 +66,7 @@ enum @beta Efl.Gfx.Join
66 last [[Sentinel value to indicate last enum field during iteration]] 66 last [[Sentinel value to indicate last enum field during iteration]]
67} 67}
68 68
69enum @beta Efl.Gfx.Gradient_Spread 69enum Efl.Gfx.Gradient_Spread
70{ 70{
71 [[Specifies how the area outside the gradient area should be filled. 71 [[Specifies how the area outside the gradient area should be filled.
72 @Efl.Gfx.Gradient.spread.set 72 @Efl.Gfx.Gradient.spread.set
@@ -87,7 +87,7 @@ enum @beta Efl.Gfx.Fill_Rule
87 odd_even = 1, [[Draw a horizontal line from the point to a location outside the shape, and count the number of intersections. If the number of intersections is an odd number, the point is inside the shape.]] 87 odd_even = 1, [[Draw a horizontal line from the point to a location outside the shape, and count the number of intersections. If the number of intersections is an odd number, the point is inside the shape.]]
88} 88}
89 89
90struct @beta Efl.Gfx.Dash { 90struct Efl.Gfx.Dash {
91 [[Type describing dash. 91 [[Type describing dash.
92 @Efl.Gfx.Shape.stroke_dash.set 92 @Efl.Gfx.Shape.stroke_dash.set
93 @since 1.14 93 @since 1.14
@@ -96,7 +96,7 @@ struct @beta Efl.Gfx.Dash {
96 gap: double; [[Distance between two dashes.]] 96 gap: double; [[Distance between two dashes.]]
97} 97}
98 98
99struct @beta Efl.Gfx.Gradient_Stop 99struct Efl.Gfx.Gradient_Stop
100{ 100{
101 [[Type defining gradient stops. 101 [[Type defining gradient stops.
102 Describes the location and color of a transition point in a gradient. 102 Describes the location and color of a transition point in a gradient.
diff --git a/src/lib/efl/interfaces/efl_input_types.eot b/src/lib/efl/interfaces/efl_input_types.eot
index eb5f8edeb7..bad3eb30fc 100644
--- a/src/lib/efl/interfaces/efl_input_types.eot
+++ b/src/lib/efl/interfaces/efl_input_types.eot
@@ -29,7 +29,7 @@ enum @beta Efl.Pointer.Flags
29 triple_click = (1 << 1), [[This mouse button press was the 3rd press of a triple click]] 29 triple_click = (1 << 1), [[This mouse button press was the 3rd press of a triple click]]
30} 30}
31 31
32enum @beta Efl.Input.Flags 32enum Efl.Input.Flags
33{ 33{
34 [[Special flags set during an input event propagation. 34 [[Special flags set during an input event propagation.
35 35
@@ -48,7 +48,7 @@ enum @beta Efl.Input.Flags
48 actually perform anything.]] 48 actually perform anything.]]
49} 49}
50 50
51enum @beta Efl.Input.Object_Pointer_Mode { 51enum Efl.Input.Object_Pointer_Mode {
52 [[How the mouse pointer should be handled by EFL. 52 [[How the mouse pointer should be handled by EFL.
53 53
54 In the mode $autograb, when a mouse button is pressed down over an 54 In the mode $autograb, when a mouse button is pressed down over an
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 56533f70a4..f5a2ddedb1 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -1120,7 +1120,7 @@ _hoversel_item_paste_cb(void *data,
1120} 1120}
1121 1121
1122static void 1122static void
1123_selection_clear(void *data, Elm_Sel_Type selection) 1123_selection_clear(void *data, Efl_Ui_Selection_Type selection)
1124{ 1124{
1125 EFL_UI_TEXT_DATA_GET(data, sd); 1125 EFL_UI_TEXT_DATA_GET(data, sd);
1126 1126
diff --git a/src/lib/elementary/elm_cnp.h b/src/lib/elementary/elm_cnp.h
index 12fd39a1a3..5feda3acc0 100644
--- a/src/lib/elementary/elm_cnp.h
+++ b/src/lib/elementary/elm_cnp.h
@@ -57,41 +57,49 @@ EAPI extern int ELM_CNP_EVENT_SELECTION_CHANGED;
57 * @see http://www.x.org/docs/X11/xlib.pdf 57 * @see http://www.x.org/docs/X11/xlib.pdf
58 * for more details. 58 * for more details.
59 */ 59 */
60typedef Efl_Ui_Selection_Type Elm_Sel_Type;
61 60
62#define ELM_SEL_TYPE_PRIMARY EFL_UI_SELECTION_TYPE_PRIMARY 61typedef enum
63#define ELM_SEL_TYPE_SECONDARY EFL_UI_SELECTION_TYPE_SECONDARY 62{
64#define ELM_SEL_TYPE_XDND EFL_UI_SELECTION_TYPE_DND 63 ELM_SEL_TYPE_PRIMARY = 0, /**< Primary text selection (highlighted or
65#define ELM_SEL_TYPE_CLIPBOARD EFL_UI_SELECTION_TYPE_CLIPBOARD 64 * selected text) */
65 ELM_SEL_TYPE_SECONDARY, /**< Used when primary selection is in use */
66 ELM_SEL_TYPE_XDND, /**< Drag and Drop */
67 ELM_SEL_TYPE_CLIPBOARD /**< Clipboard selection (ctrl+C) */
68} Elm_Sel_Type;
66 69
67/** 70/**
68 * Defines the types of content. 71 * Defines the types of content.
69 */ 72 */
70typedef Efl_Ui_Selection_Format Elm_Sel_Format; 73typedef enum
71 74{
72#define ELM_SEL_FORMAT_TARGETS EFL_UI_SELECTION_FORMAT_TARGETS 75 ELM_SEL_FORMAT_TARGETS = -1 /* +1 */, /**< For matching every
73#define ELM_SEL_FORMAT_NONE EFL_UI_SELECTION_FORMAT_NONE 76 * possible atom */
74#define ELM_SEL_FORMAT_TEXT EFL_UI_SELECTION_FORMAT_TEXT 77 ELM_SEL_FORMAT_NONE = 0, /**< Content is from outside of Elementary
75#define ELM_SEL_FORMAT_MARKUP EFL_UI_SELECTION_FORMAT_MARKUP 78 */
76#define ELM_SEL_FORMAT_IMAGE EFL_UI_SELECTION_FORMAT_IMAGE 79 ELM_SEL_FORMAT_TEXT = 1, /**< Plain unformatted text: Used for things
77#define ELM_SEL_FORMAT_VCARD EFL_UI_SELECTION_FORMAT_VCARD 80 * that don't want rich markup */
78#define ELM_SEL_FORMAT_HTML EFL_UI_SELECTION_FORMAT_HTML 81 ELM_SEL_FORMAT_MARKUP = 2, /**< Edje textblock markup, including
82 * inline images */
83 ELM_SEL_FORMAT_IMAGE = 4, /**< Images */
84 ELM_SEL_FORMAT_VCARD = 8, /**< Vcards */
85 ELM_SEL_FORMAT_HTML = 16 /**< Raw HTML-like data (eg. webkit) */
86} Elm_Sel_Format;
79 87
80/** 88/**
81 * Defines the kind of action associated with the drop data if for XDND 89 * Defines the kind of action associated with the drop data if for XDND
82 * @since 1.8 90 * @since 1.8
83 */ 91 */
84typedef Efl_Ui_Selection_Action Elm_Xdnd_Action; 92typedef enum
85 93{
86#define ELM_XDND_ACTION_UNKNOWN EFL_UI_SELECTION_ACTION_UNKNOWN 94 ELM_XDND_ACTION_UNKNOWN = 0, /**< Action type is unknown */
87#define ELM_XDND_ACTION_COPY EFL_UI_SELECTION_ACTION_COPY 95 ELM_XDND_ACTION_COPY, /**< Copy the data */
88#define ELM_XDND_ACTION_MOVE EFL_UI_SELECTION_ACTION_MOVE 96 ELM_XDND_ACTION_MOVE, /**< Move the data */
89#define ELM_XDND_ACTION_PRIVATE EFL_UI_SELECTION_ACTION_PRIVATE 97 ELM_XDND_ACTION_PRIVATE, /**< Private action type */
90#define ELM_XDND_ACTION_ASK EFL_UI_SELECTION_ACTION_ASK 98 ELM_XDND_ACTION_ASK, /**< Ask the user what to do */
91#define ELM_XDND_ACTION_LIST EFL_UI_SELECTION_ACTION_LIST 99 ELM_XDND_ACTION_LIST, /**< List the data */
92#define ELM_XDND_ACTION_LINK EFL_UI_SELECTION_ACTION_LINK 100 ELM_XDND_ACTION_LINK, /**< Link the data */
93#define ELM_XDND_ACTION_DESCRIPTION EFL_UI_SELECTION_ACTION_DESCRIPTION 101 ELM_XDND_ACTION_DESCRIPTION /**< Describe the data */
94 102} Elm_Xdnd_Action;
95/** 103/**
96 * Structure holding the info about selected data. 104 * Structure holding the info about selected data.
97 */ 105 */