mirror of
https://github.com/swaywm/sway.git
synced 2024-11-22 16:01:27 +00:00
swaylock: daemonize after locking
This commit is contained in:
parent
57fd65c5b5
commit
ceb08b6365
|
@ -23,6 +23,7 @@ struct swaylock_args {
|
|||
uint32_t color;
|
||||
enum background_mode mode;
|
||||
bool show_indicator;
|
||||
bool daemonize;
|
||||
};
|
||||
|
||||
struct swaylock_password {
|
||||
|
|
|
@ -38,6 +38,7 @@ static void daemonize() {
|
|||
exit(1);
|
||||
}
|
||||
if (fork() == 0) {
|
||||
setsid();
|
||||
close(fds[0]);
|
||||
int devnull = open("/dev/null", O_RDWR);
|
||||
dup2(STDOUT_FILENO, devnull);
|
||||
|
@ -406,7 +407,7 @@ int main(int argc, char **argv) {
|
|||
" -v, --version Show the version number and quit.\n"
|
||||
" -i, --image [<output>:]<path> Display the given image.\n"
|
||||
" -u, --no-unlock-indicator Disable the unlock indicator.\n"
|
||||
" -f, --daemonize Detach from the controlling terminal.\n";
|
||||
" -f, --daemonize Detach from the controlling terminal after locking.\n";
|
||||
|
||||
state.args = (struct swaylock_args){
|
||||
.mode = BACKGROUND_MODE_SOLID_COLOR,
|
||||
|
@ -454,7 +455,7 @@ int main(int argc, char **argv) {
|
|||
state.args.show_indicator = false;
|
||||
break;
|
||||
case 'f':
|
||||
daemonize();
|
||||
state.args.daemonize = true;
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "%s", usage);
|
||||
|
@ -510,6 +511,11 @@ int main(int argc, char **argv) {
|
|||
create_layer_surface(surface);
|
||||
}
|
||||
|
||||
if (state.args.daemonize) {
|
||||
wl_display_roundtrip(state.display);
|
||||
daemonize();
|
||||
}
|
||||
|
||||
state.run_display = true;
|
||||
while (wl_display_dispatch(state.display) != -1 && state.run_display) {
|
||||
// This space intentionally left blank
|
||||
|
|
|
@ -37,6 +37,9 @@ Locks your Wayland session.
|
|||
*-u, --no-unlock-indicator*
|
||||
Disable the unlock indicator.
|
||||
|
||||
*-f, --daemonize*
|
||||
Detach from the controlling terminal after locking.
|
||||
|
||||
*-v, --version*
|
||||
Show the version number and quit.
|
||||
|
||||
|
|
Loading…
Reference in a new issue