diff options
-rw-r--r-- | include/sway/input/seat.h | 11 | ||||
-rw-r--r-- | sway/commands/move.c | 8 | ||||
-rw-r--r-- | sway/commands/swap.c | 4 | ||||
-rw-r--r-- | sway/input/cursor.c | 6 | ||||
-rw-r--r-- | sway/input/seat.c | 51 | ||||
-rw-r--r-- | sway/tree/container.c | 4 |
6 files changed, 48 insertions, 36 deletions
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index ebb0cd43..be95567e 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h | |||
@@ -51,6 +51,7 @@ struct sway_seat { | |||
51 | 51 | ||
52 | bool has_focus; | 52 | bool has_focus; |
53 | struct wl_list focus_stack; // list of containers in focus order | 53 | struct wl_list focus_stack; // list of containers in focus order |
54 | struct sway_workspace *workspace; | ||
54 | 55 | ||
55 | // If the focused layer is set, views cannot receive keyboard focus | 56 | // If the focused layer is set, views cannot receive keyboard focus |
56 | struct wlr_layer_surface_v1 *focused_layer; | 57 | struct wlr_layer_surface_v1 *focused_layer; |
@@ -112,8 +113,16 @@ void seat_set_focus_container(struct sway_seat *seat, | |||
112 | void seat_set_focus_workspace(struct sway_seat *seat, | 113 | void seat_set_focus_workspace(struct sway_seat *seat, |
113 | struct sway_workspace *ws); | 114 | struct sway_workspace *ws); |
114 | 115 | ||
116 | /** | ||
117 | * Manipulate the focus stack without triggering any other behaviour. | ||
118 | * | ||
119 | * This can be used to set focus_inactive by calling the function a second time | ||
120 | * with the real focus. | ||
121 | */ | ||
122 | void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node); | ||
123 | |||
115 | void seat_set_focus_warp(struct sway_seat *seat, | 124 | void seat_set_focus_warp(struct sway_seat *seat, |
116 | struct sway_node *node, bool warp, bool notify); | 125 | struct sway_node *node, bool warp); |
117 | 126 | ||
118 | void seat_set_focus_surface(struct sway_seat *seat, | 127 | void seat_set_focus_surface(struct sway_seat *seat, |
119 | struct wlr_surface *surface, bool unfocus); | 128 | struct wlr_surface *surface, bool unfocus); |
diff --git a/sway/commands/move.c b/sway/commands/move.c index fc2f1cc1..24036f36 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
@@ -543,7 +543,7 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) { | |||
543 | if (new_output_last_ws && new_output_last_ws != new_workspace) { | 543 | if (new_output_last_ws && new_output_last_ws != new_workspace) { |
544 | struct sway_node *new_output_last_focus = | 544 | struct sway_node *new_output_last_focus = |
545 | seat_get_focus_inactive(seat, &new_output_last_ws->node); | 545 | seat_get_focus_inactive(seat, &new_output_last_ws->node); |
546 | seat_set_focus_warp(seat, new_output_last_focus, false, false); | 546 | seat_set_raw_focus(seat, new_output_last_focus); |
547 | } | 547 | } |
548 | 548 | ||
549 | // restore focus | 549 | // restore focus |
@@ -556,7 +556,7 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) { | |||
556 | focus = seat_get_focus_inactive(seat, &old_ws->node); | 556 | focus = seat_get_focus_inactive(seat, &old_ws->node); |
557 | } | 557 | } |
558 | } | 558 | } |
559 | seat_set_focus_warp(seat, focus, true, false); | 559 | seat_set_focus(seat, focus); |
560 | 560 | ||
561 | // clean-up, destroying parents if the container was the last child | 561 | // clean-up, destroying parents if the container was the last child |
562 | if (old_parent) { | 562 | if (old_parent) { |
@@ -593,7 +593,7 @@ static void workspace_move_to_output(struct sway_workspace *workspace, | |||
593 | char *ws_name = workspace_next_name(old_output->wlr_output->name); | 593 | char *ws_name = workspace_next_name(old_output->wlr_output->name); |
594 | struct sway_workspace *ws = workspace_create(old_output, ws_name); | 594 | struct sway_workspace *ws = workspace_create(old_output, ws_name); |
595 | free(ws_name); | 595 | free(ws_name); |
596 | seat_set_focus_workspace(seat, ws); | 596 | seat_set_raw_focus(seat, &ws->node); |
597 | } | 597 | } |
598 | 598 | ||
599 | workspace_consider_destroy(new_output_old_ws); | 599 | workspace_consider_destroy(new_output_old_ws); |
@@ -704,7 +704,7 @@ static struct cmd_results *cmd_move_in_direction( | |||
704 | } | 704 | } |
705 | 705 | ||
706 | // Hack to re-focus container | 706 | // Hack to re-focus container |
707 | seat_set_focus_workspace(config->handler_context.seat, new_ws); | 707 | seat_set_raw_focus(config->handler_context.seat, &new_ws->node); |
708 | seat_set_focus_container(config->handler_context.seat, container); | 708 | seat_set_focus_container(config->handler_context.seat, container); |
709 | 709 | ||
710 | if (old_ws != new_ws) { | 710 | if (old_ws != new_ws) { |
diff --git a/sway/commands/swap.c b/sway/commands/swap.c index d8ffe78c..9cc0d5c2 100644 --- a/sway/commands/swap.c +++ b/sway/commands/swap.c | |||
@@ -61,13 +61,13 @@ static void swap_focus(struct sway_container *con1, | |||
61 | enum sway_container_layout layout2 = container_parent_layout(con2); | 61 | enum sway_container_layout layout2 = container_parent_layout(con2); |
62 | if (focus == con1 && (layout2 == L_TABBED || layout2 == L_STACKED)) { | 62 | if (focus == con1 && (layout2 == L_TABBED || layout2 == L_STACKED)) { |
63 | if (workspace_is_visible(ws2)) { | 63 | if (workspace_is_visible(ws2)) { |
64 | seat_set_focus_warp(seat, &con2->node, false, true); | 64 | seat_set_focus_warp(seat, &con2->node, false); |
65 | } | 65 | } |
66 | seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1); | 66 | seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1); |
67 | } else if (focus == con2 && (layout1 == L_TABBED | 67 | } else if (focus == con2 && (layout1 == L_TABBED |
68 | || layout1 == L_STACKED)) { | 68 | || layout1 == L_STACKED)) { |
69 | if (workspace_is_visible(ws1)) { | 69 | if (workspace_is_visible(ws1)) { |
70 | seat_set_focus_warp(seat, &con1->node, false, true); | 70 | seat_set_focus_warp(seat, &con1->node, false); |
71 | } | 71 | } |
72 | seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2); | 72 | seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2); |
73 | } else if (ws1 != ws2) { | 73 | } else if (ws1 != ws2) { |
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 5c446299..bbe6b890 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -596,7 +596,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, | |||
596 | struct sway_output *focused_output = node_get_output(focus); | 596 | struct sway_output *focused_output = node_get_output(focus); |
597 | struct sway_output *output = node_get_output(node); | 597 | struct sway_output *output = node_get_output(node); |
598 | if (output != focused_output) { | 598 | if (output != focused_output) { |
599 | seat_set_focus_warp(seat, node, false, true); | 599 | seat_set_focus_warp(seat, node, false); |
600 | } | 600 | } |
601 | } else if (node->type == N_CONTAINER && node->sway_container->view) { | 601 | } else if (node->type == N_CONTAINER && node->sway_container->view) { |
602 | // Focus node if the following are true: | 602 | // Focus node if the following are true: |
@@ -606,14 +606,14 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, | |||
606 | if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) && | 606 | if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) && |
607 | node != prev_node && | 607 | node != prev_node && |
608 | view_is_visible(node->sway_container->view)) { | 608 | view_is_visible(node->sway_container->view)) { |
609 | seat_set_focus_warp(seat, node, false, true); | 609 | seat_set_focus_warp(seat, node, false); |
610 | } else { | 610 | } else { |
611 | struct sway_node *next_focus = | 611 | struct sway_node *next_focus = |
612 | seat_get_focus_inactive(seat, &root->node); | 612 | seat_get_focus_inactive(seat, &root->node); |
613 | if (next_focus && next_focus->type == N_CONTAINER && | 613 | if (next_focus && next_focus->type == N_CONTAINER && |
614 | next_focus->sway_container->view && | 614 | next_focus->sway_container->view && |
615 | view_is_visible(next_focus->sway_container->view)) { | 615 | view_is_visible(next_focus->sway_container->view)) { |
616 | seat_set_focus_warp(seat, next_focus, false, true); | 616 | seat_set_focus_warp(seat, next_focus, false); |
617 | } | 617 | } |
618 | } | 618 | } |
619 | } | 619 | } |
diff --git a/sway/input/seat.c b/sway/input/seat.c index 03ed638e..c7deabed 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -184,8 +184,8 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) { | |||
184 | seat_set_focus(seat, next_focus); | 184 | seat_set_focus(seat, next_focus); |
185 | } else { | 185 | } else { |
186 | // Setting focus_inactive | 186 | // Setting focus_inactive |
187 | seat_set_focus_warp(seat, next_focus, false, false); | 187 | seat_set_raw_focus(seat, next_focus); |
188 | seat_set_focus_warp(seat, focus, false, false); | 188 | seat_set_raw_focus(seat, focus); |
189 | } | 189 | } |
190 | } | 190 | } |
191 | 191 | ||
@@ -623,8 +623,25 @@ static void container_raise_floating(struct sway_container *con) { | |||
623 | } | 623 | } |
624 | } | 624 | } |
625 | 625 | ||
626 | static void set_workspace(struct sway_seat *seat, | ||
627 | struct sway_workspace *new_ws) { | ||
628 | if (seat->workspace == new_ws) { | ||
629 | return; | ||
630 | } | ||
631 | ipc_event_workspace(seat->workspace, new_ws, "focus"); | ||
632 | seat->workspace = new_ws; | ||
633 | } | ||
634 | |||
635 | void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node) { | ||
636 | struct sway_seat_node *seat_node = seat_node_from_node(seat, node); | ||
637 | wl_list_remove(&seat_node->link); | ||
638 | wl_list_insert(&seat->focus_stack, &seat_node->link); | ||
639 | node_set_dirty(node); | ||
640 | node_set_dirty(node_get_parent(node)); | ||
641 | } | ||
642 | |||
626 | void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, | 643 | void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, |
627 | bool warp, bool notify) { | 644 | bool warp) { |
628 | if (seat->focused_layer) { | 645 | if (seat->focused_layer) { |
629 | return; | 646 | return; |
630 | } | 647 | } |
@@ -688,34 +705,20 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, | |||
688 | if (container) { | 705 | if (container) { |
689 | struct sway_container *parent = container->parent; | 706 | struct sway_container *parent = container->parent; |
690 | while (parent) { | 707 | while (parent) { |
691 | struct sway_seat_node *seat_node = | 708 | seat_set_raw_focus(seat, &parent->node); |
692 | seat_node_from_node(seat, &parent->node); | ||
693 | wl_list_remove(&seat_node->link); | ||
694 | wl_list_insert(&seat->focus_stack, &seat_node->link); | ||
695 | node_set_dirty(&parent->node); | ||
696 | parent = parent->parent; | 709 | parent = parent->parent; |
697 | } | 710 | } |
698 | } | 711 | } |
699 | if (new_workspace) { | 712 | if (new_workspace) { |
700 | struct sway_seat_node *seat_node = | 713 | seat_set_raw_focus(seat, &new_workspace->node); |
701 | seat_node_from_node(seat, &new_workspace->node); | ||
702 | wl_list_remove(&seat_node->link); | ||
703 | wl_list_insert(&seat->focus_stack, &seat_node->link); | ||
704 | node_set_dirty(&new_workspace->node); | ||
705 | } | 714 | } |
706 | if (container) { | 715 | if (container) { |
707 | struct sway_seat_node *seat_node = | 716 | seat_set_raw_focus(seat, &container->node); |
708 | seat_node_from_node(seat, &container->node); | ||
709 | wl_list_remove(&seat_node->link); | ||
710 | wl_list_insert(&seat->focus_stack, &seat_node->link); | ||
711 | node_set_dirty(&container->node); | ||
712 | seat_send_focus(&container->node, seat); | 717 | seat_send_focus(&container->node, seat); |
713 | } | 718 | } |
714 | 719 | ||
715 | // emit ipc events | 720 | // emit ipc events |
716 | if (notify && new_workspace && last_workspace != new_workspace) { | 721 | set_workspace(seat, new_workspace); |
717 | ipc_event_workspace(last_workspace, new_workspace, "focus"); | ||
718 | } | ||
719 | if (container && container->view) { | 722 | if (container && container->view) { |
720 | ipc_event_window(container, "focus"); | 723 | ipc_event_window(container, "focus"); |
721 | } | 724 | } |
@@ -807,17 +810,17 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, | |||
807 | } | 810 | } |
808 | 811 | ||
809 | void seat_set_focus(struct sway_seat *seat, struct sway_node *node) { | 812 | void seat_set_focus(struct sway_seat *seat, struct sway_node *node) { |
810 | seat_set_focus_warp(seat, node, true, true); | 813 | seat_set_focus_warp(seat, node, true); |
811 | } | 814 | } |
812 | 815 | ||
813 | void seat_set_focus_container(struct sway_seat *seat, | 816 | void seat_set_focus_container(struct sway_seat *seat, |
814 | struct sway_container *con) { | 817 | struct sway_container *con) { |
815 | seat_set_focus_warp(seat, con ? &con->node : NULL, true, true); | 818 | seat_set_focus_warp(seat, con ? &con->node : NULL, true); |
816 | } | 819 | } |
817 | 820 | ||
818 | void seat_set_focus_workspace(struct sway_seat *seat, | 821 | void seat_set_focus_workspace(struct sway_seat *seat, |
819 | struct sway_workspace *ws) { | 822 | struct sway_workspace *ws) { |
820 | seat_set_focus_warp(seat, ws ? &ws->node : NULL, true, true); | 823 | seat_set_focus_warp(seat, ws ? &ws->node : NULL, true); |
821 | } | 824 | } |
822 | 825 | ||
823 | void seat_set_focus_surface(struct sway_seat *seat, | 826 | void seat_set_focus_surface(struct sway_seat *seat, |
diff --git a/sway/tree/container.c b/sway/tree/container.c index f36fe4b0..edab7a17 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -1202,8 +1202,8 @@ struct sway_container *container_split(struct sway_container *child, | |||
1202 | container_add_child(cont, child); | 1202 | container_add_child(cont, child); |
1203 | 1203 | ||
1204 | if (set_focus) { | 1204 | if (set_focus) { |
1205 | seat_set_focus_container(seat, cont); | 1205 | seat_set_raw_focus(seat, &cont->node); |
1206 | seat_set_focus_container(seat, child); | 1206 | seat_set_raw_focus(seat, &child->node); |
1207 | } | 1207 | } |
1208 | 1208 | ||
1209 | return cont; | 1209 | return cont; |