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-json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sway/ipc-json.c') diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 54d611f2..a29647ed 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -340,7 +340,7 @@ static void focus_inactive_children_iterator(struct sway_node *node, } json_object *ipc_json_describe_node(struct sway_node *node) { - struct sway_seat *seat = input_manager_get_default_seat(input_manager); + struct sway_seat *seat = input_manager_get_default_seat(); bool focused = seat_get_focus(seat) == node; json_object *object = json_object_new_object(); -- cgit v1.2.3