summaryrefslogtreecommitdiff
path: root/src/lib/elementary
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 /src/lib/elementary
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
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/elm_cnp.h58
2 files changed, 34 insertions, 26 deletions
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 56533f7..f5a2dde 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 12fd39a..5feda3a 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 */