summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorRafael Antognolli <rafael.antognolli@intel.com>2013-10-31 18:02:04 -0200
committerRafael Antognolli <rafael.antognolli@intel.com>2013-10-31 21:35:13 -0200
commit35d2f195de262d846c5e3f6dc5634921afe46606 (patch)
treec8f08ab9e58f94cc81d4f7ce1d7fbe4db9026e03 /src/lib
parent20f6676eb6ed0020c07272c9f59a20faf6ff651c (diff)
ecore/wayland: Hide Ecore_Wl_Display.
This struct is only used inside ecore_wayland itself, so there's no real reason to expose it. Apparently, hiding it doesn't break anything, except for the ecore_imf wayland module, which was easily fixed. If anyone notices a breakage, please let me know.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore_wayland/Ecore_Wayland.h44
-rw-r--r--src/lib/ecore_wayland/ecore_wl_private.h42
2 files changed, 44 insertions, 42 deletions
diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h
index 78282812fb..d7b6c6936b 100644
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -31,7 +31,8 @@
31extern "C" { 31extern "C" {
32#endif 32#endif
33 33
34typedef struct _Ecore_Wl_Display Ecore_Wl_Display; 34typedef struct _Ecore_Wl_Display Ecore_Wl_Display; /** FIXME: move to private */
35
35typedef struct _Ecore_Wl_Output Ecore_Wl_Output; 36typedef struct _Ecore_Wl_Output Ecore_Wl_Output;
36typedef struct _Ecore_Wl_Input Ecore_Wl_Input; 37typedef struct _Ecore_Wl_Input Ecore_Wl_Input;
37typedef struct _Ecore_Wl_Global Ecore_Wl_Global; /** @since 1.7.6 */ 38typedef struct _Ecore_Wl_Global Ecore_Wl_Global; /** @since 1.7.6 */
@@ -95,47 +96,6 @@ struct _Ecore_Wl_Global
95 struct wl_list link; 96 struct wl_list link;
96}; 97};
97 98
98struct _Ecore_Wl_Display
99{
100 struct
101 {
102 struct wl_display *display;
103 struct wl_registry *registry;
104 struct wl_compositor *compositor;
105 struct wl_subcompositor *subcompositor;
106 struct wl_shell *shell;
107 struct wl_shell *desktop_shell;
108 struct wl_shm *shm;
109 struct wl_data_device_manager *data_device_manager;
110 } wl;
111
112 int fd;
113 unsigned int mask;
114 unsigned int serial;
115 int sync_ref_count;
116 Ecore_Fd_Handler *fd_hdl;
117 Ecore_Idle_Enterer *idle_enterer;
118
119 struct wl_list inputs;
120 struct wl_list outputs;
121 struct wl_list globals; /** @since 1.7.6 */
122
123 Eina_Bool init_done;
124
125 struct
126 {
127 struct xkb_context *context;
128 } xkb;
129
130 struct wl_cursor_theme *cursor_theme;
131
132 Ecore_Wl_Output *output;
133 Ecore_Wl_Input *input;
134
135 void (*output_configure)(Ecore_Wl_Output *output, void *data);
136 void *data;
137};
138
139struct _Ecore_Wl_Output 99struct _Ecore_Wl_Output
140{ 100{
141 Ecore_Wl_Display *display; 101 Ecore_Wl_Display *display;
diff --git a/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h
index 581774bb8d..fdbd3c9bef 100644
--- a/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/src/lib/ecore_wayland/ecore_wl_private.h
@@ -50,6 +50,48 @@ extern Ecore_Wl_Display *_ecore_wl_disp;
50# endif 50# endif
51# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_wl_log_dom, __VA_ARGS__) 51# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_wl_log_dom, __VA_ARGS__)
52 52
53
54struct _Ecore_Wl_Display
55{
56 struct
57 {
58 struct wl_display *display;
59 struct wl_registry *registry;
60 struct wl_compositor *compositor;
61 struct wl_subcompositor *subcompositor;
62 struct wl_shell *shell;
63 struct wl_shell *desktop_shell;
64 struct wl_shm *shm;
65 struct wl_data_device_manager *data_device_manager;
66 } wl;
67
68 int fd;
69 unsigned int mask;
70 unsigned int serial;
71 int sync_ref_count;
72 Ecore_Fd_Handler *fd_hdl;
73 Ecore_Idle_Enterer *idle_enterer;
74
75 struct wl_list inputs;
76 struct wl_list outputs;
77 struct wl_list globals; /** @since 1.7.6 */
78
79 Eina_Bool init_done;
80
81 struct
82 {
83 struct xkb_context *context;
84 } xkb;
85
86 struct wl_cursor_theme *cursor_theme;
87
88 Ecore_Wl_Output *output;
89 Ecore_Wl_Input *input;
90
91 void (*output_configure)(Ecore_Wl_Output *output, void *data);
92 void *data;
93};
94
53struct _Ecore_Wl_Dnd 95struct _Ecore_Wl_Dnd
54{ 96{
55 Ecore_Wl_Display *ewd; 97 Ecore_Wl_Display *ewd;