aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop/wl_shell.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/desktop/wl_shell.c')
-rw-r--r--sway/desktop/wl_shell.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c
index 0cde6583..0356aa81 100644
--- a/sway/desktop/wl_shell.c
+++ b/sway/desktop/wl_shell.c
@@ -131,14 +131,11 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
sway_surface->destroy.notify = handle_destroy;
wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy);
- // TODO: actual focus semantics
- swayc_t *parent = root_container.children->items[0];
- parent = parent->children->items[0]; // workspace
-
- swayc_t *cont = new_view(parent, sway_view);
+ struct sway_seat *seat = input_manager_current_seat(input_manager);
+ swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
+ swayc_t *cont = new_view(focus, sway_view);
sway_view->swayc = cont;
arrange_windows(cont->parent, -1, -1);
-
sway_input_manager_set_focus(input_manager, cont);
}