diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-09-15 11:15:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-15 11:15:09 -0400 |
commit | 9f985f1f1cabf65b1c8349d9320a3031f959ec5a (patch) | |
tree | a05b996b9f513e008f8879fab5604462853e156b | |
parent | Merge pull request #2630 from emersion/wlroots-1243 (diff) | |
parent | ipc: handle NULL cases for node_get_output (diff) | |
download | sway-9f985f1f1cabf65b1c8349d9320a3031f959ec5a.tar.gz sway-9f985f1f1cabf65b1c8349d9320a3031f959ec5a.tar.zst sway-9f985f1f1cabf65b1c8349d9320a3031f959ec5a.zip |
Merge pull request #2634 from ianyfan/ipc
ipc: add focus information to root node
-rw-r--r-- | sway/ipc-json.c | 19 | ||||
-rw-r--r-- | sway/tree/node.c | 6 |
2 files changed, 21 insertions, 4 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 8b786145..52278be2 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -314,9 +314,24 @@ struct focus_inactive_data { | |||
314 | static void focus_inactive_children_iterator(struct sway_node *node, | 314 | static void focus_inactive_children_iterator(struct sway_node *node, |
315 | void *_data) { | 315 | void *_data) { |
316 | struct focus_inactive_data *data = _data; | 316 | struct focus_inactive_data *data = _data; |
317 | if (node_get_parent(node) == data->node) { | 317 | json_object *focus = data->object; |
318 | json_object_array_add(data->object, json_object_new_int(node->id)); | 318 | if (data->node == &root->node) { |
319 | struct sway_output *output = node_get_output(node); | ||
320 | if (output == NULL) { | ||
321 | return; | ||
322 | } | ||
323 | size_t id = output->node.id; | ||
324 | int len = json_object_array_length(focus); | ||
325 | for (int i = 0; i < len; ++i) { | ||
326 | if ((size_t) json_object_get_int(json_object_array_get_idx(focus, i)) == id) { | ||
327 | return; | ||
328 | } | ||
329 | } | ||
330 | node = &output->node; | ||
331 | } else if (node_get_parent(node) != data->node) { | ||
332 | return; | ||
319 | } | 333 | } |
334 | json_object_array_add(focus, json_object_new_int(node->id)); | ||
320 | } | 335 | } |
321 | 336 | ||
322 | json_object *ipc_json_describe_node(struct sway_node *node) { | 337 | json_object *ipc_json_describe_node(struct sway_node *node) { |
diff --git a/sway/tree/node.c b/sway/tree/node.c index 74661c1a..dcab1c9b 100644 --- a/sway/tree/node.c +++ b/sway/tree/node.c | |||
@@ -74,8 +74,10 @@ void node_get_box(struct sway_node *node, struct wlr_box *box) { | |||
74 | 74 | ||
75 | struct sway_output *node_get_output(struct sway_node *node) { | 75 | struct sway_output *node_get_output(struct sway_node *node) { |
76 | switch (node->type) { | 76 | switch (node->type) { |
77 | case N_CONTAINER: | 77 | case N_CONTAINER: { |
78 | return node->sway_container->workspace->output; | 78 | struct sway_workspace *ws = node->sway_container->workspace; |
79 | return ws ? ws->output : NULL; | ||
80 | } | ||
79 | case N_WORKSPACE: | 81 | case N_WORKSPACE: |
80 | return node->sway_workspace->output; | 82 | return node->sway_workspace->output; |
81 | case N_OUTPUT: | 83 | case N_OUTPUT: |