Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve logging around wayland/x11 init

Browse Source
This commit is contained in:
galister
2025-05-10 16:52:35 +09:00
parent ed5b0307d7
commit a221734e23
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -5271,8 +5271,8 @@ dependencies = [
[[package]] [[package]]
name = "wlx-capture" name = "wlx-capture"
version = "0.5.2" version = "0.5.3"
source = "git+https://github.com/galister/wlx-capture?tag=v0.5.2#c68c66d487ef0f57bab23b5c780472a31a01ecab" source = "git+https://github.com/galister/wlx-capture?tag=v0.5.3#4479bd4bdd2b570aec9692e55b513ec7c0a17e7f"
dependencies = [ dependencies = [
"ashpd", "ashpd",
"drm-fourcc", "drm-fourcc",

2
Cargo.toml
View File

@@ -58,7 +58,7 @@ sysinfo = { version = "0.34.2" }
thiserror = "2.0.3" thiserror = "2.0.3"
vulkano = { version = "0.35.1" } vulkano = { version = "0.35.1" }
vulkano-shaders = { version = "0.35.0" } 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 } libmonado = { version = "1.3.2", optional = true }
winit = { version = "0.30.0", optional = true } winit = { version = "0.30.0", optional = true }
xdg = "2.5.2" xdg = "2.5.2"

4
src/backend/common.rs
View File

@@ -67,18 +67,20 @@ where
app.screens.clear(); app.screens.clear();
let data = if let Some(wl) = wl.as_mut() { let data = if let Some(wl) = wl.as_mut() {
log::info!("Wayland detected.");
keymap = get_keymap_wl() keymap = get_keymap_wl()
.map_err(|f| log::warn!("Could not load keyboard layout: {f}")) .map_err(|f| log::warn!("Could not load keyboard layout: {f}"))
.ok(); .ok();
crate::overlays::screen::create_screens_wayland(wl, app) crate::overlays::screen::create_screens_wayland(wl, app)
} else { } else {
log::info!("Wayland not detected, assuming X11.");
keymap = get_keymap_x11() keymap = get_keymap_x11()
.map_err(|f| log::warn!("Could not load keyboard layout: {f}")) .map_err(|f| log::warn!("Could not load keyboard layout: {f}"))
.ok(); .ok();
match crate::overlays::screen::create_screens_x11pw(app) { match crate::overlays::screen::create_screens_x11pw(app) {
Ok(data) => data, Ok(data) => data,
Err(e) => { 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)? crate::overlays::screen::create_screens_xshm(app)?
} }
} }