dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore-wl2: Add support for xdg popups 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-09-24 11:45:10 -04:00
parent d2816fa45f
commit 34a4787402
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/lib/ecore_wl2/ecore_wl2_window.c
View File

@ -43,6 +43,22 @@ static const struct wl_shell_surface_listener _wl_shell_surface_listener =
_wl_shell_surface_cb_popup_done
};
static void
_xdg_popup_cb_done(void *data, struct xdg_popup *xdg_popup EINA_UNUSED)
{
Ecore_Wl2_Window *win;
win = data;
if (!win) return;
_ecore_wl2_input_ungrab(win->input);
}
static const struct xdg_popup_listener _xdg_popup_listener =
{
_xdg_popup_cb_done,
};
static void
_xdg_surface_cb_configure(void *data, struct xdg_surface *xdg_surface EINA_UNUSED, int32_t w, int32_t h, struct wl_array *states, uint32_t serial)
{
@ -132,30 +148,30 @@ _ecore_wl2_window_type_set(Ecore_Wl2_Window *win)
win->geometry.x, win->geometry.y, 0);
break;
case ECORE_WL2_WINDOW_TYPE_MENU:
/* TODO: Input and XDG Popup */
if (win->xdg_surface)
if ((win->xdg_surface) && (win->input))
{
/* win->xdg_popup = */
/* xdg_shell_get_xdg_popup(win->display->wl.xdg_shell, win->surface, */
/* win->display->input->seat, */
/* win->display->serial, */
/* win->geometry.x, win->geometry.y); */
/* if (!win->xdg_popup) */
/* { */
/* ERR("Could not create xdg popup: %m"); */
/* return; */
/* } */
win->xdg_popup =
xdg_shell_get_xdg_popup(win->display->wl.xdg_shell,
win->surface, win->parent->surface,
win->input->wl.seat,
win->display->serial,
win->geometry.x, win->geometry.y);
if (!win->xdg_popup)
{
ERR("Could not create xdg popup: %m");
return;
}
/* xdg_popup_set_user_data(win->xdg_popup, win); */
/* xdg_popup_add_listener(win->xdg_popup, &_xdg_popup_listener, win); */
xdg_popup_set_user_data(win->xdg_popup, win);
xdg_popup_add_listener(win->xdg_popup, &_xdg_popup_listener, win);
}
else if (win->wl_shell_surface)
else if ((win->wl_shell_surface) && (win->input))
{
/* wl_shell_surface_set_popup(win->wl_shell_surface, */
/* win->display->input->seat, */
/* win->display->serial, */
/* win->parent->surface, */
/* win->geometry.x, win->geometry.y, 0); */
wl_shell_surface_set_popup(win->wl_shell_surface,
win->input->wl.seat,
win->display->serial,
win->parent->surface,
win->geometry.x, win->geometry.y, 0);
}
break;
case ECORE_WL2_WINDOW_TYPE_TOPLEVEL: