diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-09-21 20:05:39 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 20:05:39 +1000 |
| commit | 0798fadff2f2f74a7efd7c14c55737bac19de954 (patch) | |
| tree | 86e1ab4983fec3586a8bbb0044216216e22cc1cb /include/sway | |
| parent | 4289343e17615509fba5fe389d855f2292ba09bc (diff) | |
| parent | fa4308c5abecaeef870aced574e9d05e24e62392 (diff) | |
| download | sway-0798fadff2f2f74a7efd7c14c55737bac19de954.tar.xz | |
Merge branch 'master' into render-output-segfault
Diffstat (limited to 'include/sway')
| -rw-r--r-- | include/sway/commands.h | 1 | ||||
| -rw-r--r-- | include/sway/tree/view.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index e51b12fd..226cf932 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h @@ -103,6 +103,7 @@ sway_cmd cmd_client_urgent; sway_cmd cmd_client_placeholder; sway_cmd cmd_client_background; sway_cmd cmd_commands; +sway_cmd cmd_create_output; sway_cmd cmd_debuglog; sway_cmd cmd_default_border; sway_cmd cmd_default_floating_border; diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 439dc1bf..d10251dd 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -61,6 +61,8 @@ struct sway_view { struct sway_container *container; // NULL if unmapped and transactions finished struct wlr_surface *surface; // NULL for unmapped views + pid_t pid; + // Geometry of the view itself (excludes borders) in layout coordinates double x, y; int width, height; |