fix build

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Author: Trial97

effects.c

@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #define _XOPEN_SOURCE 700
 #include <omp.h>
 #include <limits.h>

include/swaylock.h

@@ -147,6 +147,7 @@ struct swaylock_surface {
   struct wl_surface *surface; // surface for background
   struct wl_surface *child;   // indicator surface made into subsurface
   struct wl_subsurface *subsurface;
+  struct zwlr_screencopy_frame_v1 *screencopy_frame;
   struct ext_session_lock_surface_v1 *ext_session_lock_surface_v1;
   struct pool_buffer indicator_buffers[2];
   bool created;

main.c

@@ -265,16 +265,6 @@ static const struct ext_session_lock_surface_v1_listener ext_session_lock_surfac
 static cairo_surface_t *select_image(struct swaylock_state *state,
 		struct swaylock_surface *surface);
 
-static bool surface_is_opaque(struct swaylock_surface *surface) {
-	if (!fade_is_complete(&surface->fade)) {
-		return false;
-	}
-	if (surface->image) {
-		return cairo_surface_get_content(surface->image) == CAIRO_CONTENT_COLOR;
-	}
-	return (surface->state->args.colors.background & 0xff) == 0xff;
-}
-
 static void create_surface(struct swaylock_surface *surface) {
 	struct swaylock_state *state = surface->state;
 
@@ -305,36 +295,14 @@ static void create_surface(struct swaylock_surface *surface) {
 	}
 }
 
-static void initially_render_surface(struct swaylock_surface *surface) {
-	swaylock_log(LOG_DEBUG, "Surface for output %s ready", surface->output_name);
-	if (surface_is_opaque(surface) &&
-			surface->state->args.mode != BACKGROUND_MODE_CENTER &&
-			surface->state->args.mode != BACKGROUND_MODE_FIT) {
-		struct wl_region *region =
-			wl_compositor_create_region(surface->state->compositor);
-		wl_region_add(region, 0, 0, INT32_MAX, INT32_MAX);
-		wl_surface_set_opaque_region(surface->surface, region);
-		wl_region_destroy(region);
-	}
 
-	surface->created = true;
-    if (!surface->state->ext_session_lock_v1) {
-        render_frame_background(surface, true);
-		render_frame(surface);
-	}
-}
 static void ext_session_lock_surface_v1_handle_configure(void *data,
 		struct ext_session_lock_surface_v1 *lock_surface, uint32_t serial,
 		uint32_t width, uint32_t height) {
 	struct swaylock_surface *surface = data;
 	surface->width = width;
 	surface->height = height;
-    // Render before we send the ACK event, so that we minimize flickering
-	// This means we cannot commit immediately after rendering -- we will have
-	// to send the ACK first and then commit.
-	render_frame_background(surface, false);
 	ext_session_lock_surface_v1_ack_configure(lock_surface, serial);
-	wl_surface_commit(surface->surface);
 	surface->dirty = true;
 	render(surface);
 }
@@ -370,6 +338,8 @@ static void handle_wl_output_mode(void *data, struct wl_output *output,
 	// Who cares
 }
 
+static const struct zwlr_screencopy_frame_v1_listener screencopy_frame_listener;
+
 static void handle_wl_output_done(void *data, struct wl_output *output) {
 	swaylock_trace();
 	struct swaylock_surface *surface = data;
@@ -1878,12 +1848,6 @@ int main(int argc, char **argv) {
 		surface->events_pending += 1;
 	};
 
-	wl_list_for_each(surface, &state.surfaces, link) {
-		while (surface->events_pending > 0) {
-			wl_display_roundtrip(state.display);
-		}
-	}
-
 	// Must daemonize before we run any effects, since effects use openmp
 	int daemonfd;
 	if (state.args.daemonize) {
@@ -1899,20 +1863,6 @@ int main(int argc, char **argv) {
 				iter_image->cairo_surface, &state, 1);
 	}
 
-	if (state.ext_session_lock_manager_v1) {
-		swaylock_log(LOG_DEBUG, "Using ext-session-lock-v1");
-		state.ext_session_lock_v1 = ext_session_lock_manager_v1_lock(state.ext_session_lock_manager_v1);
-		ext_session_lock_v1_add_listener(state.ext_session_lock_v1,
-				&ext_session_lock_v1_listener, &state);
-	} else if (state.layer_shell && state.input_inhibit_manager) {
-		swaylock_log(LOG_DEBUG, "Using wlr-layer-shell + wlr-input-inhibitor");
-		zwlr_input_inhibit_manager_v1_get_inhibitor(state.input_inhibit_manager);
-	} else {
-		swaylock_log(LOG_ERROR, "Missing ext-session-lock-v1, wlr-layer-shell "
-				"and wlr-input-inhibitor");
-		return 1;
-	}
-
 	state.ext_session_lock_v1 = ext_session_lock_manager_v1_lock(state.ext_session_lock_manager_v1);
 	ext_session_lock_v1_add_listener(state.ext_session_lock_v1,
 		&ext_session_lock_v1_listener, &state);
@@ -1944,9 +1894,6 @@ int main(int argc, char **argv) {
 		close(state.args.ready_fd);
 		state.args.ready_fd = -1;
 	}
-	if (state.args.daemonize) {
-		daemonize();
-    }
 
 	wl_list_for_each(surface, &state.surfaces, link) {
 		while (surface->events_pending > 0) {

render.c

@@ -161,9 +161,7 @@ void render(struct swaylock_surface *surface) {
 	surface->dirty = false;
 	surface->frame = wl_surface_frame(surface->surface);
 	wl_callback_add_listener(surface->frame, &surface_frame_listener, surface);
-	if (commit) {
-        wl_surface_commit(surface->surface);
-	}
+    wl_surface_commit(surface->surface);
 
 	if (need_destroy) {
 		destroy_buffer(&buffer);
@@ -177,8 +175,7 @@ void render_background_fade(struct swaylock_surface *surface, uint32_t time) {
 
 	fade_update(&surface->fade, time);
 
-	render_frame_background(surface, true);
-	render_frame(surface);
+	render(surface);
 }
 
 static void configure_font_drawing(cairo_t *cairo, struct swaylock_state *state,
@@ -210,7 +207,7 @@ static bool render_frame(struct swaylock_surface *surface) {
     char *text_l1 = NULL;
     char *text_l2 = NULL;
 	const char *layout_text = NULL;
-    double font_size;
+    double font_size = 0;
 
 	bool draw_indicator = state->args.show_indicator &&
 		(state->auth_state != AUTH_STATE_IDLE ||
@@ -222,7 +219,7 @@ static bool render_frame(struct swaylock_surface *surface) {
 			// This message has highest priority
 			text = state->args.text_cleared;
 		} else if (state->auth_state == AUTH_STATE_VALIDATING) {
-			text = state->args.text_verifyin;
+			text = state->args.text_verifying;
 		} else if (state->auth_state == AUTH_STATE_INVALID) {
 			text = state->args.text_wrong;
 		} else {
@@ -260,10 +257,10 @@ static bool render_frame(struct swaylock_surface *surface) {
 		}
 	}
 
-    if (text_l1 && !text_l2)
-        text = text_l1;
-    if (text_l2 && !text_l1)
-        text = text_l2;
+	if (text_l1 && !text_l2)
+		text = text_l1;
+	if (text_l2 && !text_l1)
+		text = text_l2;
 
 	// Compute the size of the buffer needed
 	int arc_radius = state->args.radius * surface->scale;
@@ -301,40 +298,41 @@ static bool render_frame(struct swaylock_surface *surface) {
 
         /* Top */
 
-        cairo_text_extents(cairo, text_l1, &extents_l1);
-        cairo_font_extents(cairo, &fe_l1);
+        cairo_text_extents(state->test_cairo, text_l1, &extents_l1);
+        cairo_font_extents(state->test_cairo, &fe_l1);
         x_l1 = (buffer_width / 2) -
             (extents_l1.width / 2 + extents_l1.x_bearing);
         y_l1 = (buffer_diameter / 2) +
             (fe_l1.height / 2 - fe_l1.descent) - arc_radius / 10.0f;
 
-        cairo_move_to(cairo, x_l1, y_l1);
-        cairo_show_text(cairo, text_l1);
-        cairo_close_path(cairo);
-        cairo_new_sub_path(cairo);
+        cairo_move_to(state->test_cairo, x_l1, y_l1);
+        cairo_show_text(state->test_cairo, text_l1);
+        cairo_close_path(state->test_cairo);
+        cairo_new_sub_path(state->test_cairo);
 
         /* Bottom */
 
-        cairo_set_font_size(cairo, arc_radius / 6.0f);
-        cairo_text_extents(cairo, text_l2, &extents_l2);
-        cairo_font_extents(cairo, &fe_l2);
+        cairo_set_font_size(state->test_cairo, arc_radius / 6.0f);
+        cairo_text_extents(state->test_cairo, text_l2, &extents_l2);
+        cairo_font_extents(state->test_cairo, &fe_l2);
         x_l2 = (buffer_width / 2) -
             (extents_l2.width / 2 + extents_l2.x_bearing);
         y_l2 = (buffer_diameter / 2) +
             (fe_l2.height / 2 - fe_l2.descent) + arc_radius / 3.5f;
 
-        cairo_move_to(cairo, x_l2, y_l2);
-        cairo_show_text(cairo, text_l2);
-        cairo_close_path(cairo);
-        cairo_new_sub_path(cairo);
+        cairo_move_to(state->test_cairo, x_l2, y_l2);
+        cairo_show_text(state->test_cairo, text_l2);
+        cairo_close_path(state->test_cairo);
+        cairo_new_sub_path(state->test_cairo);
 
-        if (new_width < extents_l1.width)
-            new_width = extents_l1.width;
-        if (new_width < extents_l2.width)
-            new_width = extents_l2.width;
+        double box_padding = 4.0 * surface->scale;
+        if (buffer_width < extents_l1.width + 2 * box_padding)
+            buffer_width = extents_l1.width + 2 * box_padding;
+        if (buffer_width < extents_l2.width + 2 * box_padding)
+            buffer_width = extents_l2.width + 2 * box_padding;
 
 
-        cairo_set_font_size(cairo, font_size);
+        cairo_set_font_size(state->test_cairo, font_size);
 	}
 	// Ensure buffer size is multiple of buffer scale - required by protocol
 	buffer_height += surface->scale - (buffer_height % surface->scale);