aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2019-02-16 23:30:19 +0100
committerBrian Ashworth <bosrsf04@gmail.com>2019-02-16 19:11:22 -0500
commit7baaa3a0f80a28f58a3f95f7c3c832cb109b2aab (patch)
treed2596353b9badb5e0d0709fb9ed67ad1edb9e7ec /include
parent806129d3ccef1075e178791c56159e08e868bcaf (diff)
downloadsway-7baaa3a0f80a28f58a3f95f7c3c832cb109b2aab.tar.xz
Disconnect swaybg instead of killing it
This is much more reliable. This also fixes race conditions when killing swaybg while it's doing a wl_display_roundtrip.
Diffstat (limited to 'include')
-rw-r--r--include/sway/output.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sway/output.h b/include/sway/output.h
index 479897ef..ea7a2174 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -21,6 +21,7 @@ struct sway_output {
struct sway_node node;
struct wlr_output *wlr_output;
struct sway_server *server;
+ struct wl_list link;
struct wl_list layers[4]; // sway_layer_surface::link
struct wlr_box usable_area;
@@ -36,6 +37,8 @@ struct sway_output {
struct sway_output_state current;
+ struct wl_client *swaybg_client;
+
struct wl_listener destroy;
struct wl_listener mode;
struct wl_listener transform;
@@ -43,10 +46,7 @@ struct sway_output {
struct wl_listener present;
struct wl_listener damage_destroy;
struct wl_listener damage_frame;
-
- struct wl_list link;
-
- pid_t bg_pid;
+ struct wl_listener swaybg_client_destroy;
struct {
struct wl_signal destroy;