Add an option to display the output of a script. (Originally battery percentage).

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "ext-session-lock-v1-client-protocol.h": "c"
+    }
+}

README.md

@@ -1,11 +1,15 @@
-# swaylock-effects
+# swaylock-effects-script
+
+Swaylock-effects-script is a fork of [swaylock-effects](https://github.com/jirutka/swaylock-effects)
+which adds a script output display feature.
 
 Swaylock-effects is a fork of [swaylock](https://github.com/swaywm/swaylock)
 which adds built-in screenshots and image manipulation effects like blurring.
 It's inspired by [i3lock-color](https://github.com/PandorasFox/i3lock-color),
 although the feature sets aren't perfectly overlapping.
 
-This repository ([jirutka/swaylock-effects](https://github.com/jirutka/swaylock-effects))
+This repository ([sidharthmrao/swaylock-effects-script](https://github.com/sidharthmrao/swaylock-effects-script))
+is a fork of ([jirutka/swaylock-effects](https://github.com/jirutka/swaylock-effects)) which
 is a fork of [mortie/swaylock-effects](https://github.com/mortie/swaylock-effects)
 which is no longer maintained.
 
@@ -15,6 +19,7 @@ which is no longer maintained.
 
 	swaylock \
 		--screenshots \
+		--script `path_to_script` \
 		--clock \
 		--indicator \
 		--indicator-radius 100 \
@@ -33,6 +38,7 @@ which is no longer maintained.
 
 The main new features compared to upstream swaylock are:
 
+* `--script` to display the script output
 * `--screenshots` to use screenshots instead of an image on disk or a color
 * `--clock` to show date/time in the indicator
 	* Use `--indicator` to make the indicator always active
@@ -130,6 +136,10 @@ Run these commands:
 	ninja -C build
 	sudo ninja -C build install
 
+On systems with PAM, copy pam/swaylock to /etc/pam.d/swaylock
+
+	sudo cp pam/swaylock /etc/pam.d/swaylock
+
 On systems without PAM, you need to suid the swaylock binary:
 
 	sudo chmod a+s /usr/local/bin/swaylock

include/swaylock.h

@@ -82,6 +82,10 @@ struct swaylock_args {
 	bool password_grace_no_mouse;
 	bool password_grace_no_touch;
 
+	bool display_script;
+	char *script_str;
+	char *script_path;
+
 	char *text_cleared;
 	char *text_caps_lock;
 	char *text_verifying;

main.c

@@ -30,6 +30,37 @@
 #include "wlr-screencopy-unstable-v1-client-protocol.h"
 #include "ext-session-lock-v1-client-protocol.h"
 
+#define MAX_OUTPUT_SIZE 1024
+
+static struct swaylock_state state;
+
+void update_script() {
+	FILE *pipe;
+	char path[1035];
+	char output[MAX_OUTPUT_SIZE];
+	char *script_str = (char *)malloc((MAX_OUTPUT_SIZE + 1) * sizeof(char));
+
+	pipe = popen(state.args.script_path, "r");
+
+	if (pipe == NULL) {
+		fprintf(stderr, "Failed to run script.\n");
+		return;
+	}
+
+	memset(output, 0, sizeof(output));
+
+	while (fgets(path, sizeof(path), pipe) != NULL) {
+		path[strcspn(path, "\r\n")] = '\0';
+		strcat(output, path);
+	}
+
+	pclose(pipe);
+
+	snprintf(script_str, MAX_OUTPUT_SIZE, "%s", output);
+
+	state.args.script_str = script_str;
+}
+
 // returns a positive integer in milliseconds
 static uint32_t parse_seconds(const char *seconds) {
 	char *endptr;
@@ -397,6 +428,11 @@ static const struct wl_callback_listener surface_frame_listener;
 
 static void surface_frame_handle_done(void *data, struct wl_callback *callback,
 		uint32_t time) {
+
+	if (state.args.display_script) {
+		update_script();
+	};
+
 	struct swaylock_surface *surface = data;
 
 	wl_callback_destroy(callback);
@@ -975,6 +1011,7 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
 		LO_TIME_EFFECTS,
 		LO_INDICATOR,
 		LO_CLOCK,
+		LO_SCRIPT,
 		LO_TIMESTR,
 		LO_DATESTR,
 		LO_FADE_IN,
@@ -1055,6 +1092,7 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
 		{"time-effects", no_argument, NULL, LO_TIME_EFFECTS},
 		{"indicator", no_argument, NULL, LO_INDICATOR},
 		{"clock", no_argument, NULL, LO_CLOCK},
+		{"script", required_argument, NULL, LO_SCRIPT},
 		{"timestr", required_argument, NULL, LO_TIMESTR},
 		{"datestr", required_argument, NULL, LO_DATESTR},
 		{"fade-in", required_argument, NULL, LO_FADE_IN},
@@ -1114,6 +1152,8 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
 			"Disable the unlock indicator.\n"
 		"  --indicator                      "
 			"Always show the indicator.\n"
+		"  --script                        "
+			"Show the script output.\n"
 		"  --clock                          "
 			"Show time and date.\n"
 		"  --timestr <format>               "
@@ -1619,6 +1659,13 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
 				state->args.clock = true;
 			}
 			break;
+		case LO_SCRIPT:
+			if (state) {
+				state->args.script_path = strdup(optarg);
+				state->args.display_script = true;
+			}
+			update_script();
+			break;
 		case LO_TIMESTR:
 			if (state) {
 				free(state->args.timestr);
@@ -1741,8 +1788,6 @@ static int load_config(char *path, struct swaylock_state *state,
 	return 0;
 }
 
-static struct swaylock_state state;
-
 static void display_in(int fd, short mask, void *data) {
 	if (wl_display_dispatch(state.display) == -1) {
 		state.run_display = false;
@@ -1823,8 +1868,8 @@ int main(int argc, char **argv) {
 		.mode = BACKGROUND_MODE_FILL,
 		.font = strdup("sans-serif"),
 		.font_size = 0,
-		.radius = 75,
-		.thickness = 10,
+		.radius = 100,
+		.thickness = 9,
 		.indicator_x_position = 0,
 		.indicator_y_position = 0,
 		.override_indicator_x_position = false,
@@ -1848,6 +1893,10 @@ int main(int argc, char **argv) {
 		.allow_fade = true,
 		.password_grace_period = 0,
 
+		.display_script = false,
+		.script_str = NULL,
+		.script_path = NULL,
+
 		.text_cleared = strdup("Cleared"),
 		.text_caps_lock = strdup("Caps Lock"),
 		.text_verifying = strdup("Verifying"),