mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

swaylock: exit on display error

Browse source
This commit is contained in:
Ian Fan 2018-10-23 11:46:51 +01:00
parent 7fffe0a98c
commit ebfb1388e2
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
swaylock/main.c
View file

@ -2,6 +2,7 @@
#define _POSIX_C_SOURCE 200112L #define _POSIX_C_SOURCE 200112L
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h> #include <getopt.h>
#include <stdbool.h> #include <stdbool.h>
@ -841,7 +842,9 @@ static int load_config(char *path, struct swaylock_state *state,
static struct swaylock_state state; static struct swaylock_state state;
static void display_in(int fd, short mask, void *data) { 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) { int main(int argc, char **argv) {
@ -961,7 +964,10 @@ int main(int argc, char **argv) {
state.run_display = true; state.run_display = true;
while (state.run_display) { 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); loop_poll(state.eventloop);
} }

6
swaylock/password.c
View file

@ -1,5 +1,6 @@
#define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE 500
#include <assert.h> #include <assert.h>
#include <errno.h>
#include <pwd.h> #include <pwd.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -97,7 +98,10 @@ void swaylock_handle_key(struct swaylock_state *state,
state->eventloop, 50, handle_preverify_timeout, state); state->eventloop, 50, handle_preverify_timeout, state);
while (state->run_display && state->verify_password_timer) { 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); loop_poll(state->eventloop);
bool ok = 1; bool ok = 1;