summaryrefslogtreecommitdiffstats
path: root/sway/input/cursor.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-07-26 18:36:46 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-07-28 22:41:04 +1000
commit08cfba2192f5770d975c5fe70789a81aaee4dc7e (patch)
tree7f07e32020649ae5c049e8533f0cf040dc80e166 /sway/input/cursor.c
parentMerge pull request #2372 from RyanDwyer/fix-use-after-free-v2 (diff)
downloadsway-08cfba2192f5770d975c5fe70789a81aaee4dc7e.tar.gz
sway-08cfba2192f5770d975c5fe70789a81aaee4dc7e.tar.zst
sway-08cfba2192f5770d975c5fe70789a81aaee4dc7e.zip
Allow containers to float
Things worth noting: * When a fullscreen view unmaps, the check to unset fullscreen on the workspace has been moved out of view_unmap and into container_destroy, because containers can be fullscreen too * The calls to `container_reap_empty_recursive(workspace)` have been removed from `container_set_floating`. That function reaps upwards so it wouldn't do anything. I'm probably the one who originally added it... * My fix (b14bd1b0b1536039e4f46fe94515c7c44e7afc61) for the tabbed child crash has a side effect where when you close a floating container, focus is not given to the tiled container again. I've removed my fix and removed the call to `send_cursor_motion` from `seat_set_focus_warp`. We should consider calling it from somewhere earlier in the call stack.
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r--sway/input/cursor.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index cc0dbe99..d1347198 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -598,7 +598,10 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
598 seat_set_focus_layer(cursor->seat, layer); 598 seat_set_focus_layer(cursor->seat, layer);
599 } 599 }
600 seat_pointer_notify_button(cursor->seat, time_msec, button, state); 600 seat_pointer_notify_button(cursor->seat, time_msec, button, state);
601 } else if (cont && container_is_floating(cont)) { 601 } else if (cont && container_is_floating_or_child(cont)) {
602 while (cont->parent->layout != L_FLOATING) {
603 cont = cont->parent;
604 }
602 dispatch_cursor_button_floating(cursor, time_msec, button, state, 605 dispatch_cursor_button_floating(cursor, time_msec, button, state,
603 surface, sx, sy, cont); 606 surface, sx, sy, cont);
604 } else if (surface && cont && cont->type != C_VIEW) { 607 } else if (surface && cont && cont->type != C_VIEW) {