isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland-surface: Keep a reference to a popup's parent surface

Browse Source 
This will allows us to access the parent while constructing the
MetaWindow.

https://bugzilla.gnome.org/show_bug.cgi?id=745118
This commit is contained in:
Rui Matos 2015-02-24 20:53:55 +01:00
parent cbad65f657
commit 59f348eb11
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/wayland/meta-wayland-surface.c
View File

@ -1021,6 +1021,12 @@ xdg_popup_destructor (struct wl_resource *resource)
{ {
MetaWaylandSurface *surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
if (surface->popup.parent)
{
wl_list_remove (&surface->popup.parent_destroy_listener.link);
surface->popup.parent = NULL;
}
if (surface->popup.popup) if (surface->popup.popup)
meta_wayland_popup_dismiss (surface->popup.popup); meta_wayland_popup_dismiss (surface->popup.popup);
@ -1038,6 +1044,20 @@ static const struct xdg_popup_interface meta_wayland_xdg_popup_interface = {
xdg_popup_destroy, xdg_popup_destroy,
}; };
static void
handle_popup_parent_destroyed (struct wl_listener *listener, void *data)
{
MetaWaylandSurface *surface =
wl_container_of (listener, surface, popup.parent_destroy_listener);
wl_resource_post_error (surface->xdg_popup,
XDG_POPUP_ERROR_NOT_THE_TOPMOST_POPUP,
"destroyed popup not top most popup");
surface->popup.parent = NULL;
destroy_window (surface);
}
static void static void
handle_popup_destroyed (struct wl_listener *listener, void *data) handle_popup_destroyed (struct wl_listener *listener, void *data)
{ {
@ -1130,6 +1150,11 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
surface->xdg_popup = popup_resource; surface->xdg_popup = popup_resource;
surface->xdg_shell_resource = resource; surface->xdg_shell_resource = resource;
surface->popup.parent = parent_surf;
surface->popup.parent_destroy_listener.notify = handle_popup_parent_destroyed;
wl_resource_add_destroy_listener (parent_surf->resource,
&surface->popup.parent_destroy_listener);
window = meta_window_wayland_new (display, surface); window = meta_window_wayland_new (display, surface);
meta_window_move_frame (window, FALSE, meta_window_move_frame (window, FALSE,
parent_surf->window->rect.x + x, parent_surf->window->rect.x + x,

7
src/wayland/meta-wayland-surface.h
View File

@ -102,8 +102,11 @@ struct _MetaWaylandSurface
/* xdg_popup */ /* xdg_popup */
struct { struct {
MetaWaylandPopup *popup; MetaWaylandSurface *parent;
struct wl_listener destroy_listener; struct wl_listener parent_destroy_listener;
MetaWaylandPopup *popup;
struct wl_listener destroy_listener;
} popup; } popup;
/* wl_subsurface stuff. */ /* wl_subsurface stuff. */