From b6c5d00becf1571a0d81478973178c367a2524a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <150025636+git-f0x@users.noreply.github.com> Date: Thu, 16 Oct 2025 16:10:35 +0200 Subject: [PATCH] cargo fmt --- build.rs | 5 +- src/backend/kms/surface/timings.rs | 4 +- src/backend/render/mod.rs | 403 +++++++++--------- src/config/input_config.rs | 4 +- src/dbus/mod.rs | 2 - src/main.rs | 10 +- src/shell/element/window.rs | 8 +- src/shell/grabs/menu/default.rs | 3 +- src/shell/grabs/menu/mod.rs | 50 +-- src/shell/grabs/moving.rs | 14 +- src/shell/layout/tiling/grabs/resize.rs | 4 +- src/state.rs | 10 +- src/wayland/handlers/buffer.rs | 6 +- src/wayland/handlers/pointer_constraints.rs | 3 +- src/wayland/handlers/xdg_shell/mod.rs | 8 +- .../protocols/output_configuration/mod.rs | 3 +- src/wayland/protocols/screencopy.rs | 4 +- 17 files changed, 264 insertions(+), 277 deletions(-) diff --git a/build.rs b/build.rs index a8f895be..b1cfaa97 100644 --- a/build.rs +++ b/build.rs @@ -2,10 +2,7 @@ use std::process::Command; fn main() { - if let Ok(output) = Command::new("git") - .args(["rev-parse", "HEAD"]) - .output() - { + if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() { let git_hash = String::from_utf8(output.stdout).unwrap(); println!("cargo:rustc-env=GIT_HASH={}", git_hash); } diff --git a/src/backend/kms/surface/timings.rs b/src/backend/kms/surface/timings.rs index 06dca0f9..d2bc5efa 100644 --- a/src/backend/kms/surface/timings.rs +++ b/src/backend/kms/surface/timings.rs @@ -141,9 +141,7 @@ impl Timings { if let Some(frame) = self.pending_frame.as_mut() { frame.render_duration_draw = Some( Time::elapsed(&frame.render_start, clock.now()) - - frame - .render_duration_elements - .unwrap_or(Duration::ZERO), + - frame.render_duration_elements.unwrap_or(Duration::ZERO), ); } } diff --git a/src/backend/render/mod.rs b/src/backend/render/mod.rs index e11fc832..b5737c70 100644 --- a/src/backend/render/mod.rs +++ b/src/backend/render/mod.rs @@ -773,223 +773,208 @@ where ) }; - render_input_order::<()>( - &shell, - output, - previous, - current, - element_filter, - |stage| { - match stage { - Stage::ZoomUI => { - elements.extend(ZoomState::render(renderer, output)); - } - Stage::SessionLock(lock_surface) => { - elements.extend( - session_lock_elements(renderer, output, lock_surface) - .into_iter() - .map(Into::into) - .flat_map(crop_to_output) - .map(Into::into), - ); - } - Stage::LayerPopup { - popup, location, .. - } => { - elements.extend( - render_elements_from_surface_tree::<_, WorkspaceRenderElement<_>>( - renderer, - popup.wl_surface(), - location - .to_local(output) - .as_logical() - .to_physical_precise_round(scale), - Scale::from(scale), - 1.0, - FRAME_TIME_FILTER, - ) + render_input_order::<()>(&shell, output, previous, current, element_filter, |stage| { + match stage { + Stage::ZoomUI => { + elements.extend(ZoomState::render(renderer, output)); + } + Stage::SessionLock(lock_surface) => { + elements.extend( + session_lock_elements(renderer, output, lock_surface) .into_iter() - .flat_map(crop_to_output) - .map(Into::into), - ); - } - Stage::LayerSurface { layer, location } => { - elements.extend( - render_elements_from_surface_tree::<_, WorkspaceRenderElement<_>>( - renderer, - layer.wl_surface(), - location - .to_local(output) - .as_logical() - .to_physical_precise_round(scale), - Scale::from(scale), - 1.0, - FRAME_TIME_FILTER, - ) - .into_iter() - .flat_map(crop_to_output) - .map(Into::into), - ); - } - Stage::OverrideRedirect { surface, location } => { - elements.extend(surface.wl_surface().into_iter().flat_map(|surface| { - render_elements_from_surface_tree::<_, WorkspaceRenderElement<_>>( - renderer, - &surface, - location - .to_local(output) - .as_logical() - .to_physical_precise_round(scale), - Scale::from(scale), - 1.0, - FRAME_TIME_FILTER, - ) - .into_iter() - .flat_map(crop_to_output) .map(Into::into) - })); - } - Stage::StickyPopups(layout) => { - let alpha = match &overview.0 { - OverviewMode::Started(_, started) => { - (1.0 - (Instant::now().duration_since(*started).as_millis() - / ANIMATION_DURATION.as_millis()) - as f32) - .max(0.0) - * 0.4 - + 0.6 - } - OverviewMode::Ended(_, ended) => { - ((Instant::now().duration_since(*ended).as_millis() - / ANIMATION_DURATION.as_millis()) - as f32) - * 0.4 - + 0.6 - } - OverviewMode::Active(_) => 0.6, - OverviewMode::None => 1.0, - }; - - elements.extend( - layout - .render_popups(renderer, alpha) - .into_iter() - .map(Into::into) - .flat_map(crop_to_output) - .map(Into::into), - ); - } - Stage::Sticky(layout) => { - let alpha = match &overview.0 { - OverviewMode::Started(_, started) => { - (1.0 - (Instant::now().duration_since(*started).as_millis() - / ANIMATION_DURATION.as_millis()) - as f32) - .max(0.0) - * 0.4 - + 0.6 - } - OverviewMode::Ended(_, ended) => { - ((Instant::now().duration_since(*ended).as_millis() - / ANIMATION_DURATION.as_millis()) - as f32) - * 0.4 - + 0.6 - } - OverviewMode::Active(_) => 0.6, - OverviewMode::None => 1.0, - }; - - let current_focus = (!move_active && is_active_space) - .then_some(last_active_seat) - .map(|seat| workspace.focus_stack.get(seat)); - - elements.extend( - layout - .render( - renderer, - current_focus.as_ref().and_then(|stack| { - stack.last().and_then(|t| match t { - FocusTarget::Window(w) => Some(w), - _ => None, - }) - }), - resize_indicator.clone(), - active_hint, - alpha, - theme.cosmic(), - ) - .into_iter() - .map(Into::into) - .flat_map(crop_to_output) - .map(Into::into), + .flat_map(crop_to_output) + .map(Into::into), + ); + } + Stage::LayerPopup { + popup, location, .. + } => { + elements.extend( + render_elements_from_surface_tree::<_, WorkspaceRenderElement<_>>( + renderer, + popup.wl_surface(), + location + .to_local(output) + .as_logical() + .to_physical_precise_round(scale), + Scale::from(scale), + 1.0, + FRAME_TIME_FILTER, ) - } - Stage::WorkspacePopups { workspace, offset } => { - elements.extend( - match workspace.render_popups( + .into_iter() + .flat_map(crop_to_output) + .map(Into::into), + ); + } + Stage::LayerSurface { layer, location } => { + elements.extend( + render_elements_from_surface_tree::<_, WorkspaceRenderElement<_>>( + renderer, + layer.wl_surface(), + location + .to_local(output) + .as_logical() + .to_physical_precise_round(scale), + Scale::from(scale), + 1.0, + FRAME_TIME_FILTER, + ) + .into_iter() + .flat_map(crop_to_output) + .map(Into::into), + ); + } + Stage::OverrideRedirect { surface, location } => { + elements.extend(surface.wl_surface().into_iter().flat_map(|surface| { + render_elements_from_surface_tree::<_, WorkspaceRenderElement<_>>( + renderer, + &surface, + location + .to_local(output) + .as_logical() + .to_physical_precise_round(scale), + Scale::from(scale), + 1.0, + FRAME_TIME_FILTER, + ) + .into_iter() + .flat_map(crop_to_output) + .map(Into::into) + })); + } + Stage::StickyPopups(layout) => { + let alpha = match &overview.0 { + OverviewMode::Started(_, started) => { + (1.0 - (Instant::now().duration_since(*started).as_millis() + / ANIMATION_DURATION.as_millis()) as f32) + .max(0.0) + * 0.4 + + 0.6 + } + OverviewMode::Ended(_, ended) => { + ((Instant::now().duration_since(*ended).as_millis() + / ANIMATION_DURATION.as_millis()) as f32) + * 0.4 + + 0.6 + } + OverviewMode::Active(_) => 0.6, + OverviewMode::None => 1.0, + }; + + elements.extend( + layout + .render_popups(renderer, alpha) + .into_iter() + .map(Into::into) + .flat_map(crop_to_output) + .map(Into::into), + ); + } + Stage::Sticky(layout) => { + let alpha = match &overview.0 { + OverviewMode::Started(_, started) => { + (1.0 - (Instant::now().duration_since(*started).as_millis() + / ANIMATION_DURATION.as_millis()) as f32) + .max(0.0) + * 0.4 + + 0.6 + } + OverviewMode::Ended(_, ended) => { + ((Instant::now().duration_since(*ended).as_millis() + / ANIMATION_DURATION.as_millis()) as f32) + * 0.4 + + 0.6 + } + OverviewMode::Active(_) => 0.6, + OverviewMode::None => 1.0, + }; + + let current_focus = (!move_active && is_active_space) + .then_some(last_active_seat) + .map(|seat| workspace.focus_stack.get(seat)); + + elements.extend( + layout + .render( renderer, - last_active_seat, - !move_active && is_active_space, - overview.clone(), - theme.cosmic(), - ) { - Ok(elements) => { - elements - .into_iter() - .flat_map(crop_to_output) - .map(|element| { - CosmicElement::Workspace( - RelocateRenderElement::from_element( - element, - offset.to_physical_precise_round(scale), - Relocate::Relative, - ), - ) - }) - } - Err(_) => { - return ControlFlow::Break(Err(OutputNoMode)); - } - }, - ); - } - Stage::Workspace { workspace, offset } => { - elements.extend( - match workspace.render( - renderer, - last_active_seat, - !move_active && is_active_space, - overview.clone(), + current_focus.as_ref().and_then(|stack| { + stack.last().and_then(|t| match t { + FocusTarget::Window(w) => Some(w), + _ => None, + }) + }), resize_indicator.clone(), active_hint, + alpha, theme.cosmic(), - ) { - Ok(elements) => { - elements - .into_iter() - .flat_map(crop_to_output) - .map(|element| { - CosmicElement::Workspace( - RelocateRenderElement::from_element( - element, - offset.to_physical_precise_round(scale), - Relocate::Relative, - ), - ) - }) - } - Err(_) => { - return ControlFlow::Break(Err(OutputNoMode)); - } - }, - ); - } - }; + ) + .into_iter() + .map(Into::into) + .flat_map(crop_to_output) + .map(Into::into), + ) + } + Stage::WorkspacePopups { workspace, offset } => { + elements.extend( + match workspace.render_popups( + renderer, + last_active_seat, + !move_active && is_active_space, + overview.clone(), + theme.cosmic(), + ) { + Ok(elements) => { + elements + .into_iter() + .flat_map(crop_to_output) + .map(|element| { + CosmicElement::Workspace(RelocateRenderElement::from_element( + element, + offset.to_physical_precise_round(scale), + Relocate::Relative, + )) + }) + } + Err(_) => { + return ControlFlow::Break(Err(OutputNoMode)); + } + }, + ); + } + Stage::Workspace { workspace, offset } => { + elements.extend( + match workspace.render( + renderer, + last_active_seat, + !move_active && is_active_space, + overview.clone(), + resize_indicator.clone(), + active_hint, + theme.cosmic(), + ) { + Ok(elements) => { + elements + .into_iter() + .flat_map(crop_to_output) + .map(|element| { + CosmicElement::Workspace(RelocateRenderElement::from_element( + element, + offset.to_physical_precise_round(scale), + Relocate::Relative, + )) + }) + } + Err(_) => { + return ControlFlow::Break(Err(OutputNoMode)); + } + }, + ); + } + }; - ControlFlow::Continue(()) - }, - )?; + ControlFlow::Continue(()) + })?; Ok(elements) } diff --git a/src/config/input_config.rs b/src/config/input_config.rs index e6cbb488..37ecf9d3 100644 --- a/src/config/input_config.rs +++ b/src/config/input_config.rs @@ -92,7 +92,9 @@ pub fn get_config<'a, T: 'a, F: Fn(&'a InputConfig) -> Option>( ) -> Option<(T, bool)> { if let Some(setting) = device_config.and_then(&f) { Some((setting, false)) - } else { f(default_config).map(|setting| (setting, true)) } + } else { + f(default_config).map(|setting| (setting, true)) + } } fn config_set_error( diff --git a/src/dbus/mod.rs b/src/dbus/mod.rs index 04c3f360..6f578928 100644 --- a/src/dbus/mod.rs +++ b/src/dbus/mod.rs @@ -49,8 +49,6 @@ pub fn init(evlh: &LoopHandle<'static, State>) -> Result> } } } - - } calloop::channel::Event::Closed => (), }) diff --git a/src/main.rs b/src/main.rs index 27222d63..5edcb8f8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -80,10 +80,12 @@ impl State { command.envs( session::get_env(&self.common).expect("WAYLAND_DISPLAY should be valid UTF-8"), ); - unsafe { command.pre_exec(|| { - utils::rlimit::restore_nofile_limit(); - Ok(()) - }) }; + unsafe { + command.pre_exec(|| { + utils::rlimit::restore_nofile_limit(); + Ok(()) + }) + }; info!("Running {:?}", exec); command diff --git a/src/shell/element/window.rs b/src/shell/element/window.rs index 46577359..b51252eb 100644 --- a/src/shell/element/window.rs +++ b/src/shell/element/window.rs @@ -804,11 +804,15 @@ impl PointerTarget for CosmicWindow { } fn axis(&self, seat: &Seat, data: &mut State, frame: AxisFrame) { - if let Some(Focus::Header) = self.0.with_program(|p| p.current_focus()) { PointerTarget::axis(&self.0, seat, data, frame) } + if let Some(Focus::Header) = self.0.with_program(|p| p.current_focus()) { + PointerTarget::axis(&self.0, seat, data, frame) + } } fn frame(&self, seat: &Seat, data: &mut State) { - if let Some(Focus::Header) = self.0.with_program(|p| p.current_focus()) { PointerTarget::frame(&self.0, seat, data) } + if let Some(Focus::Header) = self.0.with_program(|p| p.current_focus()) { + PointerTarget::frame(&self.0, seat, data) + } } fn leave(&self, seat: &Seat, data: &mut State, serial: Serial, time: u32) { diff --git a/src/shell/grabs/menu/default.rs b/src/shell/grabs/menu/default.rs index 46c9df2e..b2d9a12f 100644 --- a/src/shell/grabs/menu/default.rs +++ b/src/shell/grabs/menu/default.rs @@ -51,7 +51,8 @@ fn next_workspace( shell .workspaces .spaces_for_output(&output) - .skip_while(|space| space.handle != current_handle).nth(1) + .skip_while(|space| space.handle != current_handle) + .nth(1) .map(|space| (current_handle, space.handle)) } diff --git a/src/shell/grabs/menu/mod.rs b/src/shell/grabs/menu/mod.rs index 4c549abd..344bbb97 100644 --- a/src/shell/grabs/menu/mod.rs +++ b/src/shell/grabs/menu/mod.rs @@ -962,45 +962,35 @@ impl MenuAlignment { AxisAlignment::Centered, ) .into_iter() - .chain( - for_alignment( - position, - size, - AxisAlignment::Centered, - AxisAlignment::Corner(0), - ), - ) - .chain( - for_alignment( - position, - size, - AxisAlignment::Corner(0), - AxisAlignment::Centered, - ), - ) - .chain( - for_alignment( - position, - size, - AxisAlignment::Corner(0), - AxisAlignment::Corner(0), - ), - ) + .chain(for_alignment( + position, + size, + AxisAlignment::Centered, + AxisAlignment::Corner(0), + )) + .chain(for_alignment( + position, + size, + AxisAlignment::Corner(0), + AxisAlignment::Centered, + )) + .chain(for_alignment( + position, + size, + AxisAlignment::Corner(0), + AxisAlignment::Corner(0), + )) .collect(), (AxisAlignment::PreferCentered, y) => { for_alignment(position, size, AxisAlignment::Centered, y) .into_iter() - .chain( - for_alignment(position, size, AxisAlignment::Corner(0), y), - ) + .chain(for_alignment(position, size, AxisAlignment::Corner(0), y)) .collect() } (x, AxisAlignment::PreferCentered) => { for_alignment(position, size, x, AxisAlignment::Centered) .into_iter() - .chain( - for_alignment(position, size, x, AxisAlignment::Corner(0)), - ) + .chain(for_alignment(position, size, x, AxisAlignment::Corner(0))) .collect() } } diff --git a/src/shell/grabs/moving.rs b/src/shell/grabs/moving.rs index a5bf5b6a..77e0fd67 100644 --- a/src/shell/grabs/moving.rs +++ b/src/shell/grabs/moving.rs @@ -95,7 +95,8 @@ impl MoveGrabState { if output .geometry() .as_logical() - .intersection(window_geo).is_none() + .intersection(window_geo) + .is_none() { return Vec::new(); } @@ -113,8 +114,8 @@ impl MoveGrabState { .corner_radius(window_geo.size, self.indicator_thickness); let focus_element = if self.indicator_thickness > 0 { - Some( - CosmicMappedRenderElement::from(IndicatorShader::focus_element( + Some(CosmicMappedRenderElement::from( + IndicatorShader::focus_element( renderer, Key::Window(Usage::MoveGrabIndicator, self.window.key()), Rectangle::new( @@ -135,8 +136,8 @@ impl MoveGrabState { active_window_hint.green, active_window_hint.blue, ], - )), - ) + ), + )) } else { None }; @@ -435,8 +436,7 @@ impl MoveGrab { } } - let indicator_location = - shell.stacking_indicator(¤t_output, self.previous); + let indicator_location = shell.stacking_indicator(¤t_output, self.previous); if indicator_location.is_some() != grab_state.stacking_indicator.is_some() { grab_state.stacking_indicator = indicator_location.map(|geo| { let element = stack_hover( diff --git a/src/shell/layout/tiling/grabs/resize.rs b/src/shell/layout/tiling/grabs/resize.rs index db035c5b..17ec3b77 100644 --- a/src/shell/layout/tiling/grabs/resize.rs +++ b/src/shell/layout/tiling/grabs/resize.rs @@ -535,7 +535,9 @@ impl TouchGrab for ResizeForkGrab { event: &TouchMotionEvent, seq: Serial, ) { - if event.slot == >::start_data(self).slot && self.update_location(data, event.location, false) { + if event.slot == >::start_data(self).slot + && self.update_location(data, event.location, false) + { handle.unset_grab(self, data); } diff --git a/src/state.rs b/src/state.rs index 3340fbb9..30e031f1 100644 --- a/src/state.rs +++ b/src/state.rs @@ -336,9 +336,7 @@ impl BackendData { ) -> Result, anyhow::Error> { match self { BackendData::Kms(state) => { - return state - .dmabuf_imported(client, global, dmabuf) - .map(Some); + return state.dmabuf_imported(client, global, dmabuf).map(Some); } BackendData::Winit(state) => { state.backend.renderer().import_dmabuf(&dmabuf, None)?; @@ -574,12 +572,14 @@ impl From for KmsNodes { pub fn client_has_no_security_context(client: &Client) -> bool { client - .get_data::().is_none_or(|client_state| client_state.security_context.is_none()) + .get_data::() + .is_none_or(|client_state| client_state.security_context.is_none()) } pub fn client_is_privileged(client: &Client) -> bool { client - .get_data::().is_some_and(|client_state| client_state.privileged) + .get_data::() + .is_some_and(|client_state| client_state.privileged) } fn enable_wayland_security() -> bool { diff --git a/src/wayland/handlers/buffer.rs b/src/wayland/handlers/buffer.rs index 2bb6b4cc..b998fd87 100644 --- a/src/wayland/handlers/buffer.rs +++ b/src/wayland/handlers/buffer.rs @@ -11,9 +11,11 @@ impl BufferHandler for State { fn buffer_destroyed(&mut self, buffer: &WlBuffer) { if let BackendData::Kms(kms_state) = &mut self.backend { for device in kms_state.drm_devices.values_mut() { - if device.inner.active_buffers.remove(&buffer.downgrade()) && !device + if device.inner.active_buffers.remove(&buffer.downgrade()) + && !device .inner - .in_use(kms_state.primary_node.read().unwrap().as_ref()) { + .in_use(kms_state.primary_node.read().unwrap().as_ref()) + { if let Err(err) = kms_state.refresh_used_devices() { warn!(?err, "Failed to init devices."); }; diff --git a/src/wayland/handlers/pointer_constraints.rs b/src/wayland/handlers/pointer_constraints.rs index 73e7a61a..aa4a38ad 100644 --- a/src/wayland/handlers/pointer_constraints.rs +++ b/src/wayland/handlers/pointer_constraints.rs @@ -16,7 +16,8 @@ impl PointerConstraintsHandler for State { fn new_constraint(&mut self, surface: &WlSurface, pointer: &PointerHandle) { // XXX region if pointer - .current_focus().is_some_and(|x| x.wl_surface().as_deref() == Some(surface)) + .current_focus() + .is_some_and(|x| x.wl_surface().as_deref() == Some(surface)) { with_pointer_constraint(surface, pointer, |constraint| { constraint.unwrap().activate(); diff --git a/src/wayland/handlers/xdg_shell/mod.rs b/src/wayland/handlers/xdg_shell/mod.rs index fe4c3af9..379cd585 100644 --- a/src/wayland/handlers/xdg_shell/mod.rs +++ b/src/wayland/handlers/xdg_shell/mod.rs @@ -304,9 +304,11 @@ impl XdgShellHandler for State { if should_focus { Shell::set_focus(self, Some(&target), &seat, None, true); } - } else if let Some(pending) = shell.pending_windows.iter_mut().find(|pending| { - pending.surface.wl_surface().as_deref() == Some(surface.wl_surface()) - }) { + } else if let Some(pending) = shell + .pending_windows + .iter_mut() + .find(|pending| pending.surface.wl_surface().as_deref() == Some(surface.wl_surface())) + { pending.fullscreen.take(); } } diff --git a/src/wayland/protocols/output_configuration/mod.rs b/src/wayland/protocols/output_configuration/mod.rs index 98b2b2b1..c007568b 100644 --- a/src/wayland/protocols/output_configuration/mod.rs +++ b/src/wayland/protocols/output_configuration/mod.rs @@ -37,7 +37,8 @@ mod handlers; pub fn head_is_enabled(output: &Output) -> bool { output .user_data() - .get::().is_some_and(|inner| inner.lock().unwrap().enabled) + .get::() + .is_some_and(|inner| inner.lock().unwrap().enabled) } #[derive(Debug)] diff --git a/src/wayland/protocols/screencopy.rs b/src/wayland/protocols/screencopy.rs index a53f59c0..ca756d92 100644 --- a/src/wayland/protocols/screencopy.rs +++ b/src/wayland/protocols/screencopy.rs @@ -800,7 +800,9 @@ where _dhandle: &DisplayHandle, data_init: &mut DataInit<'_, D>, ) { - if let ext_image_copy_capture_cursor_session_v1::Request::GetCaptureSession { session } = request { + if let ext_image_copy_capture_cursor_session_v1::Request::GetCaptureSession { session } = + request + { let new_data = CursorSessionData { inner: data.inner.clone(), };