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/criteria.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/criteria.c')
-rw-r--r-- | sway/criteria.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/criteria.c b/sway/criteria.c index 575e8bcf..e00d638c 100644 --- a/sway/criteria.c +++ b/sway/criteria.c | |||
@@ -356,7 +356,7 @@ static enum criteria_token token_from_name(char *name) { | |||
356 | * criteria is only executed once per view. | 356 | * criteria is only executed once per view. |
357 | */ | 357 | */ |
358 | static char *get_focused_prop(enum criteria_token token) { | 358 | static char *get_focused_prop(enum criteria_token token) { |
359 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 359 | struct sway_seat *seat = input_manager_current_seat(); |
360 | struct sway_container *focus = seat_get_focused_container(seat); | 360 | struct sway_container *focus = seat_get_focused_container(seat); |
361 | 361 | ||
362 | if (!focus || !focus->view) { | 362 | if (!focus || !focus->view) { |