summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2016-08-04 21:34:39 -0400
committerLibravatar GitHub <noreply@github.com>2016-08-04 21:34:39 -0400
commit91709bd12a88f668ce9a160e5dbecbbd77cef4bb (patch)
treeeca4640af5336685d59c5f3f340a9eaa95a83d7a
parentMerge pull request #835 from acrisci/feature/ipc-view-include-nodes (diff)
parentipc: recursive workspace containers in event (diff)
downloadsway-91709bd12a88f668ce9a160e5dbecbbd77cef4bb.tar.gz
sway-91709bd12a88f668ce9a160e5dbecbbd77cef4bb.tar.zst
sway-91709bd12a88f668ce9a160e5dbecbbd77cef4bb.zip
Merge pull request #836 from acrisci/feature/ipc-recursive-workspace
ipc: recursive workspace containers in event
-rw-r--r--sway/ipc-server.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 326b309f..c189bc0f 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -543,14 +543,14 @@ void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change) {
543 json_object_object_add(obj, "change", json_object_new_string(change)); 543 json_object_object_add(obj, "change", json_object_new_string(change));
544 if (strcmp("focus", change) == 0) { 544 if (strcmp("focus", change) == 0) {
545 if (old) { 545 if (old) {
546 json_object_object_add(obj, "old", ipc_json_describe_container(old)); 546 json_object_object_add(obj, "old", ipc_json_describe_container_recursive(old));
547 } else { 547 } else {
548 json_object_object_add(obj, "old", NULL); 548 json_object_object_add(obj, "old", NULL);
549 } 549 }
550 } 550 }
551 551
552 if (new) { 552 if (new) {
553 json_object_object_add(obj, "current", ipc_json_describe_container(new)); 553 json_object_object_add(obj, "current", ipc_json_describe_container_recursive(new));
554 } else { 554 } else {
555 json_object_object_add(obj, "current", NULL); 555 json_object_object_add(obj, "current", NULL);
556 } 556 }