diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-07-23 20:27:56 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2018-07-23 20:31:11 -0400 |
| commit | f4b882475eee7a81c206c7825616cc4656b2f60b (patch) | |
| tree | 38e6ebf81b235424f105dcbcbb194e5e9eac70c0 /sway/ipc-json.c | |
| parent | acd79e1505c06089e4fb9fb6c0c6e1d351ba9176 (diff) | |
| parent | 224ade138208e9aa525423cbfbd643aa9d9b63c3 (diff) | |
| download | sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.xz | |
Merge branch 'master' into pid-workspaces
Diffstat (limited to 'sway/ipc-json.c')
| -rw-r--r-- | sway/ipc-json.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index b9289e25..c49ea47e 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -2,6 +2,7 @@ #include <stdio.h> #include <ctype.h> #include "log.h" +#include "sway/config.h" #include "sway/ipc-json.h" #include "sway/tree/container.h" #include "sway/tree/workspace.h" @@ -41,6 +42,7 @@ json_object *ipc_json_get_version() { json_object_object_add(version, "major", json_object_new_int(major)); json_object_object_add(version, "minor", json_object_new_int(minor)); json_object_object_add(version, "patch", json_object_new_int(patch)); + json_object_object_add(version, "loaded_config_file_name", json_object_new_string(config->current_config_path)); return version; } @@ -168,7 +170,8 @@ static void ipc_json_describe_workspace(struct sway_container *workspace, json_object_object_add(object, "output", workspace->parent ? json_object_new_string(workspace->parent->name) : NULL); json_object_object_add(object, "type", json_object_new_string("workspace")); - json_object_object_add(object, "urgent", json_object_new_boolean(false)); + json_object_object_add(object, "urgent", + json_object_new_boolean(workspace->sway_workspace->urgent)); json_object_object_add(object, "representation", workspace->formatted_title ? json_object_new_string(workspace->formatted_title) : NULL); @@ -194,6 +197,10 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object json_object_object_add(object, "layout", json_object_new_string(ipc_json_layout_description(c->layout))); } + + bool urgent = c->type == C_VIEW ? + view_is_urgent(c->sway_view) : container_has_urgent_child(c); + json_object_object_add(object, "urgent", json_object_new_boolean(urgent)); } static void focus_inactive_children_iterator(struct sway_container *c, void *data) { |