pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add --ready-fd

Browse Source 
This implements a readiness notification mechanism which works on
both systemd and s6.

References: https://github.com/swaywm/swaylock/pull/42
References: https://github.com/swaywm/swaylock/pull/275
This commit is contained in:
Simon Ser 2023-01-27 13:29:33 +01:00 committed by Kenny Levinsen
parent bd2dfec9ae
commit db9ee6d127
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/swaylock.h
View File

@ -62,6 +62,7 @@ struct swaylock_args {
bool hide_keyboard_layout; bool hide_keyboard_layout;
bool show_failed_attempts; bool show_failed_attempts;
bool daemonize; bool daemonize;
int ready_fd;
bool indicator_idle_visible; bool indicator_idle_visible;
}; };

24
main.c
View File

@ -579,6 +579,7 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
{"debug", no_argument, NULL, 'd'}, {"debug", no_argument, NULL, 'd'},
{"ignore-empty-password", no_argument, NULL, 'e'}, {"ignore-empty-password", no_argument, NULL, 'e'},
{"daemonize", no_argument, NULL, 'f'}, {"daemonize", no_argument, NULL, 'f'},
{"ready-fd", required_argument, NULL, 'R'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{"image", required_argument, NULL, 'i'}, {"image", required_argument, NULL, 'i'},
{"disable-caps-lock-text", no_argument, NULL, 'L'}, {"disable-caps-lock-text", no_argument, NULL, 'L'},
@ -645,6 +646,8 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
"Show current count of failed authentication attempts.\n" "Show current count of failed authentication attempts.\n"
" -f, --daemonize " " -f, --daemonize "
"Detach from the controlling terminal after locking.\n" "Detach from the controlling terminal after locking.\n"
" -R, --ready-fd <fd> "
"File descriptor to send readiness notifications to.\n"
" -h, --help " " -h, --help "
"Show help message and quit.\n" "Show help message and quit.\n"
" -i, --image [[<output>]:]<path> " " -i, --image [[<output>]:]<path> "
@ -754,7 +757,7 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
optind = 1; optind = 1;
while (1) { while (1) {
int opt_idx = 0; int opt_idx = 0;
c = getopt_long(argc, argv, "c:deFfhi:kKLlnrs:tuvC:", long_options, c = getopt_long(argc, argv, "c:deFfhi:kKLlnrs:tuvC:R:", long_options,
&opt_idx); &opt_idx);
if (c == -1) { if (c == -1) {
break; break;
@ -788,6 +791,11 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
state->args.daemonize = true; state->args.daemonize = true;
} }
break; break;
case 'R':
if (state) {
state->args.ready_fd = strtol(optarg, NULL, 10);
}
break;
case 'i': case 'i':
if (state) { if (state) {
load_image(optarg, state); load_image(optarg, state);
@ -1182,7 +1190,8 @@ int main(int argc, char **argv) {
.show_keyboard_layout = false, .show_keyboard_layout = false,
.hide_keyboard_layout = false, .hide_keyboard_layout = false,
.show_failed_attempts = false, .show_failed_attempts = false,
.indicator_idle_visible = false .indicator_idle_visible = false,
.ready_fd = -1,
}; };
wl_list_init(&state.images); wl_list_init(&state.images);
set_default_colors(&state.args.colors); set_default_colors(&state.args.colors);
@ -1311,6 +1320,17 @@ int main(int argc, char **argv) {
state.locked = true; state.locked = true;
} }
if (state.args.ready_fd >= 0) {
// s6 wants a newline and ignores any text before that, systemd wants
// READY=1, so use the least common denominator
const char ready_str[] = "READY=1\n";
if (write(state.args.ready_fd, ready_str, strlen(ready_str)) != strlen(ready_str)) {
swaylock_log(LOG_ERROR, "Failed to send readiness notification");
return 2;
}
close(state.args.ready_fd);
state.args.ready_fd = -1;
}
if (state.args.daemonize) { if (state.args.daemonize) {
daemonize(); daemonize();
} }