diff options
author | 2018-05-23 18:11:24 -0400 | |
---|---|---|
committer | 2018-05-23 18:11:24 -0400 | |
commit | 50d1b80d507096ad55e9e2fbb56b31b09b6671dc (patch) | |
tree | 3dc61f6ba02d754e71df1499c406f8586b853f76 /include | |
parent | Merge pull request #2022 from RedSoxFan/ipc-get-marks (diff) | |
parent | swaylock: remove unused field (diff) | |
download | sway-50d1b80d507096ad55e9e2fbb56b31b09b6671dc.tar.gz sway-50d1b80d507096ad55e9e2fbb56b31b09b6671dc.tar.zst sway-50d1b80d507096ad55e9e2fbb56b31b09b6671dc.zip |
Merge pull request #2003 from emersion/fix-swaylock-hotplugging
Fix swaylock crashing when plugging/unplugging output
Diffstat (limited to 'include')
-rw-r--r-- | include/swaylock/swaylock.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index e161ada9..dae823b8 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h | |||
@@ -10,13 +10,13 @@ | |||
10 | #include "wlr-layer-shell-unstable-v1-client-protocol.h" | 10 | #include "wlr-layer-shell-unstable-v1-client-protocol.h" |
11 | 11 | ||
12 | enum auth_state { | 12 | enum auth_state { |
13 | AUTH_STATE_IDLE, | 13 | AUTH_STATE_IDLE, |
14 | AUTH_STATE_CLEAR, | 14 | AUTH_STATE_CLEAR, |
15 | AUTH_STATE_INPUT, | 15 | AUTH_STATE_INPUT, |
16 | AUTH_STATE_INPUT_NOP, | 16 | AUTH_STATE_INPUT_NOP, |
17 | AUTH_STATE_BACKSPACE, | 17 | AUTH_STATE_BACKSPACE, |
18 | AUTH_STATE_VALIDATING, | 18 | AUTH_STATE_VALIDATING, |
19 | AUTH_STATE_INVALID, | 19 | AUTH_STATE_INVALID, |
20 | }; | 20 | }; |
21 | 21 | ||
22 | struct swaylock_args { | 22 | struct swaylock_args { |
@@ -50,6 +50,7 @@ struct swaylock_surface { | |||
50 | cairo_surface_t *image; | 50 | cairo_surface_t *image; |
51 | struct swaylock_state *state; | 51 | struct swaylock_state *state; |
52 | struct wl_output *output; | 52 | struct wl_output *output; |
53 | uint32_t output_global_name; | ||
53 | struct zxdg_output_v1 *xdg_output; | 54 | struct zxdg_output_v1 *xdg_output; |
54 | struct wl_surface *surface; | 55 | struct wl_surface *surface; |
55 | struct zwlr_layer_surface_v1 *layer_surface; | 56 | struct zwlr_layer_surface_v1 *layer_surface; |