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/root.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sway/tree/root.c') diff --git a/sway/tree/root.c b/sway/tree/root.c index 6748e9c9..e5eb8f2a 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -67,7 +67,7 @@ void root_scratchpad_add_container(struct sway_container *con) { container_set_floating(con, true); container_detach(con); - struct sway_seat *seat = input_manager_current_seat(input_manager); + struct sway_seat *seat = input_manager_current_seat(); if (parent) { arrange_container(parent); seat_set_focus(seat, seat_get_focus_inactive(seat, &parent->node)); @@ -89,7 +89,7 @@ void root_scratchpad_remove_container(struct sway_container *con) { } void root_scratchpad_show(struct sway_container *con) { - struct sway_seat *seat = input_manager_current_seat(input_manager); + struct sway_seat *seat = input_manager_current_seat(); struct sway_workspace *ws = seat_get_focused_workspace(seat); // If the current con or any of its parents are in fullscreen mode, we @@ -127,7 +127,7 @@ void root_scratchpad_show(struct sway_container *con) { } void root_scratchpad_hide(struct sway_container *con) { - struct sway_seat *seat = input_manager_current_seat(input_manager); + struct sway_seat *seat = input_manager_current_seat(); struct sway_node *focus = seat_get_focus(seat); struct sway_workspace *ws = con->workspace; @@ -210,7 +210,7 @@ void root_record_workspace_pid(pid_t pid) { wl_list_init(&pid_workspaces); } - struct sway_seat *seat = input_manager_current_seat(input_manager); + struct sway_seat *seat = input_manager_current_seat(); struct sway_workspace *ws = seat_get_focused_workspace(seat); if (!ws) { wlr_log(WLR_DEBUG, "Bailing out, no workspace"); -- cgit v1.2.3-54-g00ecf