Skip to content

Make sure pending resume commands still get run regardless of logind idle inhibitors #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make sure pending resume commands still get run regardless of logind idle inhibitors #116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff8fbc3
Make sure pending resume commands still get run regardless of logind …
duxovni Jan 18, 2022
68852dc
Update PR for ext-idle-notify-v1
duxovni Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,9 @@ static void enable_timeouts(void) {
state.timeouts_enabled = true;
struct swayidle_timeout_cmd *cmd;
wl_list_for_each(cmd, &state.timeout_cmds, link) {
register_timeout(cmd, cmd->timeout);
if ((cmd->idle_notification == NULL && cmd->kde_idle_timer == NULL) || !cmd->resume_pending) {
register_timeout(cmd, cmd->timeout);
}
}
}

Expand All @@ -637,7 +639,9 @@ static void disable_timeouts(void) {
state.timeouts_enabled = false;
struct swayidle_timeout_cmd *cmd;
wl_list_for_each(cmd, &state.timeout_cmds, link) {
destroy_cmd_timer(cmd);
if (!cmd->resume_pending) {
destroy_cmd_timer(cmd);
}
}
if (state.logind_idlehint) {
set_idle_hint(false);
Expand All @@ -661,7 +665,9 @@ static void handle_idled(struct swayidle_timeout_cmd *cmd) {
static void handle_resumed(struct swayidle_timeout_cmd *cmd) {
cmd->resume_pending = false;
swayidle_log(LOG_DEBUG, "active state");
if (cmd->registered_timeout != cmd->timeout) {
if (!state.timeouts_enabled) {
destroy_cmd_timer(cmd);
} else if (cmd->registered_timeout != cmd->timeout) {
register_timeout(cmd, cmd->timeout);
}
#if HAVE_SYSTEMD || HAVE_ELOGIND
Expand Down