Merge branch 'master' into fix-swaylock-hotplugging

1 files changed, 19 insertions, 7 deletions

diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h
index 56ec0afb..27db67cd 100644
--- a/include/swaylock/swaylock.h
+++ b/include/swaylock/swaylock.h
@@ -10,13 +10,13 @@
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 
 enum auth_state {
-    AUTH_STATE_IDLE,
-    AUTH_STATE_CLEAR,
-    AUTH_STATE_INPUT,
-    AUTH_STATE_INPUT_NOP,
-    AUTH_STATE_BACKSPACE,
-    AUTH_STATE_VALIDATING,
-    AUTH_STATE_INVALID,
+        AUTH_STATE_IDLE,
+        AUTH_STATE_CLEAR,
+        AUTH_STATE_INPUT,
+        AUTH_STATE_INPUT_NOP,
+        AUTH_STATE_BACKSPACE,
+        AUTH_STATE_VALIDATING,
+        AUTH_STATE_INVALID,
 };
 
 struct swaylock_args {
@@ -37,12 +37,14 @@ struct swaylock_state {
         struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager;
         struct wl_shm *shm;
         struct wl_list surfaces;
+        struct wl_list images;
         struct swaylock_args args;
         cairo_surface_t *background_image;
         struct swaylock_password password;
         struct swaylock_xkb xkb;
         enum auth_state auth_state;
         bool run_display;
+        struct zxdg_output_manager_v1 *zxdg_output_manager;
 };
 
 struct swaylock_surface {
@@ -50,12 +52,22 @@ struct swaylock_surface {
         struct swaylock_state *state;
         struct wl_output *output;
         uint32_t output_global_name;
+        struct zxdg_output_v1 *xdg_output;
         struct wl_surface *surface;
         struct zwlr_layer_surface_v1 *layer_surface;
         struct pool_buffer buffers[2];
         struct pool_buffer *current_buffer;
         uint32_t width, height;
         int32_t scale;
+        char *output_name;
+        struct wl_list link;
+};
+
+// There is exactly one swaylock_image for each -i argument
+struct swaylock_image {
+        char *path;
+        char *output_name;
+        cairo_surface_t *cairo_surface;
         struct wl_list link;
 };