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 | |
parent | xwayland: accept configure requests from floating views (diff) | |
parent | Merge pull request #2162 from martinetd/float_xdg_shell (diff) | |
download | sway-bf380813829b11d42ff0703630600e5bee06098b.tar.gz sway-bf380813829b11d42ff0703630600e5bee06098b.tar.zst sway-bf380813829b11d42ff0703630600e5bee06098b.zip |
Merge branch 'master' into xwayland-wants-float
Diffstat (limited to 'include')
-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 { | |||
32 | struct wl_list link; | 32 | struct wl_list link; |
33 | 33 | ||
34 | pid_t bg_pid; | 34 | pid_t bg_pid; |
35 | |||
36 | struct { | ||
37 | struct wl_signal destroy; | ||
38 | } events; | ||
35 | }; | 39 | }; |
36 | 40 | ||
37 | void output_damage_whole(struct sway_output *output); | 41 | 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 { | |||
44 | 44 | ||
45 | struct sway_server server; | 45 | struct sway_server server; |
46 | 46 | ||
47 | /* Prepares an unprivileged server_init by performing all privileged operations in advance */ | ||
48 | bool server_privileged_prepare(struct sway_server *server); | ||
47 | bool server_init(struct sway_server *server); | 49 | bool server_init(struct sway_server *server); |
48 | void server_fini(struct sway_server *server); | 50 | void server_fini(struct sway_server *server); |
49 | void server_run(struct sway_server *server); | 51 | void server_run(struct sway_server *server); |