From a221734e23f2661c1227edaa943ccd42e1762db8 Mon Sep 17 00:00:00 2001 From: galister <22305755+galister@users.noreply.github.com> Date: Sat, 10 May 2025 16:52:35 +0900 Subject: [PATCH] improve logging around wayland/x11 init --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/backend/common.rs | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b78d87..3b37b9a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5271,8 +5271,8 @@ dependencies = [ [[package]] name = "wlx-capture" -version = "0.5.2" -source = "git+https://github.com/galister/wlx-capture?tag=v0.5.2#c68c66d487ef0f57bab23b5c780472a31a01ecab" +version = "0.5.3" +source = "git+https://github.com/galister/wlx-capture?tag=v0.5.3#4479bd4bdd2b570aec9692e55b513ec7c0a17e7f" dependencies = [ "ashpd", "drm-fourcc", diff --git a/Cargo.toml b/Cargo.toml index a79504e..9f74e9b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ sysinfo = { version = "0.34.2" } thiserror = "2.0.3" vulkano = { version = "0.35.1" } vulkano-shaders = { version = "0.35.0" } -wlx-capture = { git = "https://github.com/galister/wlx-capture", tag = "v0.5.2", default-features = false } +wlx-capture = { git = "https://github.com/galister/wlx-capture", tag = "v0.5.3", default-features = false } libmonado = { version = "1.3.2", optional = true } winit = { version = "0.30.0", optional = true } xdg = "2.5.2" diff --git a/src/backend/common.rs b/src/backend/common.rs index 4877c04..b30da48 100644 --- a/src/backend/common.rs +++ b/src/backend/common.rs @@ -67,18 +67,20 @@ where app.screens.clear(); let data = if let Some(wl) = wl.as_mut() { + log::info!("Wayland detected."); keymap = get_keymap_wl() .map_err(|f| log::warn!("Could not load keyboard layout: {f}")) .ok(); crate::overlays::screen::create_screens_wayland(wl, app) } else { + log::info!("Wayland not detected, assuming X11."); keymap = get_keymap_x11() .map_err(|f| log::warn!("Could not load keyboard layout: {f}")) .ok(); match crate::overlays::screen::create_screens_x11pw(app) { Ok(data) => data, Err(e) => { - log::info!("Will not use PipeWire capture: {e:?}"); + log::info!("Will not use X11 PipeWire capture: {e:?}"); crate::overlays::screen::create_screens_xshm(app)? } }