From 01e3930cedfd760c465aad41dd60aab9f9493aa1 Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Thu, 15 Feb 2024 18:40:29 +0100 Subject: [PATCH] wayland: run idle code unconditionally --- src/backend.rs | 4 ---- src/backends/metal.rs | 4 ---- src/globals.rs | 4 +--- src/it/test_backend.rs | 4 ---- src/tasks/idle.rs | 3 --- 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/backend.rs b/src/backend.rs index 318d8c4b..75410dd9 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -32,10 +32,6 @@ pub trait Backend { let _ = idle; } - fn supports_idle(&self) -> bool { - false - } - fn import_environment(&self) -> bool { false } diff --git a/src/backends/metal.rs b/src/backends/metal.rs index b3c3a212..0d323120 100644 --- a/src/backends/metal.rs +++ b/src/backends/metal.rs @@ -198,10 +198,6 @@ impl Backend for MetalBackend { } } - fn supports_idle(&self) -> bool { - true - } - fn import_environment(&self) -> bool { true } diff --git a/src/globals.rs b/src/globals.rs index 93430b82..3015ca95 100644 --- a/src/globals.rs +++ b/src/globals.rs @@ -166,6 +166,7 @@ impl Globals { add_singleton!(WpContentTypeManagerV1Global); add_singleton!(XdgActivationV1Global); add_singleton!(ExtForeignToplevelListV1Global); + add_singleton!(ZwpIdleInhibitManagerV1Global); } pub fn add_backend_singletons(&self, backend: &Rc) { @@ -174,9 +175,6 @@ impl Globals { self.add_global_no_broadcast(&Rc::new($name::new(self.name()))); }; } - if backend.supports_idle() { - add_singleton!(ZwpIdleInhibitManagerV1Global); - } if backend.supports_presentation_feedback() { add_singleton!(WpPresentationGlobal); } diff --git a/src/it/test_backend.rs b/src/it/test_backend.rs index d6f99a69..5391347e 100644 --- a/src/it/test_backend.rs +++ b/src/it/test_backend.rs @@ -206,10 +206,6 @@ impl Backend for TestBackend { fn set_idle(&self, _idle: bool) {} - fn supports_idle(&self) -> bool { - true - } - fn supports_presentation_feedback(&self) -> bool { true } diff --git a/src/tasks/idle.rs b/src/tasks/idle.rs index 936c0d47..e785f3ea 100644 --- a/src/tasks/idle.rs +++ b/src/tasks/idle.rs @@ -13,9 +13,6 @@ use { }; pub async fn idle(state: Rc, backend: Rc) { - if !backend.supports_idle() { - return; - } let timer = match TimerFd::new(c::CLOCK_MONOTONIC) { Ok(t) => t, Err(e) => {