From 7fffe0a98cfd098393d3c288f228991b3ebac7f1 Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Mon, 22 Oct 2018 09:59:35 +0100 Subject: [PATCH 1/3] swaylock: exit early if unable to inhibit input This stops the program from going into a spinlock without exiting --- swaylock/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/swaylock/main.c b/swaylock/main.c index f2bb5c3eb..8ed8adf57 100644 --- a/swaylock/main.c +++ b/swaylock/main.c @@ -925,6 +925,11 @@ int main(int argc, char **argv) { } zwlr_input_inhibit_manager_v1_get_inhibitor(state.input_inhibit_manager); + if (wl_display_roundtrip(state.display) == -1) { + wlr_log(WLR_ERROR, "Exiting - failed to inhibit input:" + " is another lockscreen already running?"); + return 2; + } if (state.zxdg_output_manager) { struct swaylock_surface *surface; From ebfb1388e2b178ecee1c1e1f4b5160af0efe2db6 Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Tue, 23 Oct 2018 11:46:51 +0100 Subject: [PATCH 2/3] swaylock: exit on display error --- swaylock/main.c | 10 ++++++++-- swaylock/password.c | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/swaylock/main.c b/swaylock/main.c index 8ed8adf57..ebc2b263c 100644 --- a/swaylock/main.c +++ b/swaylock/main.c @@ -2,6 +2,7 @@ #define _POSIX_C_SOURCE 200112L #include #include +#include #include #include #include @@ -841,7 +842,9 @@ static int load_config(char *path, struct swaylock_state *state, static struct swaylock_state state; static void display_in(int fd, short mask, void *data) { - wl_display_dispatch(state.display); + if (wl_display_dispatch(state.display) == -1) { + state.run_display = false; + } } int main(int argc, char **argv) { @@ -961,7 +964,10 @@ int main(int argc, char **argv) { state.run_display = true; while (state.run_display) { - wl_display_flush(state.display); + errno = 0; + if (wl_display_flush(state.display) == -1 && errno != EAGAIN) { + break; + } loop_poll(state.eventloop); } diff --git a/swaylock/password.c b/swaylock/password.c index fecaecbf7..6138e1fef 100644 --- a/swaylock/password.c +++ b/swaylock/password.c @@ -1,5 +1,6 @@ #define _XOPEN_SOURCE 500 #include +#include #include #include #include @@ -97,7 +98,10 @@ void swaylock_handle_key(struct swaylock_state *state, state->eventloop, 50, handle_preverify_timeout, state); while (state->run_display && state->verify_password_timer) { - wl_display_flush(state->display); + errno = 0; + if (wl_display_flush(state->display) == -1 && errno != EAGAIN) { + break; + } loop_poll(state->eventloop); bool ok = 1; From 9afcda59dba5787817b50a74c254ccb790549e3c Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Tue, 23 Oct 2018 12:22:51 +0100 Subject: [PATCH 3/3] swaybar: exit on display error --- swaybar/bar.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swaybar/bar.c b/swaybar/bar.c index 1439a11cf..3661c6378 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c @@ -419,7 +419,10 @@ void bar_run(struct swaybar *bar) { status_in, bar); } while (1) { - wl_display_flush(bar->display); + errno = 0; + if (wl_display_flush(bar->display) == -1 && errno != EAGAIN) { + break; + } loop_poll(bar->eventloop); } }