diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-06-27 13:21:00 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-27 13:21:00 +1000 |
| commit | bf380813829b11d42ff0703630600e5bee06098b (patch) | |
| tree | 0c0951e0ec5c36a6de14535903092b539bdbbf9b /include/sway | |
| parent | eeb38d65cbf5c8452c449b9f5e003bd255ca6a53 (diff) | |
| parent | f0f50c31d5e40f3dbe80c60d01bafc80c3bd24c0 (diff) | |
| download | sway-bf380813829b11d42ff0703630600e5bee06098b.tar.xz | |
Merge branch 'master' into xwayland-wants-float
Diffstat (limited to 'include/sway')
| -rw-r--r-- | include/sway/output.h | 4 | ||||
| -rw-r--r-- | include/sway/server.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/sway/output.h b/include/sway/output.h index 70f746dc..8180ce3d 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -32,6 +32,10 @@ struct sway_output { struct wl_list link; pid_t bg_pid; + + struct { + struct wl_signal destroy; + } events; }; void output_damage_whole(struct sway_output *output); diff --git a/include/sway/server.h b/include/sway/server.h index 96cad69d..b016aba8 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -44,6 +44,8 @@ struct sway_server { struct sway_server server; +/* Prepares an unprivileged server_init by performing all privileged operations in advance */ +bool server_privileged_prepare(struct sway_server *server); bool server_init(struct sway_server *server); void server_fini(struct sway_server *server); void server_run(struct sway_server *server); |