aboutsummaryrefslogtreecommitdiffstats
path: root/sway/ipc-json.c
diff options
context:
space:
mode:
authorLibravatar Hummer12007 <hilobakho@gmail.com>2017-01-06 01:28:36 +0200
committerLibravatar GitHub <noreply@github.com>2017-01-06 01:28:36 +0200
commitd59af31256363c38f260fd69ec40c209ff632c10 (patch)
treed45e63d0bcf32ce26176f2926bf8fc6b4e66d654 /sway/ipc-json.c
parentMerge pull request #1029 from 4e554c4c/master (diff)
downloadsway-d59af31256363c38f260fd69ec40c209ff632c10.tar.gz
sway-d59af31256363c38f260fd69ec40c209ff632c10.tar.zst
sway-d59af31256363c38f260fd69ec40c209ff632c10.zip
Fix workspace layouts in json data
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r--sway/ipc-json.c4
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
133static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object) { 133static 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));