aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Thomas Hebb <tommyhebb@gmail.com>2020-04-25 15:10:22 -0400
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2020-04-27 20:37:57 -0400
commitf18bcfcd69b514e1387bf37a42be6667a4c19282 (patch)
treee073a8682121a1f225bfa2ab4059d85620a82bff
parentman: add note about sway-input and sway-output pages (diff)
downloadsway-f18bcfcd69b514e1387bf37a42be6667a4c19282.tar.gz
sway-f18bcfcd69b514e1387bf37a42be6667a4c19282.tar.zst
sway-f18bcfcd69b514e1387bf37a42be6667a4c19282.zip
Add each view's shell to JSON description
This is a criteria you can use to select windows since commit 484cc189e909 ("Add shell criteria token"), but there's no way to query it for an existing window. This exposes its value in the output of `swaymsg -t get_tree`.
-rw-r--r--sway/ipc-json.c2
-rw-r--r--sway/sway-ipc.7.scd5
2 files changed, 7 insertions, 0 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 1ebc3bd2..46c52156 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -493,6 +493,8 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
493 493
494 json_object_object_add(object, "max_render_time", json_object_new_int(c->view->max_render_time)); 494 json_object_object_add(object, "max_render_time", json_object_new_int(c->view->max_render_time));
495 495
496 json_object_object_add(object, "shell", json_object_new_string(view_get_shell(c->view)));
497
496#if HAVE_XWAYLAND 498#if HAVE_XWAYLAND
497 if (c->view->type == SWAY_VIEW_XWAYLAND) { 499 if (c->view->type == SWAY_VIEW_XWAYLAND) {
498 json_object_object_add(object, "window", 500 json_object_object_add(object, "window",
diff --git a/sway/sway-ipc.7.scd b/sway/sway-ipc.7.scd
index ab61f864..5cef0bb4 100644
--- a/sway/sway-ipc.7.scd
+++ b/sway/sway-ipc.7.scd
@@ -376,6 +376,9 @@ node and will have the following properties:
376|- visible 376|- visible
377: boolean 377: boolean
378: (Only views) Whether the node is visible 378: (Only views) Whether the node is visible
379|- shell
380: string
381: (Only views) The shell of the view, such as _xdg\_shell_ or _xwayland_
379|- window 382|- window
380: integer 383: integer
381: (Only xwayland views) The X11 window ID for the xwayland view 384: (Only xwayland views) The X11 window ID for the xwayland view
@@ -672,6 +675,7 @@ node and will have the following properties:
672 "pid": 23959, 675 "pid": 23959,
673 "app_id": null, 676 "app_id": null,
674 "visible": true, 677 "visible": true,
678 "shell": "xwayland",
675 "window_properties": { 679 "window_properties": {
676 "class": "URxvt", 680 "class": "URxvt",
677 "instance": "urxvt", 681 "instance": "urxvt",
@@ -726,6 +730,7 @@ node and will have the following properties:
726 "pid": 25370, 730 "pid": 25370,
727 "app_id": "termite", 731 "app_id": "termite",
728 "visible": true, 732 "visible": true,
733 "shell": "xdg_shell",
729 "nodes": [ 734 "nodes": [
730 ] 735 ]
731 } 736 }