mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Do not hang when mapping a popup twice

Browse Source 
When calling shell_map_popup() more than one time on the same shell_surface
the parent transform was getting added more than one time to the transform
list, resulting in an infinite loop when going through the list with
wl_list_for_each in weston_surface_update_transform_enable().
This commit removes the old transform before adding it again.
This commit is contained in:
Giulio Camuffo 2013-02-18 22:26:01 +01:00 committed by Kristian Høgsberg
parent db790573ad
commit 8aa16174e2
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/shell.c
View File

@ -1900,6 +1900,14 @@ shell_map_popup(struct shell_surface *shsurf)
struct weston_surface *es = shsurf->surface;
struct weston_surface *parent = shsurf->parent;
/* Remove the old transform. We don't want to add it twice
* otherwise Weston will go into an infinite loop when going
* through the transforms. */
if (!wl_list_empty(&shsurf->popup.parent_transform.link)) {
wl_list_remove(&shsurf->popup.parent_transform.link);
wl_list_init(&shsurf->popup.parent_transform.link);
}
es->output = parent->output;
shsurf->popup.grab.interface = &popup_grab_interface;
@ -2070,6 +2078,7 @@ create_shell_surface(void *shell, struct weston_surface *surface,
weston_matrix_init(&shsurf->rotation.rotation);
wl_list_init(&shsurf->workspace_transform.link);
wl_list_init(&shsurf->popup.parent_transform.link);
shsurf->type = SHELL_SURFACE_NONE;
shsurf->next_type = SHELL_SURFACE_NONE;