Merge pull request #326 from MaxVerevkin/remove-dup-code

output: remove some duplicating code and simplify wl_output::Event::Mode hangling

Author: wash2

src/output.rs

@@ -401,6 +401,13 @@ where
         conn: &Connection,
         qh: &QueueHandle<D>,
     ) {
+        let inner = state
+            .output_state()
+            .outputs
+            .iter_mut()
+            .find(|inner| &inner.wl_output == output)
+            .expect("Received event for dead output");
+
         match event {
             wl_output::Event::Geometry {
                 x,
@@ -412,13 +419,6 @@ where
                 model,
                 transform,
             } => {
-                let inner = state
-                    .output_state()
-                    .outputs
-                    .iter_mut()
-                    .find(|inner| &inner.wl_output == output)
-                    .expect("Received event for dead output");
-
                 inner.pending_info.location = (x, y);
                 inner.pending_info.physical_size = (physical_width, physical_height);
                 inner.pending_info.subpixel = match subpixel {
@@ -435,21 +435,10 @@ where
             }
 
             wl_output::Event::Mode { flags, width, height, refresh } => {
-                let inner = state
-                    .output_state()
-                    .outputs
-                    .iter_mut()
-                    .find(|inner| &inner.wl_output == output)
-                    .expect("Received event for dead output");
-
-                if let Some((index, _)) =
-                    inner.pending_info.modes.iter().enumerate().find(|(_, mode)| {
-                        mode.dimensions == (width, height) && mode.refresh_rate == refresh
-                    })
-                {
-                    // We found a match, remove the old mode.
-                    inner.pending_info.modes.remove(index);
-                }
+                // Remove the old mode
+                inner.pending_info.modes.retain(|mode| {
+                    mode.dimensions != (width, height) || mode.refresh_rate != refresh
+                });
 
                 let flags = match flags {
                     WEnum::Value(flags) => flags,
@@ -459,81 +448,49 @@ where
                 let current = flags.contains(wl_output::Mode::Current);
                 let preferred = flags.contains(wl_output::Mode::Preferred);
 
-                // Now create the new mode.
-                inner.pending_info.modes.push(Mode {
-                    dimensions: (width, height),
-                    refresh_rate: refresh,
-                    current,
-                    preferred,
-                });
-
-                let index = inner.pending_info.modes.len() - 1;
-
                 // Any mode that isn't current is deprecated, let's deprecate any existing modes that may be
                 // marked as current.
                 //
                 // If a new mode is advertised as preferred, then mark the existing preferred mode as not.
-                inner.pending_info.modes.iter_mut().enumerate().for_each(|(mode_index, mode)| {
-                    if index != mode_index {
-                        // This mode is no longer preferred.
-                        if mode.preferred && preferred {
-                            mode.preferred = false;
-                        }
+                for mode in &mut inner.pending_info.modes {
+                    // This mode is no longer preferred.
+                    if preferred {
+                        mode.preferred = false;
+                    }
 
-                        // This mode is no longer current.
-                        if mode.current && current {
-                            mode.current = false;
-                        }
+                    // This mode is no longer current.
+                    if current {
+                        mode.current = false;
                     }
+                }
+
+                // Now create the new mode.
+                inner.pending_info.modes.push(Mode {
+                    dimensions: (width, height),
+                    refresh_rate: refresh,
+                    current,
+                    preferred,
                 });
 
                 inner.pending_wl = true;
             }
 
             wl_output::Event::Scale { factor } => {
-                let inner = state
-                    .output_state()
-                    .outputs
-                    .iter_mut()
-                    .find(|inner| &inner.wl_output == output)
-                    .expect("Received event for dead output");
-
                 inner.pending_info.scale_factor = factor;
                 inner.pending_wl = true;
             }
 
             wl_output::Event::Name { name } => {
-                let inner = state
-                    .output_state()
-                    .outputs
-                    .iter_mut()
-                    .find(|inner| &inner.wl_output == output)
-                    .expect("Received event for dead output");
-
                 inner.pending_info.name = Some(name);
                 inner.pending_wl = true;
             }
 
             wl_output::Event::Description { description } => {
-                let inner = state
-                    .output_state()
-                    .outputs
-                    .iter_mut()
-                    .find(|inner| &inner.wl_output == output)
-                    .expect("Received event for dead output");
-
                 inner.pending_info.description = Some(description);
                 inner.pending_wl = true;
             }
 
             wl_output::Event::Done => {
-                let inner = state
-                    .output_state()
-                    .outputs
-                    .iter_mut()
-                    .find(|inner| &inner.wl_output == output)
-                    .expect("Received event for dead output");
-
                 let info = inner.pending_info.clone();
                 inner.current_info = Some(info.clone());
                 inner.pending_wl = false;