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/ipc-server.c | |
| parent | fe6aea1d02db7e172cafdaac61d612d0de2dc9d0 (diff) | |
| parent | c006717910e5f30ca65645f701541dfa176c1392 (diff) | |
Merge pull request #2870 from RyanDwyer/refactor-input-manager
Minor refactor of input manager
Diffstat (limited to 'sway/ipc-server.c')
| -rw-r--r-- | sway/ipc-server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 63c95503..619d2aef 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -547,7 +547,7 @@ static void ipc_get_workspaces_callback(struct sway_workspace *workspace, json_object *workspace_json = ipc_json_describe_node(&workspace->node); // override the default focused indicator because // it's set differently for the get_workspaces reply - struct sway_seat *seat = input_manager_get_default_seat(input_manager); + struct sway_seat *seat = input_manager_get_default_seat(); struct sway_workspace *focused_ws = seat_get_focused_workspace(seat); bool focused = workspace == focused_ws; json_object_object_del(workspace_json, "focused"); @@ -702,7 +702,7 @@ void ipc_client_handle_command(struct ipc_client *client) { { json_object *inputs = json_object_new_array(); struct sway_input_device *device = NULL; - wl_list_for_each(device, &input_manager->devices, link) { + wl_list_for_each(device, &server.input->devices, link) { json_object_array_add(inputs, ipc_json_describe_input(device)); } const char *json_string = json_object_to_json_string(inputs); @@ -716,7 +716,7 @@ void ipc_client_handle_command(struct ipc_client *client) { { json_object *seats = json_object_new_array(); struct sway_seat *seat = NULL; - wl_list_for_each(seat, &input_manager->seats, link) { + wl_list_for_each(seat, &server.input->seats, link) { json_object_array_add(seats, ipc_json_describe_seat(seat)); } const char *json_string = json_object_to_json_string(seats); |