github/awatcher
1
1
Fork 0
mirror of https://github.com/2e3s/awatcher.git synced 2025-06-07 03:55:29 +00:00
Code Issues 17 Packages Projects Releases Wiki Activity

Correct last input for idle timeout for Wayland handlers

Browse Source
This commit is contained in:
Demmie 2024-05-16 00:48:16 -04:00
parent be59315e8a
commit f960dd6697
No known key found for this signature in database
GPG Key ID: B06DAA3D432C6E9A
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
watchers/src/watchers/wl_ext_idle_notify.rs
View File

@ -19,6 +19,7 @@ struct IdleState {
last_input_time: DateTime<Utc>, last_input_time: DateTime<Utc>,
is_idle: bool, is_idle: bool,
is_changed: bool, is_changed: bool,
idle_timeout: Duration,
} }
impl Drop for IdleState { impl Drop for IdleState {
@ -29,18 +30,20 @@ impl Drop for IdleState {
} }
impl IdleState { impl IdleState {
fn new(idle_notification: ExtIdleNotificationV1) -> Self { fn new(idle_notification: ExtIdleNotificationV1, idle_timeout: Duration) -> Self {
Self { Self {
idle_notification, idle_notification,
last_input_time: Utc::now(), last_input_time: Utc::now(),
is_idle: false, is_idle: false,
is_changed: false, is_changed: false,
idle_timeout,
} }
} }
fn idle(&mut self) { fn idle(&mut self) {
self.is_idle = true; self.is_idle = true;
self.is_changed = true; self.is_changed = true;
self.last_input_time -= self.idle_timeout;
debug!("Idle"); debug!("Idle");
} }
@ -138,6 +141,7 @@ impl Watcher for IdleWatcher {
connection connection
.get_ext_idle_notification(timeout.unwrap()) .get_ext_idle_notification(timeout.unwrap())
.unwrap(), .unwrap(),
Duration::from_std(client.config.idle_timeout).unwrap(),
); );
connection.event_queue.roundtrip(&mut idle_state).unwrap(); connection.event_queue.roundtrip(&mut idle_state).unwrap();

17
watchers/src/watchers/wl_kwin_idle.rs
View File

@ -16,32 +16,35 @@ use wayland_protocols_plasma::idle::client::org_kde_kwin_idle_timeout::{
}; };
struct IdleState { struct IdleState {
idle_timeout: OrgKdeKwinIdleTimeout, kwin_idle_timeout: OrgKdeKwinIdleTimeout,
last_input_time: DateTime<Utc>, last_input_time: DateTime<Utc>,
is_idle: bool, is_idle: bool,
is_changed: bool, is_changed: bool,
idle_timeout: Duration,
} }
impl Drop for IdleState { impl Drop for IdleState {
fn drop(&mut self) { fn drop(&mut self) {
info!("Releasing idle timeout"); info!("Releasing idle timeout");
self.idle_timeout.release(); self.kwin_idle_timeout.release();
} }
} }
impl IdleState { impl IdleState {
fn new(idle_timeout: OrgKdeKwinIdleTimeout) -> Self { fn new(kwin_idle_timeout: OrgKdeKwinIdleTimeout, idle_timeout: Duration) -> Self {
Self { Self {
idle_timeout, kwin_idle_timeout,
last_input_time: Utc::now(), last_input_time: Utc::now(),
is_idle: false, is_idle: false,
is_changed: false, is_changed: false,
idle_timeout,
} }
} }
fn idle(&mut self) { fn idle(&mut self) {
self.is_idle = true; self.is_idle = true;
self.is_changed = true; self.is_changed = true;
self.last_input_time -= self.idle_timeout;
debug!("Idle"); debug!("Idle");
} }
@ -135,8 +138,10 @@ impl Watcher for IdleWatcher {
connection.get_kwin_idle()?; connection.get_kwin_idle()?;
let timeout = u32::try_from(client.config.idle_timeout.as_secs() * 1000); let timeout = u32::try_from(client.config.idle_timeout.as_secs() * 1000);
let mut idle_state = let mut idle_state = IdleState::new(
IdleState::new(connection.get_kwin_idle_timeout(timeout.unwrap()).unwrap()); connection.get_kwin_idle_timeout(timeout.unwrap()).unwrap(),
Duration::from_std(client.config.idle_timeout).unwrap(),
);
connection.event_queue.roundtrip(&mut idle_state).unwrap(); connection.event_queue.roundtrip(&mut idle_state).unwrap();
Ok(Self { Ok(Self {