aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/workspace.c
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-10-20 08:42:56 +0200
committerLibravatar GitHub <noreply@github.com>2018-10-20 08:42:56 +0200
commit75ea19c71b08e4b3dd1ad053944724fd91dc04bd (patch)
tree734b3ad6e6ef44d62ac6bbb1162a8bbb2ca28ae4 /sway/tree/workspace.c
parentMerge pull request #2886 from RyanDwyer/fix-headless-unmap-crash (diff)
parentMinor refactor of input manager (diff)
downloadsway-75ea19c71b08e4b3dd1ad053944724fd91dc04bd.tar.gz
sway-75ea19c71b08e4b3dd1ad053944724fd91dc04bd.tar.zst
sway-75ea19c71b08e4b3dd1ad053944724fd91dc04bd.zip
Merge pull request #2870 from RyanDwyer/refactor-input-manager
Minor refactor of input manager
Diffstat (limited to 'sway/tree/workspace.c')
-rw-r--r--sway/tree/workspace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index ed875ebb..fff16515 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}
@@ -295,7 +295,7 @@ static bool _workspace_by_name(struct sway_workspace *ws, void *data) {
295} 295}
296 296
297struct sway_workspace *workspace_by_name(const char *name) { 297struct sway_workspace *workspace_by_name(const char *name) {
298 struct sway_seat *seat = input_manager_current_seat(input_manager); 298 struct sway_seat *seat = input_manager_current_seat();
299 struct sway_workspace *current = seat_get_focused_workspace(seat); 299 struct sway_workspace *current = seat_get_focused_workspace(seat);
300 300
301 if (strcmp(name, "prev") == 0) { 301 if (strcmp(name, "prev") == 0) {
@@ -324,7 +324,7 @@ struct sway_workspace *workspace_by_name(const char *name) {
324 */ 324 */
325static struct sway_workspace *workspace_output_prev_next_impl( 325static struct sway_workspace *workspace_output_prev_next_impl(
326 struct sway_output *output, int dir) { 326 struct sway_output *output, int dir) {
327 struct sway_seat *seat = input_manager_current_seat(input_manager); 327 struct sway_seat *seat = input_manager_current_seat();
328 struct sway_workspace *workspace = seat_get_focused_workspace(seat); 328 struct sway_workspace *workspace = seat_get_focused_workspace(seat);
329 329
330 int index = list_find(output->workspaces, workspace); 330 int index = list_find(output->workspaces, workspace);
@@ -376,7 +376,7 @@ struct sway_workspace *workspace_prev(struct sway_workspace *current) {
376 376
377bool workspace_switch(struct sway_workspace *workspace, 377bool workspace_switch(struct sway_workspace *workspace,
378 bool no_auto_back_and_forth) { 378 bool no_auto_back_and_forth) {
379 struct sway_seat *seat = input_manager_current_seat(input_manager); 379 struct sway_seat *seat = input_manager_current_seat();
380 struct sway_workspace *active_ws = seat_get_focused_workspace(seat); 380 struct sway_workspace *active_ws = seat_get_focused_workspace(seat);
381 381
382 if (!no_auto_back_and_forth && config->auto_back_and_forth 382 if (!no_auto_back_and_forth && config->auto_back_and_forth
@@ -627,7 +627,7 @@ void workspace_add_gaps(struct sway_workspace *ws) {
627 return; 627 return;
628 } 628 }
629 if (config->smart_gaps) { 629 if (config->smart_gaps) {
630 struct sway_seat *seat = input_manager_get_default_seat(input_manager); 630 struct sway_seat *seat = input_manager_get_default_seat();
631 struct sway_container *focus = 631 struct sway_container *focus =
632 seat_get_focus_inactive_tiling(seat, ws); 632 seat_get_focus_inactive_tiling(seat, ws);
633 if (focus && !focus->view) { 633 if (focus && !focus->view) {