mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-27 02:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

consolidate nodes json

Browse source
This commit is contained in:
Zandr Martin 2016-10-02 22:21:16 -05:00
parent 04db58863e
commit ba581c4442
No known key found for this signature in database
GPG key ID: AA2BB8EF77F7BBDC
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/ipc-json.c
View file

@ -199,8 +199,6 @@ static void ipc_json_describe_view(swayc_t *c, json_object *object) {
c->is_floating ? "auto_on" : "auto_off")); // we can't state the cause c->is_floating ? "auto_on" : "auto_off")); // we can't state the cause
json_object_object_add(object, "app_id", c->app_id ? json_object_new_string(c->app_id) : NULL); json_object_object_add(object, "app_id", c->app_id ? json_object_new_string(c->app_id) : NULL);
json_object_object_add(object, "nodes", json_object_new_array());
json_object_object_add(object, "floating_nodes", json_object_new_array());
} }
json_object *ipc_json_describe_container(swayc_t *c) { json_object *ipc_json_describe_container(swayc_t *c) {
@ -354,9 +352,8 @@ json_object *ipc_json_describe_container_recursive(swayc_t *c) {
json_object *object = ipc_json_describe_container(c); json_object *object = ipc_json_describe_container(c);
int i; int i;
if (c->type != C_VIEW) {
json_object *floating = json_object_new_array(); json_object *floating = json_object_new_array();
if (c->floating && c->floating->length > 0) { if (c->type != C_VIEW && c->floating && c->floating->length > 0) {
for (i = 0; i < c->floating->length; ++i) { for (i = 0; i < c->floating->length; ++i) {
json_object_array_add(floating, ipc_json_describe_container_recursive(c->floating->items[i])); json_object_array_add(floating, ipc_json_describe_container_recursive(c->floating->items[i]));
} }
@ -364,13 +361,12 @@ json_object *ipc_json_describe_container_recursive(swayc_t *c) {
json_object_object_add(object, "floating_nodes", floating); json_object_object_add(object, "floating_nodes", floating);
json_object *children = json_object_new_array(); json_object *children = json_object_new_array();
if (c->children && c->children->length > 0) { if (c->type != C_VIEW && c->children && c->children->length > 0) {
for (i = 0; i < c->children->length; ++i) { for (i = 0; i < c->children->length; ++i) {
json_object_array_add(children, ipc_json_describe_container_recursive(c->children->items[i])); json_object_array_add(children, ipc_json_describe_container_recursive(c->children->items[i]));
} }
} }
json_object_object_add(object, "nodes", children); json_object_object_add(object, "nodes", children);
}
if (c->type == C_ROOT) { if (c->type == C_ROOT) {
json_object *scratchpad_json = json_object_new_array(); json_object *scratchpad_json = json_object_new_array();