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/tree/output.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/tree/output.c')
-rw-r--r-- | sway/tree/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { | |||
83 | struct sway_workspace *ws = workspace_create(output, ws_name); | 83 | struct sway_workspace *ws = workspace_create(output, ws_name); |
84 | // Set each seat's focus if not already set | 84 | // Set each seat's focus if not already set |
85 | struct sway_seat *seat = NULL; | 85 | struct sway_seat *seat = NULL; |
86 | wl_list_for_each(seat, &input_manager->seats, link) { | 86 | wl_list_for_each(seat, &server.input->seats, link) { |
87 | if (!seat->has_focus) { | 87 | if (!seat->has_focus) { |
88 | seat_set_focus_workspace(seat, ws); | 88 | seat_set_focus_workspace(seat, ws); |
89 | } | 89 | } |
@@ -97,7 +97,7 @@ void output_enable(struct sway_output *output, struct output_config *oc) { | |||
97 | } | 97 | } |
98 | wl_signal_init(&output->events.destroy); | 98 | wl_signal_init(&output->events.destroy); |
99 | 99 | ||
100 | input_manager_configure_xcursor(input_manager); | 100 | input_manager_configure_xcursor(); |
101 | 101 | ||
102 | wl_signal_add(&wlr_output->events.mode, &output->mode); | 102 | wl_signal_add(&wlr_output->events.mode, &output->mode); |
103 | wl_signal_add(&wlr_output->events.transform, &output->transform); | 103 | wl_signal_add(&wlr_output->events.transform, &output->transform); |