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/ipc-json.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/ipc-json.c')
| -rw-r--r-- | sway/ipc-json.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 7c5f7304..1b906e6f 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
| @@ -92,7 +92,7 @@ static void ipc_json_describe_output(struct sway_container *container, json_obje | |||
| 92 | const char *ws = NULL; | 92 | const char *ws = NULL; |
| 93 | if (seat) { | 93 | if (seat) { |
| 94 | struct sway_container *focus = | 94 | struct sway_container *focus = |
| 95 | sway_seat_get_focus_inactive(seat, container); | 95 | seat_get_focus_inactive(seat, container); |
| 96 | if (focus && focus->type != C_WORKSPACE) { | 96 | if (focus && focus->type != C_WORKSPACE) { |
| 97 | focus = container_parent(focus, C_WORKSPACE); | 97 | focus = container_parent(focus, C_WORKSPACE); |
| 98 | } | 98 | } |
| @@ -140,7 +140,7 @@ json_object *ipc_json_describe_container(struct sway_container *c) { | |||
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | struct sway_seat *seat = sway_input_manager_get_default_seat(input_manager); | 142 | struct sway_seat *seat = sway_input_manager_get_default_seat(input_manager); |
| 143 | bool focused = sway_seat_get_focus(seat) == c; | 143 | bool focused = seat_get_focus(seat) == c; |
| 144 | 144 | ||
| 145 | json_object *object = json_object_new_object(); | 145 | json_object *object = json_object_new_object(); |
| 146 | 146 | ||