summaryrefslogtreecommitdiff
path: root/src/lib/ecore_wayland/ecore_wl_window.c
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-06-08 10:56:10 -0400
committerChris Michael <cp.michael@samsung.com>2015-06-08 10:58:51 -0400
commit13df35050cdf5e500e9dbe1290ca3dd83580f252 (patch)
treefbb0b8a50964dd6d5c7f4b254bf51c6c4ec96222 /src/lib/ecore_wayland/ecore_wl_window.c
parent7a38f8ec2129a4ae7ca1c1f76fba47d0cd1f7052 (diff)
ecore-wayland: Fix T2466: Update xdg shell protocol code
Summary: This updates the xdg_shell protocol and code to support XDG_SHELL version 5. This allows EFL/Elm apps to function again in Weston. @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/lib/ecore_wayland/ecore_wl_window.c')
-rw-r--r--src/lib/ecore_wayland/ecore_wl_window.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index 8811ded36f..ab3f28d3bd 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -15,7 +15,7 @@ static void _ecore_wl_window_configure_send(Ecore_Wl_Window *win, int w, int h,
15static char *_ecore_wl_window_id_str_get(unsigned int win_id); 15static char *_ecore_wl_window_id_str_get(unsigned int win_id);
16static void _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface, int32_t width, int32_t height,struct wl_array *states, uint32_t serial); 16static void _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface, int32_t width, int32_t height,struct wl_array *states, uint32_t serial);
17static void _ecore_xdg_handle_surface_delete(void *data, struct xdg_surface *xdg_surface); 17static void _ecore_xdg_handle_surface_delete(void *data, struct xdg_surface *xdg_surface);
18static void _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup, unsigned int serial); 18static void _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup);
19 19
20/* local variables */ 20/* local variables */
21static Eina_Hash *_windows = NULL; 21static Eina_Hash *_windows = NULL;
@@ -368,7 +368,7 @@ ecore_wl_window_show(Ecore_Wl_Window *win)
368 break; 368 break;
369 case ECORE_WL_WINDOW_TYPE_TRANSIENT: 369 case ECORE_WL_WINDOW_TYPE_TRANSIENT:
370 if (win->xdg_surface) 370 if (win->xdg_surface)
371 xdg_surface_set_parent(win->xdg_surface, win->parent->surface); 371 xdg_surface_set_parent(win->xdg_surface, win->parent->xdg_surface);
372 else if (win->shell_surface) 372 else if (win->shell_surface)
373 wl_shell_surface_set_transient(win->shell_surface, 373 wl_shell_surface_set_transient(win->shell_surface,
374 win->parent->surface, 374 win->parent->surface,
@@ -384,8 +384,7 @@ ecore_wl_window_show(Ecore_Wl_Window *win)
384 win->parent->surface, 384 win->parent->surface,
385 _ecore_wl_disp->input->seat, 385 _ecore_wl_disp->input->seat,
386 _ecore_wl_disp->serial, 386 _ecore_wl_disp->serial,
387 win->allocation.x, 387 win->allocation.x, win->allocation.y);
388 win->allocation.y, 0);
389 if (!win->xdg_popup) return; 388 if (!win->xdg_popup) return;
390 xdg_popup_set_user_data(win->xdg_popup, win); 389 xdg_popup_set_user_data(win->xdg_popup, win);
391 xdg_popup_add_listener(win->xdg_popup, 390 xdg_popup_add_listener(win->xdg_popup,
@@ -1052,7 +1051,7 @@ _ecore_wl_window_cb_popup_done(void *data, struct wl_shell_surface *shell_surfac
1052} 1051}
1053 1052
1054static void 1053static void
1055_ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup, unsigned int serial EINA_UNUSED) 1054_ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup)
1056{ 1055{
1057 Ecore_Wl_Window *win; 1056 Ecore_Wl_Window *win;
1058 1057