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

wayland: Warn when an application tries to map popup incorrectly

Browse Source 
When a popup is mapped but will not be the top most popup (for example
the parent is not the current top most popup, or if there already is a
popup mapped but the parent is a toplevel), warn and ignore it instead
of continuing, as continuing would be a protocol violation.

https://bugzilla.gnome.org/show_bug.cgi?id=770745
This commit is contained in:
Jonas Ådahl 2016-09-02 18:51:34 +08:00
parent c32a31f223
commit 98b0f78200
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/wayland/gdkdisplay-wayland.h
View File

@ -90,6 +90,8 @@ struct _GdkWaylandDisplay
/* Keep a list of orphaned dialogs (i.e. without parent) */ /* Keep a list of orphaned dialogs (i.e. without parent) */
GList *orphan_dialogs; GList *orphan_dialogs;
GList *current_popups;
struct wl_cursor_theme *scaled_cursor_themes[GDK_WAYLAND_THEME_SCALES_COUNT]; struct wl_cursor_theme *scaled_cursor_themes[GDK_WAYLAND_THEME_SCALES_COUNT];
gchar *cursor_theme_name; gchar *cursor_theme_name;
int cursor_theme_size; int cursor_theme_size;

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

@ -1971,6 +1971,14 @@ gdk_wayland_window_create_xdg_popup (GdkWindow *window,
g_warning ("Can't map popup, already mapped"); g_warning ("Can't map popup, already mapped");
return; return;
} }
if ((display->current_popups &&
g_list_last (display->current_popups)->data != parent) ||
(!display->current_popups &&
!parent_impl->display_server.xdg_toplevel))
{
g_warning ("Tried to map a popup with a non-top most parent");
return;
}
impl->display_server.xdg_surface = impl->display_server.xdg_surface =
zxdg_shell_v6_get_xdg_surface (display->xdg_shell, zxdg_shell_v6_get_xdg_surface (display->xdg_shell,
@ -2000,6 +2008,8 @@ gdk_wayland_window_create_xdg_popup (GdkWindow *window,
zxdg_popup_v6_grab (impl->display_server.xdg_popup, seat, serial); zxdg_popup_v6_grab (impl->display_server.xdg_popup, seat, serial);
wl_surface_commit (impl->display_server.wl_surface); wl_surface_commit (impl->display_server.wl_surface);
display->current_popups = g_list_append (display->current_popups, window);
} }
static struct wl_seat * static struct wl_seat *
@ -2362,6 +2372,8 @@ gdk_wayland_window_hide_surface (GdkWindow *window)
{ {
zxdg_popup_v6_destroy (impl->display_server.xdg_popup); zxdg_popup_v6_destroy (impl->display_server.xdg_popup);
impl->display_server.xdg_popup = NULL; impl->display_server.xdg_popup = NULL;
display_wayland->current_popups =
g_list_remove (display_wayland->current_popups, window);
} }
if (impl->display_server.xdg_surface) if (impl->display_server.xdg_surface)
{ {