From c006717910e5f30ca65645f701541dfa176c1392 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 18 Oct 2018 21:20:00 +1000 Subject: 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). --- sway/ipc-server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sway/ipc-server.c') 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); -- cgit v1.2.3-54-g00ecf