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/server.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/server.c')
-rw-r--r-- | sway/server.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/server.c b/sway/server.c index 1fd7b7fa..23d42028 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -153,7 +153,9 @@ bool server_init(struct sway_server *server) { | |||
153 | server->dirty_nodes = create_list(); | 153 | server->dirty_nodes = create_list(); |
154 | server->transactions = create_list(); | 154 | server->transactions = create_list(); |
155 | 155 | ||
156 | input_manager = input_manager_create(server); | 156 | server->input = input_manager_create(server); |
157 | input_manager_get_default_seat(); // create seat0 | ||
158 | |||
157 | return true; | 159 | return true; |
158 | } | 160 | } |
159 | 161 | ||