Merge branch 'master' into premultiply-alpha

1 files changed, 12 insertions, 0 deletions

diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h
index 07b908d7..e161ada9 100644
--- a/include/swaylock/swaylock.h
+++ b/include/swaylock/swaylock.h
@@ -37,23 +37,35 @@ 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;
 	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 {
 	cairo_surface_t *image;
 	struct swaylock_state *state;
 	struct wl_output *output;
+	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;
 };