diff options
| author | emersion <contact@emersion.fr> | 2018-04-02 15:30:58 -0400 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-04-02 15:30:58 -0400 |
| commit | a4a241697ae591289d7c14eff972e1ef787216e2 (patch) | |
| tree | d82d3c3eba2946670aa634a62d03feb7102f0bf8 /sway/ipc-json.c | |
| parent | 2f64ce86c47efb2ee4c0e3a3c2b31307d21404d9 (diff) | |
| parent | 0c0cc79282b5ce29616893977aca629f90521988 (diff) | |
| download | sway-a4a241697ae591289d7c14eff972e1ef787216e2.tar.xz | |
Merge branch 'wlroots' into view-redesign
Diffstat (limited to 'sway/ipc-json.c')
| -rw-r--r-- | sway/ipc-json.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 7c5f7304..3427c8ec 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -88,11 +88,11 @@ static void ipc_json_describe_output(struct sway_container *container, json_obje json_object_new_string( ipc_json_get_output_transform(wlr_output->transform))); - struct sway_seat *seat = sway_input_manager_get_default_seat(input_manager); + struct sway_seat *seat = input_manager_get_default_seat(input_manager); const char *ws = NULL; if (seat) { struct sway_container *focus = - sway_seat_get_focus_inactive(seat, container); + seat_get_focus_inactive(seat, container); if (focus && focus->type != C_WORKSPACE) { focus = container_parent(focus, C_WORKSPACE); } @@ -139,8 +139,8 @@ json_object *ipc_json_describe_container(struct sway_container *c) { return NULL; } - struct sway_seat *seat = sway_input_manager_get_default_seat(input_manager); - bool focused = sway_seat_get_focus(seat) == c; + struct sway_seat *seat = input_manager_get_default_seat(input_manager); + bool focused = seat_get_focus(seat) == c; json_object *object = json_object_new_object(); |