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

desktop-shell: Simplify popup_end_grab popup_done sending loop

Browse Source 
Can just use wl_list_for_each_safe instead of dealing with pointers
ourself.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Jonas Ådahl
2015-02-13 14:01:53 +08:00
committed by Pekka Paalanen
parent d2c6892c0e
commit c2b101114f
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+15 -21
View File
@@ -3059,20 +3059,18 @@ destroy_shell_seat(struct wl_listener *listener, void *data)
struct shell_seat *shseat = struct shell_seat *shseat =
container_of(listener, container_of(listener,
struct shell_seat, seat_destroy_listener); struct shell_seat, seat_destroy_listener);
struct shell_surface *shsurf, *prev = NULL; struct shell_surface *shsurf, *next;
if (shseat->popup_grab.grab.interface == &popup_grab_interface) { if (shseat->popup_grab.grab.interface == &popup_grab_interface) {
weston_pointer_end_grab(shseat->popup_grab.grab.pointer); weston_pointer_end_grab(shseat->popup_grab.grab.pointer);
shseat->popup_grab.client = NULL; shseat->popup_grab.client = NULL;
wl_list_for_each(shsurf, &shseat->popup_grab.surfaces_list, popup.grab_link) { wl_list_for_each_safe(shsurf, next,
&shseat->popup_grab.surfaces_list,
popup.grab_link) {
shsurf->popup.shseat = NULL; shsurf->popup.shseat = NULL;
if (prev) { wl_list_init(&shsurf->popup.grab_link);
wl_list_init(&prev->popup.grab_link);
}
prev = shsurf;
} }
wl_list_init(&prev->popup.grab_link);
} }
wl_list_remove(&shseat->seat_destroy_listener.link); wl_list_remove(&shseat->seat_destroy_listener.link);
@@ -3328,7 +3326,7 @@ popup_grab_end(struct weston_pointer *pointer)
struct shell_seat *shseat = struct shell_seat *shseat =
container_of(grab, struct shell_seat, popup_grab.grab); container_of(grab, struct shell_seat, popup_grab.grab);
struct shell_surface *shsurf; struct shell_surface *shsurf;
struct shell_surface *prev = NULL; struct shell_surface *next;
if (pointer->grab->interface == &popup_grab_interface) { if (pointer->grab->interface == &popup_grab_interface) {
weston_pointer_end_grab(grab->pointer); weston_pointer_end_grab(grab->pointer);
@@ -3336,15 +3334,13 @@ popup_grab_end(struct weston_pointer *pointer)
shseat->popup_grab.grab.interface = NULL; shseat->popup_grab.grab.interface = NULL;
assert(!wl_list_empty(&shseat->popup_grab.surfaces_list)); assert(!wl_list_empty(&shseat->popup_grab.surfaces_list));
/* Send the popup_done event to all the popups open */ /* Send the popup_done event to all the popups open */
wl_list_for_each(shsurf, &shseat->popup_grab.surfaces_list, popup.grab_link) { wl_list_for_each_safe(shsurf, next,
&shseat->popup_grab.surfaces_list,
popup.grab_link) {
shell_surface_send_popup_done(shsurf); shell_surface_send_popup_done(shsurf);
shsurf->popup.shseat = NULL; shsurf->popup.shseat = NULL;
if (prev) { wl_list_init(&shsurf->popup.grab_link);
wl_list_init(&prev->popup.grab_link);
}
prev = shsurf;
} }
wl_list_init(&prev->popup.grab_link);
wl_list_init(&shseat->popup_grab.surfaces_list); wl_list_init(&shseat->popup_grab.surfaces_list);
} }
} }
@@ -3356,7 +3352,7 @@ touch_popup_grab_end(struct weston_touch *touch)
struct shell_seat *shseat = struct shell_seat *shseat =
container_of(grab, struct shell_seat, popup_grab.touch_grab); container_of(grab, struct shell_seat, popup_grab.touch_grab);
struct shell_surface *shsurf; struct shell_surface *shsurf;
struct shell_surface *prev = NULL; struct shell_surface *next;
if (touch->grab->interface == &touch_popup_grab_interface) { if (touch->grab->interface == &touch_popup_grab_interface) {
weston_touch_end_grab(grab->touch); weston_touch_end_grab(grab->touch);
@@ -3364,15 +3360,13 @@ touch_popup_grab_end(struct weston_touch *touch)
shseat->popup_grab.touch_grab.interface = NULL; shseat->popup_grab.touch_grab.interface = NULL;
assert(!wl_list_empty(&shseat->popup_grab.surfaces_list)); assert(!wl_list_empty(&shseat->popup_grab.surfaces_list));
/* Send the popup_done event to all the popups open */ /* Send the popup_done event to all the popups open */
wl_list_for_each(shsurf, &shseat->popup_grab.surfaces_list, popup.grab_link) { wl_list_for_each_safe(shsurf, next,
&shseat->popup_grab.surfaces_list,
popup.grab_link) {
shell_surface_send_popup_done(shsurf); shell_surface_send_popup_done(shsurf);
shsurf->popup.shseat = NULL; shsurf->popup.shseat = NULL;
if (prev) { wl_list_init(&shsurf->popup.grab_link);
wl_list_init(&prev->popup.grab_link);
}
prev = shsurf;
} }
wl_list_init(&prev->popup.grab_link);
wl_list_init(&shseat->popup_grab.surfaces_list); wl_list_init(&shseat->popup_grab.surfaces_list);
} }
} }