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/tree/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/tree/output.c') diff --git a/sway/tree/output.c b/sway/tree/output.c index c3176325..524a64ab 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c @@ -83,7 +83,7 @@ void output_enable(struct sway_output *output, struct output_config *oc) { struct sway_workspace *ws = workspace_create(output, ws_name); // Set each seat's focus if not already set struct sway_seat *seat = NULL; - wl_list_for_each(seat, &input_manager->seats, link) { + wl_list_for_each(seat, &server.input->seats, link) { if (!seat->has_focus) { seat_set_focus_workspace(seat, ws); } @@ -97,7 +97,7 @@ void output_enable(struct sway_output *output, struct output_config *oc) { } wl_signal_init(&output->events.destroy); - input_manager_configure_xcursor(input_manager); + input_manager_configure_xcursor(); wl_signal_add(&wlr_output->events.mode, &output->mode); wl_signal_add(&wlr_output->events.transform, &output->transform); -- cgit v1.2.3-54-g00ecf