summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorRafael Antognolli <rafael.antognolli@intel.com>2013-11-01 15:55:39 -0200
committerRafael Antognolli <rafael.antognolli@intel.com>2013-11-01 15:55:39 -0200
commitfe8058cf77b6233917c3aaaf014473788e347888 (patch)
treef57c782525fc149f38f22c1f1abfe36c16482f5b /src/lib
parentb77ac9b57ef6367adaa2812be874575559b54d72 (diff)
ecore/wayland: Finally move Ecore_Wayland internals to private header.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore_wayland/Ecore_Wayland.h60
-rw-r--r--src/lib/ecore_wayland/ecore_wl_private.h58
2 files changed, 58 insertions, 60 deletions
diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h
index fe376308ea..f58d41f62a 100644
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -109,66 +109,6 @@ struct _Ecore_Wl_Output
109 void *data; 109 void *data;
110}; 110};
111 111
112struct _Ecore_Wl_Window
113{
114 Ecore_Wl_Display *display;
115 Ecore_Wl_Window *parent;
116
117 struct wl_surface *surface;
118 struct wl_shell_surface *shell_surface;
119
120 struct
121 {
122 struct wl_surface *surface;
123 int hot_x, hot_y;
124 Eina_Bool set : 1;
125 } pointer;
126
127 int id, surface_id;
128 int rotation;
129
130 const char *title;
131 const char *class_name;
132
133 Eina_Rectangle allocation;
134
135 struct
136 {
137 int w, h;
138 } saved;
139
140 struct
141 {
142 int x, y, w, h;
143 } opaque;
144
145 /* Eina_Bool redraw_scheduled : 1; */
146 /* Eina_Bool resize_scheduled : 1; */
147 Eina_Bool alpha : 1;
148 Eina_Bool transparent : 1;
149 Eina_Bool moving : 1;
150 Eina_Bool resizing : 1;
151 Eina_Bool has_buffer : 1;
152
153 Ecore_Wl_Window_Type type;
154 Ecore_Wl_Window_Buffer_Type buffer_type;
155
156 Ecore_Wl_Input *pointer_device;
157 Ecore_Wl_Input *keyboard_device;
158
159 /* FIXME: Shouldn't these attributes be private to the Ecore_Wl_Window? */
160
161 Eina_Bool anim_pending : 1;
162 struct wl_callback *anim_callback;
163
164 /* FIXME: Ideally we should record the cursor name for this window
165 * so we can compare and avoid unnecessary cursor set calls to wayland */
166
167 Ecore_Wl_Subsurf *subsurfs;
168
169 void *data;
170};
171
172struct _Ecore_Wl_Event_Mouse_In 112struct _Ecore_Wl_Event_Mouse_In
173{ 113{
174 int modifiers; 114 int modifiers;
diff --git a/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h
index 06be1a5b58..fa92e6d93e 100644
--- a/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/src/lib/ecore_wayland/ecore_wl_private.h
@@ -92,6 +92,64 @@ struct _Ecore_Wl_Display
92 void *data; 92 void *data;
93}; 93};
94 94
95struct _Ecore_Wl_Window
96{
97 Ecore_Wl_Display *display;
98 Ecore_Wl_Window *parent;
99
100 struct wl_surface *surface;
101 struct wl_shell_surface *shell_surface;
102
103 struct
104 {
105 struct wl_surface *surface;
106 int hot_x, hot_y;
107 Eina_Bool set : 1;
108 } pointer;
109
110 int id, surface_id;
111 int rotation;
112
113 const char *title;
114 const char *class_name;
115
116 Eina_Rectangle allocation;
117
118 struct
119 {
120 int w, h;
121 } saved;
122
123 struct
124 {
125 int x, y, w, h;
126 } opaque;
127
128 /* Eina_Bool redraw_scheduled : 1; */
129 /* Eina_Bool resize_scheduled : 1; */
130 Eina_Bool alpha : 1;
131 Eina_Bool transparent : 1;
132 Eina_Bool moving : 1;
133 Eina_Bool resizing : 1;
134 Eina_Bool has_buffer : 1;
135
136 Ecore_Wl_Window_Type type;
137 Ecore_Wl_Window_Buffer_Type buffer_type;
138
139 Ecore_Wl_Input *pointer_device;
140 Ecore_Wl_Input *keyboard_device;
141
142 Eina_Bool anim_pending : 1;
143 struct wl_callback *anim_callback;
144
145 /* FIXME: Ideally we should record the cursor name for this window
146 * so we can compare and avoid unnecessary cursor set calls to wayland */
147
148 Ecore_Wl_Subsurf *subsurfs;
149
150 void *data;
151};
152
95struct _Ecore_Wl_Input 153struct _Ecore_Wl_Input
96{ 154{
97 Ecore_Wl_Display *display; 155 Ecore_Wl_Display *display;