mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-05 06:46:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjusted debug output

Browse source
This commit is contained in:
Mattias Eriksson 2018-04-28 09:43:05 +02:00
parent 20c113952a
commit 944f54da0d
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
sway/idle.c
View file

@ -53,7 +53,7 @@ bool have_lock() {
} }
} }
wlr_log(L_DEBUG, "No lock"); wlr_log(L_DEBUG, "No lockscreen found");
return false; return false;
} }
@ -62,7 +62,7 @@ static int ongoing_fd = -1;
static int inhibit_cnt=0; static int inhibit_cnt=0;
void release_lock() { void release_lock() {
wlr_log(L_DEBUG, "Release lock %d", ongoing_fd); wlr_log(L_INFO, "Release lock %d", ongoing_fd);
if (ongoing_fd >= 0) if (ongoing_fd >= 0)
close(ongoing_fd); close(ongoing_fd);
ongoing_fd = -1; ongoing_fd = -1;
@ -73,13 +73,13 @@ void release_lock() {
static int check_for_lockscreen(void *data) { static int check_for_lockscreen(void *data) {
struct sway_server *server = data; struct sway_server *server = data;
if(have_lock()) { //If we for some reason already have a lockscreen if(have_lock()) { //If we for some reason already have a lockscreen
wlr_log(L_INFO, "Got lock, will release inhibit lock"); wlr_log(L_DEBUG, "Got lock, will release inhibit lock");
release_lock(); release_lock();
return 0; return 0;
} }
if(inhibit_cnt > 4) { if(inhibit_cnt > 4) {
wlr_log(L_INFO, "Reached inhibit timeout, releasing lock"); wlr_log(L_DEBUG, "Reached inhibit timeout, releasing lock");
release_lock(); release_lock();
return 0; return 0;
} }
@ -92,20 +92,19 @@ static int check_for_lockscreen(void *data) {
static void prepare_for_sleep(struct wlr_session *session, bool going_down, void *data) { static void prepare_for_sleep(struct wlr_session *session, bool going_down, void *data) {
struct sway_server *server = data; struct sway_server *server = data;
wlr_log(L_INFO, "PrepareForSleep signal received %d", going_down); wlr_log(L_DEBUG, "PrepareForSleep signal received %d", going_down);
if (!going_down) { if (!going_down) {
lock_fd = wlr_session_aquire_sleep_lock(session); lock_fd = wlr_session_aquire_sleep_lock(session);
wlr_log(L_INFO, "Got new lock %d", lock_fd); wlr_log(L_DEBUG, "Got new lock %d", lock_fd);
return; return;
} }
ongoing_fd = lock_fd; ongoing_fd = lock_fd;
if(have_lock()) { //If we for some reason already have a lockscreen if(have_lock()) { //If we for some reason already have a lockscreen
wlr_log(L_INFO, "Already have lock, no action"); wlr_log(L_DEBUG, "Already have lock, no action");
release_lock(); release_lock();
return; return;
} }
wlr_log(L_INFO, "Starting lockscreen, holding lock %d", ongoing_fd); wlr_log(L_INFO, "Starting lockscreen, holding lock %d", ongoing_fd);
invoke_swaylock(); invoke_swaylock();
if (ongoing_fd>=0) { if (ongoing_fd>=0) {
struct wl_event_source *source = wl_event_loop_add_timer(server->wl_event_loop, check_for_lockscreen, server); struct wl_event_source *source = wl_event_loop_add_timer(server->wl_event_loop, check_for_lockscreen, server);
@ -115,8 +114,6 @@ static void prepare_for_sleep(struct wlr_session *session, bool going_down, void
} }
void setup_sleep_listener(struct sway_server *server) { void setup_sleep_listener(struct sway_server *server) {
struct wlr_session *session = NULL; struct wlr_session *session = NULL;
if (wlr_backend_is_multi(server->backend)) { if (wlr_backend_is_multi(server->backend)) {
session = wlr_multi_get_session(server->backend); session = wlr_multi_get_session(server->backend);
@ -127,7 +124,7 @@ void setup_sleep_listener(struct sway_server *server) {
wlr_session_prepare_for_sleep_listen(session, prepare_for_sleep, server); wlr_session_prepare_for_sleep_listen(session, prepare_for_sleep, server);
lock_fd = wlr_session_aquire_sleep_lock(session); lock_fd = wlr_session_aquire_sleep_lock(session);
wlr_log(L_INFO, "Got initial lock %d", lock_fd); wlr_log(L_DEBUG, "Got initial lock %d", lock_fd);
} }
static int handle_idle(void* data) { static int handle_idle(void* data) {