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/tree/root.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/tree/root.c')
-rw-r--r-- | sway/tree/root.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/tree/root.c b/sway/tree/root.c index 6748e9c9..e5eb8f2a 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c | |||
@@ -67,7 +67,7 @@ void root_scratchpad_add_container(struct sway_container *con) { | |||
67 | container_set_floating(con, true); | 67 | container_set_floating(con, true); |
68 | container_detach(con); | 68 | container_detach(con); |
69 | 69 | ||
70 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 70 | struct sway_seat *seat = input_manager_current_seat(); |
71 | if (parent) { | 71 | if (parent) { |
72 | arrange_container(parent); | 72 | arrange_container(parent); |
73 | seat_set_focus(seat, seat_get_focus_inactive(seat, &parent->node)); | 73 | seat_set_focus(seat, seat_get_focus_inactive(seat, &parent->node)); |
@@ -89,7 +89,7 @@ void root_scratchpad_remove_container(struct sway_container *con) { | |||
89 | } | 89 | } |
90 | 90 | ||
91 | void root_scratchpad_show(struct sway_container *con) { | 91 | void root_scratchpad_show(struct sway_container *con) { |
92 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 92 | struct sway_seat *seat = input_manager_current_seat(); |
93 | struct sway_workspace *ws = seat_get_focused_workspace(seat); | 93 | struct sway_workspace *ws = seat_get_focused_workspace(seat); |
94 | 94 | ||
95 | // If the current con or any of its parents are in fullscreen mode, we | 95 | // If the current con or any of its parents are in fullscreen mode, we |
@@ -127,7 +127,7 @@ void root_scratchpad_show(struct sway_container *con) { | |||
127 | } | 127 | } |
128 | 128 | ||
129 | void root_scratchpad_hide(struct sway_container *con) { | 129 | void root_scratchpad_hide(struct sway_container *con) { |
130 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 130 | struct sway_seat *seat = input_manager_current_seat(); |
131 | struct sway_node *focus = seat_get_focus(seat); | 131 | struct sway_node *focus = seat_get_focus(seat); |
132 | struct sway_workspace *ws = con->workspace; | 132 | struct sway_workspace *ws = con->workspace; |
133 | 133 | ||
@@ -210,7 +210,7 @@ void root_record_workspace_pid(pid_t pid) { | |||
210 | wl_list_init(&pid_workspaces); | 210 | wl_list_init(&pid_workspaces); |
211 | } | 211 | } |
212 | 212 | ||
213 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 213 | struct sway_seat *seat = input_manager_current_seat(); |
214 | struct sway_workspace *ws = seat_get_focused_workspace(seat); | 214 | struct sway_workspace *ws = seat_get_focused_workspace(seat); |
215 | if (!ws) { | 215 | if (!ws) { |
216 | wlr_log(WLR_DEBUG, "Bailing out, no workspace"); | 216 | wlr_log(WLR_DEBUG, "Bailing out, no workspace"); |