andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-22 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Put Outputs config into a dedicated struct

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-07-04 17:51:11 +04:00
parent 43df7fad46
commit 9dcc9160b3
5 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/niri.rs
+7 -21
View File
@@ -156,7 +156,7 @@ pub struct Niri {
/// This does not include transient output config changes done via IPC. It is only used when
/// reloading the config from disk to determine if the output configuration should be reloaded
/// (and transient changes dropped).
pub config_file_output_config: Vec<niri_config::Output>,
pub config_file_output_config: niri_config::Outputs,
pub event_loop: LoopHandle<'static, State>,
pub scheduler: Scheduler<()>,
@@ -1058,10 +1058,7 @@ impl State {
for output in self.niri.global_space.outputs() {
let name = output.name();
let config = self.niri.config.borrow_mut();
let config = config
.outputs
.iter()
.find(|o| o.name.eq_ignore_ascii_case(&name));
let config = config.outputs.find(&name);
let scale = config
.and_then(|c| c.scale)
@@ -1113,18 +1110,14 @@ impl State {
pub fn apply_transient_output_config(&mut self, name: &str, action: niri_ipc::OutputAction) {
{
let mut config = self.niri.config.borrow_mut();
let config = if let Some(config) = config
.outputs
.iter_mut()
.find(|o| o.name.eq_ignore_ascii_case(name))
{
let config = if let Some(config) = config.outputs.find_mut(name) {
config
} else {
config.outputs.push(niri_config::Output {
config.outputs.0.push(niri_config::Output {
name: String::from(name),
..Default::default()
});
config.outputs.last_mut().unwrap()
config.outputs.0.last_mut().unwrap()
};
match action {
@@ -1753,11 +1746,7 @@ impl Niri {
for output in self.global_space.outputs().chain(new_output) {
let name = output.name();
let position = self.global_space.output_geometry(output).map(|geo| geo.loc);
let config = config
.outputs
.iter()
.find(|o| o.name.eq_ignore_ascii_case(&name))
.and_then(|c| c.position);
let config = config.outputs.find(&name).and_then(|c| c.position);
outputs.push(Data {
output: output.clone(),
@@ -1862,10 +1851,7 @@ impl Niri {
let name = output.name();
let config = self.config.borrow();
let c = config
.outputs
.iter()
.find(|o| o.name.eq_ignore_ascii_case(&name));
let c = config.outputs.find(&name);
let scale = c.and_then(|c| c.scale).map(|s| s.0).unwrap_or_else(|| {
let size_mm = output.physical_properties().size;
let resolution = output.current_mode().unwrap().size;