diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/ecore/src/lib/ecore_wayland/ecore_wl_private.h | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to 'libraries/ecore/src/lib/ecore_wayland/ecore_wl_private.h')
-rw-r--r-- | libraries/ecore/src/lib/ecore_wayland/ecore_wl_private.h | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/libraries/ecore/src/lib/ecore_wayland/ecore_wl_private.h b/libraries/ecore/src/lib/ecore_wayland/ecore_wl_private.h index eec5ffe..31956a1 100644 --- a/libraries/ecore/src/lib/ecore_wayland/ecore_wl_private.h +++ b/libraries/ecore/src/lib/ecore_wayland/ecore_wl_private.h | |||
@@ -2,6 +2,9 @@ | |||
2 | # define _ECORE_WAYLAND_PRIVATE_H | 2 | # define _ECORE_WAYLAND_PRIVATE_H |
3 | 3 | ||
4 | # include <limits.h> | 4 | # include <limits.h> |
5 | # include <xkbcommon/xkbcommon.h> | ||
6 | |||
7 | # include "Ecore_Wayland.h" | ||
5 | 8 | ||
6 | //# define LOGFNS 1 | 9 | //# define LOGFNS 1 |
7 | 10 | ||
@@ -13,6 +16,7 @@ | |||
13 | # endif | 16 | # endif |
14 | 17 | ||
15 | extern int _ecore_wl_log_dom; | 18 | extern int _ecore_wl_log_dom; |
19 | extern Ecore_Wl_Display *_ecore_wl_disp; | ||
16 | 20 | ||
17 | # ifdef ECORE_WL_DEFAULT_LOG_COLOR | 21 | # ifdef ECORE_WL_DEFAULT_LOG_COLOR |
18 | # undef ECORE_WL_DEFAULT_LOG_COLOR | 22 | # undef ECORE_WL_DEFAULT_LOG_COLOR |
@@ -44,42 +48,40 @@ extern int _ecore_wl_log_dom; | |||
44 | # endif | 48 | # endif |
45 | # define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_wl_log_dom, __VA_ARGS__) | 49 | # define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_wl_log_dom, __VA_ARGS__) |
46 | 50 | ||
47 | typedef struct _Ecore_Wl_Dnd_Source | 51 | struct _Ecore_Wl_Dnd_Source |
48 | { | 52 | { |
49 | struct wl_data_offer *offer; | 53 | struct wl_data_offer *offer; |
50 | int refs; | 54 | Ecore_Wl_Input *input; |
51 | 55 | struct wl_array types; | |
52 | Eina_Array *types; | 56 | int refcount; |
57 | int fd; | ||
58 | int x, y; | ||
53 | 59 | ||
54 | uint32_t timestamp; | 60 | /* TODO: task & data_func */ |
55 | void *data; | 61 | void *data; |
56 | } Ecore_Wl_Dnd_Source; | 62 | }; |
57 | 63 | ||
58 | typedef struct _Ecore_Wl_Dnd_Target | 64 | struct _Ecore_Wl_Dnd_Target |
59 | { | 65 | { |
60 | /* NB: These are not the real fields for this structure, | 66 | Ecore_Wl_Dnd_Source *source; |
61 | * and it is Bound to change....soon */ | 67 | }; |
62 | struct wl_data_offer *offer; | ||
63 | int refs; | ||
64 | |||
65 | Eina_Array *types; | ||
66 | 68 | ||
67 | uint32_t timestamp; | 69 | void _ecore_wl_window_init(void); |
68 | void *data; | 70 | void _ecore_wl_window_shutdown(void); |
69 | } Ecore_Wl_Dnd_Target; | ||
70 | 71 | ||
71 | struct _Ecore_Wl_Drag_Source | 72 | void _ecore_wl_output_add(Ecore_Wl_Display *ewd, unsigned int id); |
72 | { | 73 | void _ecore_wl_output_del(Ecore_Wl_Output *output); |
73 | struct wl_data_device *data_dev; | ||
74 | struct wl_buffer *buffer; | ||
75 | 74 | ||
76 | int32_t hotspot_x, hotspot_y; | 75 | void _ecore_wl_input_add(Ecore_Wl_Display *ewd, unsigned int id); |
77 | int32_t offset_x, offset_y; | 76 | void _ecore_wl_input_del(Ecore_Wl_Input *input); |
78 | const char *mimetype; | 77 | void _ecore_wl_input_pointer_xy_get(int *x, int *y); |
79 | uint32_t timestamp; | ||
80 | void *data; | ||
81 | 78 | ||
82 | struct wl_data_source *data_source; | 79 | void _ecore_wl_dnd_add(Ecore_Wl_Input *input, struct wl_data_device *data_device, unsigned int id); |
83 | }; | 80 | void _ecore_wl_dnd_enter(void *data, struct wl_data_device *data_device __UNUSED__, unsigned int timestamp __UNUSED__, struct wl_surface *surface, int x, int y, struct wl_data_offer *offer); |
81 | void _ecore_wl_dnd_leave(void *data, struct wl_data_device *data_device __UNUSED__); | ||
82 | void _ecore_wl_dnd_motion(void *data, struct wl_data_device *data_device __UNUSED__, unsigned int timestamp __UNUSED__, int x, int y); | ||
83 | void _ecore_wl_dnd_drop(void *data, struct wl_data_device *data_device __UNUSED__); | ||
84 | void _ecore_wl_dnd_selection(void *data, struct wl_data_device *data_device __UNUSED__, struct wl_data_offer *offer); | ||
85 | void _ecore_wl_dnd_del(Ecore_Wl_Dnd_Source *source); | ||
84 | 86 | ||
85 | #endif | 87 | #endif |