callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Don't try to use subsurfaces as popup parents

Browse Source 
If a GtkMenu (or something else that is mapped as a xdg_popup) tries to
use a subsurface window as a parent, it will be terminated by the
compositor due to protocol violation. So to avoid this, if a parent
window is not a xdg_popup or xdg_surface, i.e. a wl_subsurface, then
traverse up the transient parents until we find the right popup parent.

https://bugzilla.gnome.org/show_bug.cgi?id=756780
This commit is contained in:
Jonas Ådahl
2015-10-18 21:03:52 +08:00
parent 49798754e6
commit e25ea62f22
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gdk/wayland/gdkwindow-wayland.c
View File

@ -1258,6 +1258,27 @@ should_map_as_popup (GdkWindow *window)
return FALSE;
}
/* Get the window that can be used as a parent for a popup, i.e. a xdg_surface
* or xdg_popup. If the window is not, traverse up the transiency parents until
* we find one.
*/
static GdkWindow *
get_popup_parent (GdkWindow *window)
{
do
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
if (impl->xdg_popup || impl->xdg_surface)
return window;
window = impl->transient_for;
}
while (window);
return NULL;
}
static void
gdk_wayland_window_map (GdkWindow *window)
{
@ -1322,6 +1343,8 @@ gdk_wayland_window_map (GdkWindow *window)
if (transient_for)
transient_for = gdk_window_get_toplevel (transient_for);
if (transient_for)
transient_for = get_popup_parent (transient_for);
/* If the position was not explicitly set, start the popup at the
* position of the device that holds the grab.
@ -1332,7 +1355,7 @@ gdk_wayland_window_map (GdkWindow *window)
&window->x, &window->y, NULL);
}
else
transient_for = impl->transient_for;
transient_for = get_popup_parent (impl->transient_for);
if (!transient_for)
{