Skip to content

Commit f463e83

Browse files
committed
output: remove some duplicating code
1 parent 638ca60 commit f463e83

File tree

1 file changed

+7
-42
lines changed

1 file changed

+7
-42
lines changed

src/output.rs

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,13 @@ where
402402
conn: &Connection,
403403
qh: &QueueHandle<D>,
404404
) {
405+
let inner = state
406+
.output_state()
407+
.outputs
408+
.iter_mut()
409+
.find(|inner| &inner.wl_output == output)
410+
.expect("Received event for dead output");
411+
405412
match event {
406413
wl_output::Event::Geometry {
407414
x,
@@ -413,13 +420,6 @@ where
413420
model,
414421
transform,
415422
} => {
416-
let inner = state
417-
.output_state()
418-
.outputs
419-
.iter_mut()
420-
.find(|inner| &inner.wl_output == output)
421-
.expect("Received event for dead output");
422-
423423
inner.pending_info.location = (x, y);
424424
inner.pending_info.physical_size = (physical_width, physical_height);
425425
inner.pending_info.subpixel = match subpixel {
@@ -436,13 +436,6 @@ where
436436
}
437437

438438
wl_output::Event::Mode { flags, width, height, refresh } => {
439-
let inner = state
440-
.output_state()
441-
.outputs
442-
.iter_mut()
443-
.find(|inner| &inner.wl_output == output)
444-
.expect("Received event for dead output");
445-
446439
if let Some((index, _)) =
447440
inner.pending_info.modes.iter().enumerate().find(|(_, mode)| {
448441
mode.dimensions == (width, height) && mode.refresh_rate == refresh
@@ -492,49 +485,21 @@ where
492485
}
493486

494487
wl_output::Event::Scale { factor } => {
495-
let inner = state
496-
.output_state()
497-
.outputs
498-
.iter_mut()
499-
.find(|inner| &inner.wl_output == output)
500-
.expect("Received event for dead output");
501-
502488
inner.pending_info.scale_factor = factor;
503489
inner.pending_wl = true;
504490
}
505491

506492
wl_output::Event::Name { name } => {
507-
let inner = state
508-
.output_state()
509-
.outputs
510-
.iter_mut()
511-
.find(|inner| &inner.wl_output == output)
512-
.expect("Received event for dead output");
513-
514493
inner.pending_info.name = Some(name);
515494
inner.pending_wl = true;
516495
}
517496

518497
wl_output::Event::Description { description } => {
519-
let inner = state
520-
.output_state()
521-
.outputs
522-
.iter_mut()
523-
.find(|inner| &inner.wl_output == output)
524-
.expect("Received event for dead output");
525-
526498
inner.pending_info.description = Some(description);
527499
inner.pending_wl = true;
528500
}
529501

530502
wl_output::Event::Done => {
531-
let inner = state
532-
.output_state()
533-
.outputs
534-
.iter_mut()
535-
.find(|inner| &inner.wl_output == output)
536-
.expect("Received event for dead output");
537-
538503
let info = inner.pending_info.clone();
539504
inner.current_info = Some(info.clone());
540505
inner.pending_wl = false;

0 commit comments

Comments
 (0)