From 9c833c661ac9e061bf4d666065e3090639f481ff Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Oct 2018 16:14:35 +1000 Subject: swaylock: Use common event loop --- include/swaylock/swaylock.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/swaylock') diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index fbdd42a8..c8732cb7 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -54,6 +54,7 @@ struct swaylock_password { }; struct swaylock_state { + struct loop *eventloop; struct wl_display *display; struct wl_compositor *compositor; struct zwlr_layer_shell_v1 *layer_shell; -- cgit v1.2.3 From c242712262c5cb751fc0f89050a7f7a24433b105 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Oct 2018 16:52:13 +1000 Subject: swaylock: Remove indicator after 3 seconds --- include/swaylock/swaylock.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/swaylock') diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index c8732cb7..792d34cf 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -55,6 +55,7 @@ struct swaylock_password { struct swaylock_state { struct loop *eventloop; + struct loop_event *clear_indicator_timer; // clears the indicator struct wl_display *display; struct wl_compositor *compositor; struct zwlr_layer_shell_v1 *layer_shell; -- cgit v1.2.3 From fa11b7f7012d153ba9728fe718ffc1a2650d6e98 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Oct 2018 16:56:35 +1000 Subject: swaylock: clear password after 10 seconds --- include/swaylock/swaylock.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/swaylock') diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index 792d34cf..ae042c4f 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -56,6 +56,7 @@ struct swaylock_password { struct swaylock_state { struct loop *eventloop; struct loop_event *clear_indicator_timer; // clears the indicator + struct loop_event *clear_password_timer; // clears the password buffer struct wl_display *display; struct wl_compositor *compositor; struct zwlr_layer_shell_v1 *layer_shell; -- cgit v1.2.3 From f98f351a5275967c46482e1c9c754fee927d72ee Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 13 Oct 2018 17:06:33 +1000 Subject: swaylock: Don't wait too long for surface damage before verifying --- include/swaylock/swaylock.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/swaylock') diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index ae042c4f..e7165b3b 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -57,6 +57,7 @@ struct swaylock_state { struct loop *eventloop; struct loop_event *clear_indicator_timer; // clears the indicator struct loop_event *clear_password_timer; // clears the password buffer + struct loop_event *verify_password_timer; struct wl_display *display; struct wl_compositor *compositor; struct zwlr_layer_shell_v1 *layer_shell; -- cgit v1.2.3 From 6921fdc6d6134fd7aaf38ffc1686623eca9bbd18 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 14 Oct 2018 12:28:38 +1000 Subject: Remove timerfd from loop implementation timerfd doesn't work on the BSDs, so this replaces it with a timespec for the expiry and uses a poll timeout to check the timers when needed. --- include/swaylock/swaylock.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/swaylock') diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index e7165b3b..25b41a71 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h @@ -55,9 +55,9 @@ struct swaylock_password { struct swaylock_state { struct loop *eventloop; - struct loop_event *clear_indicator_timer; // clears the indicator - struct loop_event *clear_password_timer; // clears the password buffer - struct loop_event *verify_password_timer; + struct loop_timer *clear_indicator_timer; // clears the indicator + struct loop_timer *clear_password_timer; // clears the password buffer + struct loop_timer *verify_password_timer; struct wl_display *display; struct wl_compositor *compositor; struct zwlr_layer_shell_v1 *layer_shell; -- cgit v1.2.3