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/scratchpad.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/commands/scratchpad.c')
-rw-r--r-- | sway/commands/scratchpad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c index d8bae615..26f0e490 100644 --- a/sway/commands/scratchpad.c +++ b/sway/commands/scratchpad.c | |||
@@ -8,7 +8,7 @@ | |||
8 | #include "sway/tree/workspace.h" | 8 | #include "sway/tree/workspace.h" |
9 | 9 | ||
10 | static void scratchpad_toggle_auto(void) { | 10 | static void scratchpad_toggle_auto(void) { |
11 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 11 | struct sway_seat *seat = input_manager_current_seat(); |
12 | struct sway_container *focus = seat_get_focused_container(seat); | 12 | struct sway_container *focus = seat_get_focused_container(seat); |
13 | struct sway_workspace *ws = seat_get_focused_workspace(seat); | 13 | struct sway_workspace *ws = seat_get_focused_workspace(seat); |
14 | 14 | ||