diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-18 21:20:00 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-20 13:11:43 +1000 |
commit | c006717910e5f30ca65645f701541dfa176c1392 (patch) | |
tree | c64452b7f2fe6ab481ad90c424cb14bcb0328eda /sway/ipc-server.c | |
parent | Merge pull request #2872 from RyanDwyer/cursor-rebase (diff) | |
download | sway-c006717910e5f30ca65645f701541dfa176c1392.tar.gz sway-c006717910e5f30ca65645f701541dfa176c1392.tar.zst sway-c006717910e5f30ca65645f701541dfa176c1392.zip |
Minor refactor of input manager
The input manager is a singleton object. Passing the sway_input_manager
argument to each of its functions is unnecessary, while removing the
argument makes it obvious to the caller that it's a singleton. This
patch removes the argument and makes the input manager use server.input
instead.
On a similar note:
* sway_input_manager.server is removed in favour of using the server
global.
* seat.input is removed because it can get it from server.input.
Due to a circular dependency, creating seat0 is now done directly in
server_init rather than in input_manager_create. This is because
creating seats must be done after server.input is set.
Lastly, it now stores the default seat name using a constant and removes
a second reference to seat0 (in input_manager_get_default_seat).
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, | |||
547 | json_object *workspace_json = ipc_json_describe_node(&workspace->node); | 547 | json_object *workspace_json = ipc_json_describe_node(&workspace->node); |
548 | // override the default focused indicator because | 548 | // override the default focused indicator because |
549 | // it's set differently for the get_workspaces reply | 549 | // it's set differently for the get_workspaces reply |
550 | struct sway_seat *seat = input_manager_get_default_seat(input_manager); | 550 | struct sway_seat *seat = input_manager_get_default_seat(); |
551 | struct sway_workspace *focused_ws = seat_get_focused_workspace(seat); | 551 | struct sway_workspace *focused_ws = seat_get_focused_workspace(seat); |
552 | bool focused = workspace == focused_ws; | 552 | bool focused = workspace == focused_ws; |
553 | json_object_object_del(workspace_json, "focused"); | 553 | json_object_object_del(workspace_json, "focused"); |
@@ -702,7 +702,7 @@ void ipc_client_handle_command(struct ipc_client *client) { | |||
702 | { | 702 | { |
703 | json_object *inputs = json_object_new_array(); | 703 | json_object *inputs = json_object_new_array(); |
704 | struct sway_input_device *device = NULL; | 704 | struct sway_input_device *device = NULL; |
705 | wl_list_for_each(device, &input_manager->devices, link) { | 705 | wl_list_for_each(device, &server.input->devices, link) { |
706 | json_object_array_add(inputs, ipc_json_describe_input(device)); | 706 | json_object_array_add(inputs, ipc_json_describe_input(device)); |
707 | } | 707 | } |
708 | const char *json_string = json_object_to_json_string(inputs); | 708 | const char *json_string = json_object_to_json_string(inputs); |
@@ -716,7 +716,7 @@ void ipc_client_handle_command(struct ipc_client *client) { | |||
716 | { | 716 | { |
717 | json_object *seats = json_object_new_array(); | 717 | json_object *seats = json_object_new_array(); |
718 | struct sway_seat *seat = NULL; | 718 | struct sway_seat *seat = NULL; |
719 | wl_list_for_each(seat, &input_manager->seats, link) { | 719 | wl_list_for_each(seat, &server.input->seats, link) { |
720 | json_object_array_add(seats, ipc_json_describe_seat(seat)); | 720 | json_object_array_add(seats, ipc_json_describe_seat(seat)); |
721 | } | 721 | } |
722 | const char *json_string = json_object_to_json_string(seats); | 722 | const char *json_string = json_object_to_json_string(seats); |