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/commands/input.c | |
| parent | 5b8257b88f703f48466f3b917f1ceaee7c457355 (diff) | |
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/commands/input.c')
| -rw-r--r-- | sway/commands/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/input.c b/sway/commands/input.c index 2889d47d..c50926a8 100644 --- a/sway/commands/input.c +++ b/sway/commands/input.c @@ -71,7 +71,7 @@ struct cmd_results *cmd_input(int argc, char **argv) { struct input_config *ic = store_input_config(config->handler_context.input_config); - input_manager_apply_input_config(input_manager, ic); + input_manager_apply_input_config(ic); } else { free_input_config(config->handler_context.input_config); } |