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 /sway/tree | |
| 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
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/node.c | 6 |
1 files changed, 4 insertions, 2 deletions
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: |