mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2925 from ianyfan/swaylock 

swaylock: exit early if unable to get input inhibitor
This commit is contained in:
Drew DeVault 2018-10-24 18:54:22 +02:00 committed by GitHub
parent 9658d4bcc5 9afcda59db
commit 41f744c224
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swaybar/bar.c
View File

@ -415,7 +415,10 @@ void bar_run(struct swaybar *bar) {
status_in, bar); status_in, bar);
} }
while (1) { while (1) {
wl_display_flush(bar->display); errno = 0;
if (wl_display_flush(bar->display) == -1 && errno != EAGAIN) {
break;
}
loop_poll(bar->eventloop); loop_poll(bar->eventloop);
} }
} }

15
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>
@ -844,7 +845,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) {
@ -928,6 +931,11 @@ int main(int argc, char **argv) {
} }
zwlr_input_inhibit_manager_v1_get_inhibitor(state.input_inhibit_manager); 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) { if (state.zxdg_output_manager) {
struct swaylock_surface *surface; struct swaylock_surface *surface;
@ -959,7 +967,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;