mirror of https://github.com/wayvr-org/wayvr.git
reduce indentations in block_inputs
This commit is contained in:
parent
26f078d512
commit
4afaa6d048
|
|
@ -1,5 +1,6 @@
|
||||||
use libmonado::{BlockFlags, ClientLogic, ClientState, Monado, Version};
|
use libmonado::{BlockFlags, ClientLogic, ClientState, Monado, Version};
|
||||||
use log::{trace, warn};
|
use log::trace;
|
||||||
|
use wgui::log::LogErr;
|
||||||
|
|
||||||
use crate::state::AppState;
|
use crate::state::AppState;
|
||||||
|
|
||||||
|
|
@ -57,47 +58,37 @@ impl InputBlocker {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn block_inputs(&self, monado: &mut Monado, block_inputs: bool, block_poses: bool) {
|
fn block_inputs(&self, monado: &mut Monado, block_inputs: bool, block_poses: bool) {
|
||||||
match monado.clients() {
|
let Ok(clients) = monado
|
||||||
Ok(clients) => {
|
.clients()
|
||||||
for mut client in clients {
|
.log_warn("Failed to get clients from Monado")
|
||||||
match client.name() {
|
else {
|
||||||
Ok(n) => {
|
return;
|
||||||
if n == "wayvr" {
|
};
|
||||||
continue;
|
for mut client in clients {
|
||||||
}
|
let Ok(name) = client.name().log_warn("Failed to get client name") else {
|
||||||
}
|
continue;
|
||||||
Err(e) => {
|
};
|
||||||
warn!("Failed to get client name: {e}");
|
if name == "wayvr" {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
let Ok(state) = client.state().log_warn("Failed to get client state") else {
|
||||||
let state = match client.state() {
|
continue;
|
||||||
Ok(s) => s,
|
};
|
||||||
Err(e) => {
|
|
||||||
warn!("Failed to get client state: {e}");
|
if state.contains(ClientState::ClientSessionVisible) {
|
||||||
continue;
|
let _ = if self.use_io_blocks {
|
||||||
}
|
let flags = match (block_inputs, block_poses) {
|
||||||
};
|
(true, true) => BlockFlags::BlockPoses | BlockFlags::BlockInputs,
|
||||||
|
(true, false) => BlockFlags::BlockInputs.into(),
|
||||||
if state.contains(ClientState::ClientSessionVisible) {
|
(false, _) => BlockFlags::None.into(),
|
||||||
let r = if self.use_io_blocks {
|
};
|
||||||
let flags = match (block_inputs, block_poses) {
|
client.set_io_blocks(flags)
|
||||||
(true, true) => BlockFlags::BlockPoses | BlockFlags::BlockInputs,
|
} else {
|
||||||
(true, false) => BlockFlags::BlockInputs.into(),
|
client.set_io_active(!block_inputs)
|
||||||
(false, _) => BlockFlags::None.into(),
|
}
|
||||||
};
|
.log_warn("Failed to set IO active for client");
|
||||||
client.set_io_blocks(flags)
|
|
||||||
} else {
|
|
||||||
client.set_io_active(!block_inputs)
|
|
||||||
};
|
|
||||||
if let Err(e) = r {
|
|
||||||
warn!("Failed to set io active for client: {e}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Err(e) => warn!("Failed to get clients from Monado: {e}"),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue