leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: format for Rust 2024

Browse source
This commit is contained in:
Vukašin Vojinović 2025-10-16 18:53:57 +02:00 • committed by Victoria Brekenfeld
parent 0a8da05847
commit 1f7f0c70b7
99 changed files with 414 additions and 442 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/backend/render/cursor.rs
View file

@ -5,17 +5,17 @@ use smithay::{
backend::{
allocator::Fourcc,
renderer::{
element::{
memory::{MemoryRenderBuffer, MemoryRenderBufferRenderElement},
surface::{render_elements_from_surface_tree, WaylandSurfaceRenderElement},
Kind,
},
ImportAll, ImportMem, Renderer,
element::{
Kind,
memory::{MemoryRenderBuffer, MemoryRenderBufferRenderElement},
surface::{WaylandSurfaceRenderElement, render_elements_from_surface_tree},
},
},
},
input::{
pointer::{CursorIcon, CursorImageAttributes, CursorImageStatus},
Seat,
pointer::{CursorIcon, CursorImageAttributes, CursorImageStatus},
},
reexports::wayland_server::protocol::wl_surface,
render_elements,
@ -27,8 +27,8 @@ use smithay::{
use std::{collections::HashMap, io::Read, sync::Mutex};
use tracing::warn;
use xcursor::{
parser::{parse_xcursor, Image},
CursorTheme,
parser::{Image, parse_xcursor},
};
static FALLBACK_CURSOR_DATA: &[u8] = include_bytes!("../../../resources/cursor.rgba");
@ -287,10 +287,9 @@ where
let actual_scale = (frame.size / state.size()).max(1);
let pointer_images = &mut state.image_cache;
let maybe_image =
pointer_images
.iter()
.find_map(|(image, texture)| if image == &frame { Some(texture) } else { None });
let maybe_image = pointer_images
.iter()
.find_map(|(image, texture)| if image == &frame { Some(texture) } else { None });
let pointer_image = match maybe_image {
Some(image) => image,
None => {

8
src/backend/render/element.rs
View file

@ -4,21 +4,21 @@ use crate::shell::{CosmicMappedRenderElement, WorkspaceRenderElement};
use smithay::backend::renderer::{element::texture::TextureRenderElement, gles::GlesTexture};
use smithay::{
backend::renderer::{
ImportAll, ImportMem, Renderer,
element::{
Element, Id, Kind, RenderElement, UnderlyingStorage,
memory::MemoryRenderBufferRenderElement,
surface::WaylandSurfaceRenderElement,
utils::{CropRenderElement, Relocate, RelocateRenderElement, RescaleRenderElement},
Element, Id, Kind, RenderElement, UnderlyingStorage,
},
gles::{element::TextureShaderElement, GlesError},
gles::{GlesError, element::TextureShaderElement},
glow::{GlowFrame, GlowRenderer},
utils::{CommitCounter, DamageSet, OpaqueRegions},
ImportAll, ImportMem, Renderer,
},
utils::{Buffer as BufferCoords, Logical, Physical, Point, Rectangle, Scale},
};
use super::{cursor::CursorRenderElement, GlMultiRenderer};
use super::{GlMultiRenderer, cursor::CursorRenderElement};
pub enum CosmicElement<R>
where

56
src/backend/render/mod.rs
View file

@ -15,20 +15,20 @@ use crate::{
backend::{kms::render::gles::GbmGlowBackend, render::element::DamageElement},
config::ScreenFilter,
shell::{
CosmicMappedRenderElement, OverviewMode, SeatExt, Trigger, WorkspaceDelta,
WorkspaceRenderElement,
element::CosmicMappedKey,
focus::{render_input_order, target::WindowGroup, FocusTarget, Stage},
focus::{FocusTarget, Stage, render_input_order, target::WindowGroup},
grabs::{SeatMenuGrabState, SeatMoveGrabState},
layout::tiling::ANIMATION_DURATION,
zoom::ZoomState,
CosmicMappedRenderElement, OverviewMode, SeatExt, Trigger, WorkspaceDelta,
WorkspaceRenderElement,
},
utils::{prelude::*, quirks::workspace_overview_is_open},
wayland::{
handlers::{
compositor::FRAME_TIME_FILTER,
data_device::get_dnd_icon,
screencopy::{render_session, FrameHolder, SessionData},
screencopy::{FrameHolder, SessionData, render_session},
},
protocols::workspace::WorkspaceHandle,
},
@ -38,29 +38,29 @@ use cosmic::Theme;
use element::FromGlesError;
use smithay::{
backend::{
allocator::{dmabuf::Dmabuf, Fourcc},
allocator::{Fourcc, dmabuf::Dmabuf},
drm::{DrmDeviceFd, DrmNode},
renderer::{
Bind, Blit, Color32F, ExportMem, ImportAll, ImportMem, Offscreen, Renderer, Texture,
TextureFilter,
damage::{Error as RenderError, OutputDamageTracker, RenderOutputResult},
element::{
surface::{render_elements_from_surface_tree, WaylandSurfaceRenderElement},
Element, Id, Kind, RenderElement, WeakId,
surface::{WaylandSurfaceRenderElement, render_elements_from_surface_tree},
texture::{TextureRenderBuffer, TextureRenderElement},
utils::{
constrain_render_elements, ConstrainAlign, ConstrainScaleBehavior,
CropRenderElement, Relocate, RelocateRenderElement, RescaleRenderElement,
ConstrainAlign, ConstrainScaleBehavior, CropRenderElement, Relocate,
RelocateRenderElement, RescaleRenderElement, constrain_render_elements,
},
Element, Id, Kind, RenderElement, WeakId,
},
gles::{
element::{PixelShaderElement, TextureShaderElement},
GlesError, GlesPixelProgram, GlesRenderer, GlesTexProgram, GlesTexture, Uniform,
UniformName, UniformType,
element::{PixelShaderElement, TextureShaderElement},
},
glow::GlowRenderer,
multigpu::{Error as MultiError, MultiFrame, MultiRenderer},
sync::SyncPoint,
Bind, Blit, Color32F, ExportMem, ImportAll, ImportMem, Offscreen, Renderer, Texture,
TextureFilter,
},
},
input::Seat,
@ -592,21 +592,23 @@ where
let scale = output.current_scale().fractional_scale();
if let Some((state, timings)) = _fps {
vec![fps_ui(
_gpu,
debug_active,
&seats,
renderer.glow_renderer_mut(),
state,
timings,
Rectangle::from_size(
(output_geo.size.w.min(400), output_geo.size.h.min(800)).into(),
),
scale,
)
.map_err(FromGlesError::from_gles_error)
.map_err(RenderError::Rendering)?
.into()]
vec![
fps_ui(
_gpu,
debug_active,
&seats,
renderer.glow_renderer_mut(),
state,
timings,
Rectangle::from_size(
(output_geo.size.w.min(400), output_geo.size.h.min(800)).into(),
),
scale,
)
.map_err(FromGlesError::from_gles_error)
.map_err(RenderError::Rendering)?
.into(),
]
} else {
Vec::new()
}