diff options
| author | Ryan Dwyer <[email protected]> | 2018-10-18 21:20:00 +1000 |
|---|---|---|
| committer | Ryan Dwyer <[email protected]> | 2018-10-20 13:11:43 +1000 |
| commit | c006717910e5f30ca65645f701541dfa176c1392 (patch) | |
| tree | c64452b7f2fe6ab481ad90c424cb14bcb0328eda /sway/config.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/config.c')
| -rw-r--r-- | sway/config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/config.c b/sway/config.c index 89b89464..f683e7ab 100644 --- a/sway/config.c +++ b/sway/config.c @@ -151,8 +151,7 @@ static void destroy_removed_seats(struct sway_config *old_config, /* Also destroy seats that aren't present in new config */ if (new_config && list_seq_find(new_config->seat_configs, seat_name_cmp, seat_config->name) < 0) { - seat = input_manager_get_seat(input_manager, - seat_config->name); + seat = input_manager_get_seat(seat_config->name); seat_destroy(seat); } } |