diff options
author | Tony Crisci <tony@dubstepdish.com> | 2018-04-02 08:45:37 -0400 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2018-04-02 08:45:37 -0400 |
commit | e677c5b204971af00d71f9a50a89206d01b46a36 (patch) | |
tree | fa94a13e95119bdd3083fb7839889f2ce3a0fca0 /sway/tree/layout.c | |
parent | Merge pull request #1684 from swaywm/follow-warp (diff) | |
download | sway-e677c5b204971af00d71f9a50a89206d01b46a36.tar.gz sway-e677c5b204971af00d71f9a50a89206d01b46a36.tar.zst sway-e677c5b204971af00d71f9a50a89206d01b46a36.zip |
rename seat functions
Diffstat (limited to 'sway/tree/layout.c')
-rw-r--r-- | sway/tree/layout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index ce0682dc..0a766b22 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c | |||
@@ -404,7 +404,7 @@ static struct sway_container *get_swayc_in_output_direction( | |||
404 | return NULL; | 404 | return NULL; |
405 | } | 405 | } |
406 | 406 | ||
407 | struct sway_container *ws = sway_seat_get_focus_inactive(seat, output); | 407 | struct sway_container *ws = seat_get_focus_inactive(seat, output); |
408 | if (ws->type != C_WORKSPACE) { | 408 | if (ws->type != C_WORKSPACE) { |
409 | ws = container_parent(ws, C_WORKSPACE); | 409 | ws = container_parent(ws, C_WORKSPACE); |
410 | } | 410 | } |
@@ -425,7 +425,7 @@ static struct sway_container *get_swayc_in_output_direction( | |||
425 | case MOVE_UP: | 425 | case MOVE_UP: |
426 | case MOVE_DOWN: { | 426 | case MOVE_DOWN: { |
427 | struct sway_container *focused = | 427 | struct sway_container *focused = |
428 | sway_seat_get_focus_inactive(seat, ws); | 428 | seat_get_focus_inactive(seat, ws); |
429 | if (focused && focused->parent) { | 429 | if (focused && focused->parent) { |
430 | struct sway_container *parent = focused->parent; | 430 | struct sway_container *parent = focused->parent; |
431 | if (parent->layout == L_VERT) { | 431 | if (parent->layout == L_VERT) { |
@@ -509,7 +509,7 @@ static struct sway_container *get_swayc_in_direction_under( | |||
509 | struct sway_container *container, enum movement_direction dir, | 509 | struct sway_container *container, enum movement_direction dir, |
510 | struct sway_seat *seat, struct sway_container *limit) { | 510 | struct sway_seat *seat, struct sway_container *limit) { |
511 | if (dir == MOVE_CHILD) { | 511 | if (dir == MOVE_CHILD) { |
512 | return sway_seat_get_focus_inactive(seat, container); | 512 | return seat_get_focus_inactive(seat, container); |
513 | } | 513 | } |
514 | 514 | ||
515 | struct sway_container *parent = container->parent; | 515 | struct sway_container *parent = container->parent; |
@@ -589,7 +589,7 @@ static struct sway_container *get_swayc_in_direction_under( | |||
589 | } | 589 | } |
590 | if (next->children && next->children->length) { | 590 | if (next->children && next->children->length) { |
591 | // TODO consider floating children as well | 591 | // TODO consider floating children as well |
592 | return sway_seat_get_focus_inactive(seat, next); | 592 | return seat_get_focus_inactive(seat, next); |
593 | } else { | 593 | } else { |
594 | return next; | 594 | return next; |
595 | } | 595 | } |