From 725a0e32bda43dce976496ad392508810b855c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20D=C3=B8rum?= <martid0311@gmail.com>
Date: Sat, 7 Nov 2020 18:45:40 +0100
Subject: [PATCH] pass scale to custom effect

---
 README.md      |  2 +-
 effects.c      | 19 +++++++++++--------
 swaylock.1.scd |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index a32eb010e..42e90bf30 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ The main new features compared to upstream swaylock are:
 	* `--effect-greyscale`: Make the image greyscale.
 	* `--effect-vignette <base>:<factor>`: Apply a vignette effect (range is 0-1).
 	* `--effect-compose <position>;<size>;<gravity>;<path>`: Overlay another image.
-	* `--effect-custom <path>`: Load a custom effect from a shared object.
+	* `--effect-custom <path>`: Load a custom effect from a C file or shared object.
 
 New feature ideas are welcome as issues (though I may never get around to
 implement them), new feature implementations are welcome as pull requests :)
diff --git a/effects.c b/effects.c
index 5e531c8ce..17955d102 100644
--- a/effects.c
+++ b/effects.c
@@ -349,7 +349,7 @@ static void effect_vignette(uint32_t *data, int width, int height,
 	}
 }
 
-static void effect_compose(uint32_t *data, int scale, int width, int height,
+static void effect_compose(uint32_t *data, int width, int height, int scale,
 		struct swaylock_effect_screen_pos posx,
 		struct swaylock_effect_screen_pos posy,
 		struct swaylock_effect_screen_pos posw,
@@ -420,7 +420,7 @@ static void effect_compose(uint32_t *data, int scale, int width, int height,
 #endif
 }
 
-static void effect_custom_run(uint32_t *data, int width, int height,
+static void effect_custom_run(uint32_t *data, int width, int height, int scale,
 		char *path) {
 	void *dl = dlopen(path, RTLD_LAZY);
 	if (dl == NULL) {
@@ -428,10 +428,10 @@ static void effect_custom_run(uint32_t *data, int width, int height,
 		return;
 	}
 
-	void (*effect_func)(uint32_t *data, int width, int height) =
+	void (*effect_func)(uint32_t *data, int width, int height, int scale) =
 		dlsym(dl, "swaylock_effect");
 	if (effect_func != NULL) {
-		effect_func(data, width, height);
+		effect_func(data, width, height, scale);
 		dlclose(dl);
 		return;
 	}
@@ -451,6 +451,7 @@ static void effect_custom_run(uint32_t *data, int width, int height,
 		return;
 	}
 
+	(void)dlsym(dl, "swaylock_effect"); // Change the result of dlerror()
 	swaylock_log(LOG_ERROR, "Custom effect: %s", dlerror());
 }
 
@@ -555,15 +556,15 @@ static char *effect_custom_compile(const char *path) {
 	return outpath;
 }
 
-static void effect_custom(uint32_t *data, int width, int height,
+static void effect_custom(uint32_t *data, int width, int height, int scale,
 		char *path) {
 	size_t pathlen = strlen(path);
 	if (pathlen > 3 && strcmp(path + pathlen - 3, ".so") == 0) {
-		effect_custom_run(data, width, height, path);
+		effect_custom_run(data, width, height, scale, path);
 	} else if (pathlen > 2 && strcmp(path + pathlen - 2, ".c") == 0) {
 		char *compiled = effect_custom_compile(path);
 		if (compiled != NULL) {
-			effect_custom_run(data, width, height, compiled);
+			effect_custom_run(data, width, height, scale, compiled);
 			free(compiled);
 		}
 	} else {
@@ -656,9 +657,10 @@ static cairo_surface_t *run_effect(cairo_surface_t *surface, int scale,
 
 	case EFFECT_COMPOSE: {
 		effect_compose(
-				(uint32_t *)cairo_image_surface_get_data(surface), scale,
+				(uint32_t *)cairo_image_surface_get_data(surface),
 				cairo_image_surface_get_width(surface),
 				cairo_image_surface_get_height(surface),
+				scale,
 				effect->e.compose.x, effect->e.compose.y,
 				effect->e.compose.w, effect->e.compose.h,
 				effect->e.compose.gravity, effect->e.compose.imgpath);
@@ -671,6 +673,7 @@ static cairo_surface_t *run_effect(cairo_surface_t *surface, int scale,
 				(uint32_t *)cairo_image_surface_get_data(surface),
 				cairo_image_surface_get_width(surface),
 				cairo_image_surface_get_height(surface),
+				scale,
 				effect->e.custom);
 		cairo_surface_flush(surface);
 		break;
diff --git a/swaylock.1.scd b/swaylock.1.scd
index e05bd5b0f..2b708fd16 100644
--- a/swaylock.1.scd
+++ b/swaylock.1.scd
@@ -246,7 +246,7 @@ Locks your Wayland session.
 
 *--effect-custom <path>*
 	Load a custom effect from a shared object. The .so must export a++
-*void swaylock_effect(uint32\_t \*data, int width, int height)*++
+*void swaylock_effect(uint32\_t \*data, int width, int height, int scale)*++
 or an *uint32\_t swaylock_pixel(uint32\_t pix, int x, int y, int width, int height)*.
 
 *--time-effects*