diff options
| author | emersion <contact@emersion.fr> | 2018-10-20 08:42:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-20 08:42:56 +0200 |
| commit | 75ea19c71b08e4b3dd1ad053944724fd91dc04bd (patch) | |
| tree | 734b3ad6e6ef44d62ac6bbb1162a8bbb2ca28ae4 /sway/commands | |
| parent | fe6aea1d02db7e172cafdaac61d612d0de2dc9d0 (diff) | |
| parent | c006717910e5f30ca65645f701541dfa176c1392 (diff) | |
Merge pull request #2870 from RyanDwyer/refactor-input-manager
Minor refactor of input manager
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/border.c | 2 | ||||
| -rw-r--r-- | sway/commands/input.c | 2 | ||||
| -rw-r--r-- | sway/commands/move.c | 2 | ||||
| -rw-r--r-- | sway/commands/scratchpad.c | 2 | ||||
| -rw-r--r-- | sway/commands/swap.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sway/commands/border.c b/sway/commands/border.c index a50f7a1c..5b65148d 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c @@ -94,7 +94,7 @@ struct cmd_results *cmd_border(int argc, char **argv) { arrange_container(view->container); - struct sway_seat *seat = input_manager_current_seat(input_manager); + struct sway_seat *seat = input_manager_current_seat(); if (seat->cursor) { cursor_rebase(seat->cursor); } diff --git a/sway/commands/input.c b/sway/commands/input.c index 2889d47d..c50926a8 100644 --- a/sway/commands/input.c +++ b/sway/commands/input.c @@ -71,7 +71,7 @@ struct cmd_results *cmd_input(int argc, char **argv) { struct input_config *ic = store_input_config(config->handler_context.input_config); - input_manager_apply_input_config(input_manager, ic); + input_manager_apply_input_config(ic); } else { free_input_config(config->handler_context.input_config); } diff --git a/sway/commands/move.c b/sway/commands/move.c index cb7f6009..941b284a 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -103,7 +103,7 @@ static void workspace_focus_fullscreen(struct sway_workspace *workspace) { } struct sway_seat *seat; struct sway_workspace *focus_ws; - wl_list_for_each(seat, &input_manager->seats, link) { + wl_list_for_each(seat, &server.input->seats, link) { focus_ws = seat_get_focused_workspace(seat); if (focus_ws == workspace) { struct sway_node *new_focus = diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c index d8bae615..26f0e490 100644 --- a/sway/commands/scratchpad.c +++ b/sway/commands/scratchpad.c @@ -8,7 +8,7 @@ #include "sway/tree/workspace.h" static void scratchpad_toggle_auto(void) { - struct sway_seat *seat = input_manager_current_seat(input_manager); + struct sway_seat *seat = input_manager_current_seat(); struct sway_container *focus = seat_get_focused_container(seat); struct sway_workspace *ws = seat_get_focused_workspace(seat); diff --git a/sway/commands/swap.c b/sway/commands/swap.c index 8a6dfdbd..6062724d 100644 --- a/sway/commands/swap.c +++ b/sway/commands/swap.c @@ -108,7 +108,7 @@ static void container_swap(struct sway_container *con1, container_set_fullscreen(con2, false); } - struct sway_seat *seat = input_manager_get_default_seat(input_manager); + struct sway_seat *seat = input_manager_get_default_seat(); struct sway_container *focus = seat_get_focused_container(seat); struct sway_workspace *vis1 = output_get_active_workspace(con1->workspace->output); |