From e75217cfb1a9f098504782c7483c54c9f33196fa Mon Sep 17 00:00:00 2001 From: Zandr Martin Date: Sat, 17 Sep 2016 22:00:11 -0500 Subject: fix get_workspaces json reply --- sway/ipc-server.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 70007f57..4c54e56a 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -512,7 +512,13 @@ bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t pay void ipc_get_workspaces_callback(swayc_t *workspace, void *data) { if (workspace->type == C_WORKSPACE) { - json_object_array_add((json_object *)data, ipc_json_describe_container(workspace)); + json_object *workspace_json = ipc_json_describe_container(workspace); + // override the default focused indicator because + // it's set differently for the get_workspaces reply + bool focused = root_container.focused == workspace->parent && workspace->parent->focused == workspace; + json_object_object_del(workspace_json, "focused"); + json_object_object_add(workspace_json, "focused", json_object_new_boolean(focused)); + json_object_array_add((json_object *)data, workspace_json); } } -- cgit v1.2.3-54-g00ecf