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/workspace.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/workspace.c')
-rw-r--r-- | sway/tree/workspace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 2a00824d..e840219f 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c | |||
@@ -40,7 +40,7 @@ struct sway_output *workspace_get_initial_output(const char *name) { | |||
40 | } | 40 | } |
41 | } | 41 | } |
42 | // Otherwise put it on the focused output | 42 | // Otherwise put it on the focused output |
43 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 43 | struct sway_seat *seat = input_manager_current_seat(); |
44 | struct sway_workspace *focus = seat_get_focused_workspace(seat); | 44 | struct sway_workspace *focus = seat_get_focused_workspace(seat); |
45 | return focus->output; | 45 | return focus->output; |
46 | } | 46 | } |
@@ -287,7 +287,7 @@ static bool _workspace_by_name(struct sway_workspace *ws, void *data) { | |||
287 | } | 287 | } |
288 | 288 | ||
289 | struct sway_workspace *workspace_by_name(const char *name) { | 289 | struct sway_workspace *workspace_by_name(const char *name) { |
290 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 290 | struct sway_seat *seat = input_manager_current_seat(); |
291 | struct sway_workspace *current = seat_get_focused_workspace(seat); | 291 | struct sway_workspace *current = seat_get_focused_workspace(seat); |
292 | 292 | ||
293 | if (strcmp(name, "prev") == 0) { | 293 | if (strcmp(name, "prev") == 0) { |
@@ -316,7 +316,7 @@ struct sway_workspace *workspace_by_name(const char *name) { | |||
316 | */ | 316 | */ |
317 | static struct sway_workspace *workspace_output_prev_next_impl( | 317 | static struct sway_workspace *workspace_output_prev_next_impl( |
318 | struct sway_output *output, int dir) { | 318 | struct sway_output *output, int dir) { |
319 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 319 | struct sway_seat *seat = input_manager_current_seat(); |
320 | struct sway_workspace *workspace = seat_get_focused_workspace(seat); | 320 | struct sway_workspace *workspace = seat_get_focused_workspace(seat); |
321 | 321 | ||
322 | int index = list_find(output->workspaces, workspace); | 322 | int index = list_find(output->workspaces, workspace); |
@@ -368,7 +368,7 @@ struct sway_workspace *workspace_prev(struct sway_workspace *current) { | |||
368 | 368 | ||
369 | bool workspace_switch(struct sway_workspace *workspace, | 369 | bool workspace_switch(struct sway_workspace *workspace, |
370 | bool no_auto_back_and_forth) { | 370 | bool no_auto_back_and_forth) { |
371 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 371 | struct sway_seat *seat = input_manager_current_seat(); |
372 | struct sway_workspace *active_ws = seat_get_focused_workspace(seat); | 372 | struct sway_workspace *active_ws = seat_get_focused_workspace(seat); |
373 | 373 | ||
374 | if (!no_auto_back_and_forth && config->auto_back_and_forth | 374 | if (!no_auto_back_and_forth && config->auto_back_and_forth |
@@ -619,7 +619,7 @@ void workspace_add_gaps(struct sway_workspace *ws) { | |||
619 | return; | 619 | return; |
620 | } | 620 | } |
621 | if (config->smart_gaps) { | 621 | if (config->smart_gaps) { |
622 | struct sway_seat *seat = input_manager_get_default_seat(input_manager); | 622 | struct sway_seat *seat = input_manager_get_default_seat(); |
623 | struct sway_container *focus = | 623 | struct sway_container *focus = |
624 | seat_get_focus_inactive_tiling(seat, ws); | 624 | seat_get_focus_inactive_tiling(seat, ws); |
625 | if (focus && !focus->view) { | 625 | if (focus && !focus->view) { |