summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2018-01-18 16:18:23 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2018-01-18 16:20:52 +0900
commit4e055db429208ac80b7e746bf604438a0c1d9067 (patch)
tree4abe737f5740775994404e90e01fab789b3f25d9
parenteb10b6eb255a3fb130997343a884b2a705888461 (diff)
cnp: Use EO types to define legacy types
They are the same. Ref T5329
-rw-r--r--src/lib/elementary/elm_cnp.h62
1 files changed, 27 insertions, 35 deletions
diff --git a/src/lib/elementary/elm_cnp.h b/src/lib/elementary/elm_cnp.h
index e48fe64c32..975d8f80d8 100644
--- a/src/lib/elementary/elm_cnp.h
+++ b/src/lib/elementary/elm_cnp.h
@@ -43,6 +43,8 @@
43 * @{ 43 * @{
44 */ 44 */
45 45
46# include <efl_selection_types.eot.h>
47
46/** 48/**
47 * Event notifying that the selection has changed 49 * Event notifying that the selection has changed
48 * @see Elm_Cnp_Event_Selection_Changed 50 * @see Elm_Cnp_Event_Selection_Changed
@@ -55,50 +57,40 @@ EAPI extern int ELM_CNP_EVENT_SELECTION_CHANGED;
55 * @see http://www.x.org/docs/X11/xlib.pdf 57 * @see http://www.x.org/docs/X11/xlib.pdf
56 * for more details. 58 * for more details.
57 */ 59 */
58typedef enum 60typedef Efl_Selection_Type Elm_Sel_Type;
59{ 61
60 ELM_SEL_TYPE_PRIMARY, /**< Primary text selection (highlighted or selected text) */ 62#define ELM_SEL_TYPE_PRIMARY EFL_SELECTION_TYPE_PRIMARY
61 ELM_SEL_TYPE_SECONDARY, /**< Used when primary selection is in use */ 63#define ELM_SEL_TYPE_SECONDARY EFL_SELECTION_TYPE_SECONDARY
62 ELM_SEL_TYPE_XDND, /**< Drag 'n' Drop */ 64#define ELM_SEL_TYPE_XDND EFL_SELECTION_TYPE_DND
63 ELM_SEL_TYPE_CLIPBOARD, /**< Clipboard selection (ctrl+C) */ 65#define ELM_SEL_TYPE_CLIPBOARD EFL_SELECTION_TYPE_CLIPBOARD
64} Elm_Sel_Type;
65 66
66/** 67/**
67 * Defines the types of content. 68 * Defines the types of content.
68 */ 69 */
69typedef enum 70typedef Efl_Selection_Format Elm_Sel_Format;
70{ 71
71 /** For matching every possible atom */ 72#define ELM_SEL_FORMAT_TARGETS EFL_SELECTION_FORMAT_TARGETS
72 ELM_SEL_FORMAT_TARGETS = -1, 73#define ELM_SEL_FORMAT_NONE EFL_SELECTION_FORMAT_NONE
73 /** Content is from outside of Elementary */ 74#define ELM_SEL_FORMAT_TEXT EFL_SELECTION_FORMAT_TEXT
74 ELM_SEL_FORMAT_NONE = 0x0, 75#define ELM_SEL_FORMAT_MARKUP EFL_SELECTION_FORMAT_MARKUP
75 /** Plain unformatted text: Used for things that don't want rich markup */ 76#define ELM_SEL_FORMAT_IMAGE EFL_SELECTION_FORMAT_IMAGE
76 ELM_SEL_FORMAT_TEXT = 0x01, 77#define ELM_SEL_FORMAT_VCARD EFL_SELECTION_FORMAT_VCARD
77 /** Edje textblock markup, including inline images */ 78#define ELM_SEL_FORMAT_HTML EFL_SELECTION_FORMAT_HTML
78 ELM_SEL_FORMAT_MARKUP = 0x02,
79 /** Images */
80 ELM_SEL_FORMAT_IMAGE = 0x04,
81 /** Vcards */
82 ELM_SEL_FORMAT_VCARD = 0x08,
83 /** Raw HTML-like data (eg. webkit) */
84 ELM_SEL_FORMAT_HTML = 0x10,
85} Elm_Sel_Format;
86 79
87/** 80/**
88 * Defines the kind of action associated with the drop data if for XDND 81 * Defines the kind of action associated with the drop data if for XDND
89 * @since 1.8 82 * @since 1.8
90 */ 83 */
91typedef enum 84typedef Efl_Selection_Action Elm_Xdnd_Action;
92{ 85
93 ELM_XDND_ACTION_UNKNOWN, /**< Action type is unknown */ 86#define ELM_XDND_ACTION_UNKNOWN EFL_SELECTION_ACTION_UNKNOWN
94 ELM_XDND_ACTION_COPY, /**< Copy the data */ 87#define ELM_XDND_ACTION_COPY EFL_SELECTION_ACTION_COPY
95 ELM_XDND_ACTION_MOVE, /**< Move the data */ 88#define ELM_XDND_ACTION_MOVE EFL_SELECTION_ACTION_MOVE
96 ELM_XDND_ACTION_PRIVATE, /**< Pricate action type */ 89#define ELM_XDND_ACTION_PRIVATE EFL_SELECTION_ACTION_PRIVATE
97 ELM_XDND_ACTION_ASK, /**< Ask the user what to do */ 90#define ELM_XDND_ACTION_ASK EFL_SELECTION_ACTION_ASK
98 ELM_XDND_ACTION_LIST, /**< List the data */ 91#define ELM_XDND_ACTION_LIST EFL_SELECTION_ACTION_LIST
99 ELM_XDND_ACTION_LINK, /**< Link the data */ 92#define ELM_XDND_ACTION_LINK EFL_SELECTION_ACTION_LINK
100 ELM_XDND_ACTION_DESCRIPTION /**< Describe the data */ 93#define ELM_XDND_ACTION_DESCRIPTION EFL_SELECTION_ACTION_DESCRIPTION
101} Elm_Xdnd_Action;
102 94
103/** 95/**
104 * Structure holding the info about selected data. 96 * Structure holding the info about selected data.