diff options
author | 2018-07-23 20:27:56 -0400 | |
---|---|---|
committer | 2018-07-23 20:31:11 -0400 | |
commit | f4b882475eee7a81c206c7825616cc4656b2f60b (patch) | |
tree | 38e6ebf81b235424f105dcbcbb194e5e9eac70c0 /include/sway/server.h | |
parent | Implement pid->workspace tracking (diff) | |
parent | Merge pull request #2342 from RyanDwyer/update-cursor (diff) | |
download | sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.gz sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.zst sway-f4b882475eee7a81c206c7825616cc4656b2f60b.zip |
Merge branch 'master' into pid-workspaces
Diffstat (limited to 'include/sway/server.h')
-rw-r--r-- | include/sway/server.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 1e1aa3cc..70bde6d4 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -23,12 +23,14 @@ struct sway_server { | |||
23 | 23 | ||
24 | struct wlr_compositor *compositor; | 24 | struct wlr_compositor *compositor; |
25 | struct wlr_data_device_manager *data_device_manager; | 25 | struct wlr_data_device_manager *data_device_manager; |
26 | struct wlr_idle *idle; | ||
27 | 26 | ||
28 | struct sway_input_manager *input; | 27 | struct sway_input_manager *input; |
29 | 28 | ||
30 | struct wl_listener new_output; | 29 | struct wl_listener new_output; |
31 | 30 | ||
31 | struct wlr_idle *idle; | ||
32 | struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1; | ||
33 | |||
32 | struct wlr_layer_shell *layer_shell; | 34 | struct wlr_layer_shell *layer_shell; |
33 | struct wl_listener layer_shell_surface; | 35 | struct wl_listener layer_shell_surface; |
34 | 36 | ||
@@ -45,10 +47,7 @@ struct sway_server { | |||
45 | bool debug_txn_timings; | 47 | bool debug_txn_timings; |
46 | 48 | ||
47 | list_t *transactions; | 49 | list_t *transactions; |
48 | 50 | list_t *dirty_containers; | |
49 | // When a view is being destroyed and is waiting for a transaction to | ||
50 | // complete it will be stored here. | ||
51 | list_t *destroying_containers; | ||
52 | }; | 51 | }; |
53 | 52 | ||
54 | struct sway_server server; | 53 | struct sway_server server; |
@@ -57,10 +56,12 @@ struct sway_server server; | |||
57 | bool server_privileged_prepare(struct sway_server *server); | 56 | bool server_privileged_prepare(struct sway_server *server); |
58 | bool server_init(struct sway_server *server); | 57 | bool server_init(struct sway_server *server); |
59 | void server_fini(struct sway_server *server); | 58 | void server_fini(struct sway_server *server); |
59 | bool server_start_backend(struct sway_server *server); | ||
60 | void server_run(struct sway_server *server); | 60 | void server_run(struct sway_server *server); |
61 | 61 | ||
62 | void handle_new_output(struct wl_listener *listener, void *data); | 62 | void handle_new_output(struct wl_listener *listener, void *data); |
63 | 63 | ||
64 | void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data); | ||
64 | void handle_layer_shell_surface(struct wl_listener *listener, void *data); | 65 | void handle_layer_shell_surface(struct wl_listener *listener, void *data); |
65 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); | 66 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); |
66 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); | 67 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); |