diff options
author | willakat <willakat@users.noreply.github.com> | 2017-01-07 21:33:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-07 21:33:02 +0100 |
commit | 653e96f530325f76c2e63befd1f4e916a08c770f (patch) | |
tree | 16ae997cc181c0960861e4549b697fa35aed647e /sway/ipc-json.c | |
parent | Added mouse resize for auto layouts (diff) | |
parent | MIT license (diff) | |
download | sway-653e96f530325f76c2e63befd1f4e916a08c770f.tar.gz sway-653e96f530325f76c2e63befd1f4e916a08c770f.tar.zst sway-653e96f530325f76c2e63befd1f4e916a08c770f.zip |
Merge branch 'master' into master
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 fd17216e..876fc87c 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -132,7 +132,7 @@ static void ipc_json_describe_output(swayc_t *output, json_object *object) { | |||
132 | 132 | ||
133 | static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object) { | 133 | static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object) { |
134 | int num = (isdigit(workspace->name[0])) ? atoi(workspace->name) : -1; | 134 | int num = (isdigit(workspace->name[0])) ? atoi(workspace->name) : -1; |
135 | const char *layout = ipc_json_layout_description(workspace->layout); | 135 | const char *layout = ipc_json_layout_description(workspace->workspace_layout); |
136 | 136 | ||
137 | json_object_object_add(object, "num", json_object_new_int(num)); | 137 | json_object_object_add(object, "num", json_object_new_int(num)); |
138 | json_object_object_add(object, "output", (workspace->parent) ? json_object_new_string(workspace->parent->name) : NULL); | 138 | json_object_object_add(object, "output", (workspace->parent) ? json_object_new_string(workspace->parent->name) : NULL); |
@@ -173,7 +173,7 @@ static void ipc_json_describe_view(swayc_t *c, json_object *object) { | |||
173 | json_object_object_add(object, "last_split_layout", | 173 | json_object_object_add(object, "last_split_layout", |
174 | (strcmp(last_layout, "null") == 0) ? NULL : json_object_new_string(last_layout)); | 174 | (strcmp(last_layout, "null") == 0) ? NULL : json_object_new_string(last_layout)); |
175 | json_object_object_add(object, "workspace_layout", | 175 | json_object_object_add(object, "workspace_layout", |
176 | json_object_new_string(ipc_json_layout_description(swayc_parent_by_type(c, C_WORKSPACE)->layout))); | 176 | json_object_new_string(ipc_json_layout_description(swayc_parent_by_type(c, C_WORKSPACE)->workspace_layout))); |
177 | 177 | ||
178 | json_object_object_add(object, "border", json_object_new_string(ipc_json_border_description(c))); | 178 | json_object_object_add(object, "border", json_object_new_string(ipc_json_border_description(c))); |
179 | json_object_object_add(object, "current_border_width", json_object_new_int(c->border_thickness)); | 179 | json_object_object_add(object, "current_border_width", json_object_new_int(c->border_thickness)); |