alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

View destroy handling clean up and clarifications

Browse source
This commit is contained in:
Luminarys 2015-08-17 14:22:49 -05:00
parent 3b1bc2c11e
commit b5f19f0fd3
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/handlers.c
View file

@ -137,8 +137,10 @@ static void handle_view_destroyed(wlc_handle handle) {
wlc_view_set_state(handle, WLC_BIT_ACTIVATED, true); wlc_view_set_state(handle, WLC_BIT_ACTIVATED, true);
sway_log(L_DEBUG,"Unmanaged window of type %x was destroyed", type); sway_log(L_DEBUG,"Unmanaged window of type %x was destroyed", type);
if (type & WLC_BIT_UNMANAGED) { if (type & WLC_BIT_UNMANAGED) {
// We need to call focus_view() on focus_pointer because when unmanaged windows
// do not alter the focus structure of the container tree. This makes focus_pointer()
// think that it doesn't need to do anything, so we manually focus the result.
focus_view(focus_pointer()); focus_view(focus_pointer());
arrange_windows(active_workspace, -1, -1);
return; return;
} }
@ -147,11 +149,8 @@ static void handle_view_destroyed(wlc_handle handle) {
focus_view(focus_pointer()); focus_view(focus_pointer());
return; return;
} }
if (type & WLC_BIT_POPUP) {
swayc_t *view = get_swayc_for_handle(handle, &root_container);
destroy_view(view);
}
} }
swayc_t *view = get_swayc_for_handle(handle, &root_container); swayc_t *view = get_swayc_for_handle(handle, &root_container);
swayc_t *parent; swayc_t *parent;
swayc_t *focused = get_focused_container(&root_container); swayc_t *focused = get_focused_container(&root_container);