From b28c402ddfc9d9ba294bcdf2546c7ec6dbfaf7e9 Mon Sep 17 00:00:00 2001 From: galister <22305755+galister@users.noreply.github.com> Date: Wed, 17 Dec 2025 16:13:40 +0900 Subject: [PATCH] fmt --- wgui/src/drawing.rs | 2 +- wgui/src/parser/mod.rs | 2 +- wgui/src/parser/widget_label.rs | 3 +-- wgui/src/parser/widget_sprite.rs | 2 +- wgui/src/renderer_vk/text/custom_glyph.rs | 2 +- wgui/src/widget/sprite.rs | 2 +- wlx-overlay-s/src/backend/openvr/lines.rs | 8 ++++---- wlx-overlay-s/src/backend/openvr/mod.rs | 16 ++++++++-------- wlx-overlay-s/src/backend/openxr/lines.rs | 6 +++--- wlx-overlay-s/src/backend/openxr/mod.rs | 10 +++++----- wlx-overlay-s/src/backend/openxr/overlay.rs | 6 +++--- wlx-overlay-s/src/backend/openxr/skybox.rs | 4 ++-- wlx-overlay-s/src/backend/openxr/swapchain.rs | 4 ++-- wlx-overlay-s/src/graphics/mod.rs | 7 +++---- wlx-overlay-s/src/gui/panel/mod.rs | 8 ++++---- wlx-overlay-s/src/overlays/custom.rs | 2 +- wlx-overlay-s/src/overlays/edit/mod.rs | 6 +++--- wlx-overlay-s/src/overlays/edit/pos.rs | 2 +- wlx-overlay-s/src/overlays/edit/stereo.rs | 2 +- wlx-overlay-s/src/overlays/keyboard/mod.rs | 10 +++++----- wlx-overlay-s/src/overlays/mirror.rs | 12 ++++++------ wlx-overlay-s/src/overlays/screen/backend.rs | 12 ++++++------ wlx-overlay-s/src/overlays/screen/capture.rs | 13 +++++++------ wlx-overlay-s/src/overlays/watch.rs | 8 ++++---- wlx-overlay-s/src/overlays/wayvr.rs | 17 ++++++++--------- wlx-overlay-s/src/state.rs | 4 ++-- wlx-overlay-s/src/windowing/backend.rs | 4 ++-- wlx-overlay-s/src/windowing/manager.rs | 4 ++-- 28 files changed, 88 insertions(+), 90 deletions(-) diff --git a/wgui/src/drawing.rs b/wgui/src/drawing.rs index 123d84f..4f4b4c4 100644 --- a/wgui/src/drawing.rs +++ b/wgui/src/drawing.rs @@ -9,7 +9,7 @@ use crate::{ event::EventAlterables, globals::Globals, layout::Widget, - renderer_vk::text::{custom_glyph::CustomGlyph, TextShadow}, + renderer_vk::text::{TextShadow, custom_glyph::CustomGlyph}, stack::{self, ScissorBoundary, ScissorStack, TransformStack}, widget::{self, ScrollbarInfo, WidgetState}, }; diff --git a/wgui/src/parser/mod.rs b/wgui/src/parser/mod.rs index 6afd0fd..cd137ee 100644 --- a/wgui/src/parser/mod.rs +++ b/wgui/src/parser/mod.rs @@ -8,7 +8,7 @@ mod widget_rectangle; mod widget_sprite; use crate::{ - assets::{normalize_path, AssetPath, AssetPathOwned}, + assets::{AssetPath, AssetPathOwned, normalize_path}, components::{Component, ComponentWeak}, drawing::{self}, globals::WguiGlobals, diff --git a/wgui/src/parser/widget_label.rs b/wgui/src/parser/widget_label.rs index 50a57f1..1ace124 100644 --- a/wgui/src/parser/widget_label.rs +++ b/wgui/src/parser/widget_label.rs @@ -2,9 +2,8 @@ use crate::{ i18n::Translation, layout::WidgetID, parser::{ - parse_children, parse_i32, parse_widget_universal, print_invalid_attrib, + AttribPair, ParserContext, ParserFile, parse_children, parse_i32, parse_widget_universal, print_invalid_attrib, style::{parse_style, parse_text_style}, - AttribPair, ParserContext, ParserFile, }, widget::label::{WidgetLabel, WidgetLabelParams}, }; diff --git a/wgui/src/parser/widget_sprite.rs b/wgui/src/parser/widget_sprite.rs index 8c3735e..fc86f16 100644 --- a/wgui/src/parser/widget_sprite.rs +++ b/wgui/src/parser/widget_sprite.rs @@ -1,7 +1,7 @@ use crate::{ assets::AssetPath, layout::WidgetID, - parser::{parse_children, parse_widget_universal, style::parse_style, AttribPair, ParserContext, ParserFile}, + parser::{AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, style::parse_style}, renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData}, widget::sprite::{WidgetSprite, WidgetSpriteParams}, }; diff --git a/wgui/src/renderer_vk/text/custom_glyph.rs b/wgui/src/renderer_vk/text/custom_glyph.rs index a8b41bc..59318aa 100644 --- a/wgui/src/renderer_vk/text/custom_glyph.rs +++ b/wgui/src/renderer_vk/text/custom_glyph.rs @@ -1,8 +1,8 @@ use std::{ f32, sync::{ - atomic::{AtomicUsize, Ordering}, Arc, + atomic::{AtomicUsize, Ordering}, }, }; diff --git a/wgui/src/widget/sprite.rs b/wgui/src/widget/sprite.rs index bfb755b..08f362f 100644 --- a/wgui/src/widget/sprite.rs +++ b/wgui/src/widget/sprite.rs @@ -8,8 +8,8 @@ use crate::{ globals::Globals, layout::WidgetID, renderer_vk::text::{ - custom_glyph::{CustomGlyph, CustomGlyphData}, DEFAULT_METRICS, + custom_glyph::{CustomGlyph, CustomGlyphData}, }, }; diff --git a/wlx-overlay-s/src/backend/openvr/lines.rs b/wlx-overlay-s/src/backend/openvr/lines.rs index 38eb88d..100eb65 100644 --- a/wlx-overlay-s/src/backend/openvr/lines.rs +++ b/wlx-overlay-s/src/backend/openvr/lines.rs @@ -1,6 +1,6 @@ use std::f32::consts::PI; -use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; +use std::sync::atomic::{AtomicUsize, Ordering}; use ash::vk::SubmitInfo; use glam::{Affine3A, Vec3, Vec3A, Vec4}; @@ -8,6 +8,7 @@ use idmap::IdMap; use ovr_overlay::overlay::OverlayManager; use ovr_overlay::sys::ETrackingUniverseOrigin; use vulkano::{ + VulkanObject, command_buffer::{ CommandBufferBeginInfo, CommandBufferLevel, CommandBufferUsage, RecordingCommandBuffer, }, @@ -15,22 +16,21 @@ use vulkano::{ image::view::ImageView, image::{Image, ImageLayout}, sync::{ - fence::{Fence, FenceCreateInfo}, AccessFlags, DependencyInfo, ImageMemoryBarrier, PipelineStages, + fence::{Fence, FenceCreateInfo}, }, - VulkanObject, }; use wgui::gfx::WGfx; use crate::backend::input::{HoverResult, PointerHit}; use crate::state::AppState; use crate::subsystem::hid::WheelDelta; +use crate::windowing::Z_ORDER_LINES; use crate::windowing::backend::{ BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, OverlayEventData, RenderResources, ShouldRender, }; use crate::windowing::window::{OverlayWindowConfig, OverlayWindowData}; -use crate::windowing::Z_ORDER_LINES; use super::overlay::OpenVrOverlayData; diff --git a/wlx-overlay-s/src/backend/openvr/mod.rs b/wlx-overlay-s/src/backend/openvr/mod.rs index 593e7db..9751851 100644 --- a/wlx-overlay-s/src/backend/openvr/mod.rs +++ b/wlx-overlay-s/src/backend/openvr/mod.rs @@ -5,33 +5,34 @@ use std::{ time::{Duration, Instant}, }; -use anyhow::{anyhow, Result}; +use anyhow::{Result, anyhow}; use ovr_overlay::{ - sys::{ETrackedDeviceProperty, EVRApplicationType, EVREventType}, TrackedDeviceIndex, + sys::{ETrackedDeviceProperty, EVRApplicationType, EVREventType}, }; use smallvec::smallvec; -use vulkano::{device::physical::PhysicalDevice, Handle, VulkanObject}; +use vulkano::{Handle, VulkanObject, device::physical::PhysicalDevice}; use wlx_common::overlays::ToastTopic; use crate::{ + RUNNING, backend::{ + BackendError, XrBackend, input::interact, openvr::{ helpers::adjust_gain, - input::{set_action_manifest, OpenVrInputSource}, + input::{OpenVrInputSource, set_action_manifest}, lines::LinePool, manifest::{install_manifest, uninstall_manifest}, overlay::OpenVrOverlayData, }, task::{OpenVrTask, OverlayTask, TaskType}, - BackendError, XrBackend, }, config::save_state, - graphics::{init_openvr_graphics, GpuFutures}, + graphics::{GpuFutures, init_openvr_graphics}, overlays::{ toast::Toast, - watch::{watch_fade, WATCH_NAME}, + watch::{WATCH_NAME, watch_fade}, }, state::AppState, subsystem::notifications::NotificationManager, @@ -39,7 +40,6 @@ use crate::{ backend::{RenderResources, RenderTarget, ShouldRender}, manager::OverlayWindowManager, }, - RUNNING, }; #[cfg(feature = "wayvr")] diff --git a/wlx-overlay-s/src/backend/openxr/lines.rs b/wlx-overlay-s/src/backend/openxr/lines.rs index d1aedd4..49439bd 100644 --- a/wlx-overlay-s/src/backend/openxr/lines.rs +++ b/wlx-overlay-s/src/backend/openxr/lines.rs @@ -5,16 +5,16 @@ use smallvec::SmallVec; use std::{ f32::consts::PI, sync::{ - atomic::{AtomicUsize, Ordering}, Arc, + atomic::{AtomicUsize, Ordering}, }, }; use wgui::gfx::{ + WGfx, cmd::WGfxClearMode, pass::WGfxPass, pipeline::{WGfxPipeline, WPipelineCreateInfo}, - WGfx, }; use crate::{ @@ -28,8 +28,8 @@ use vulkano::{ }; use super::{ - swapchain::{create_swapchain, SwapchainOpts, WlxSwapchain}, CompositionLayer, XrState, + swapchain::{SwapchainOpts, WlxSwapchain, create_swapchain}, }; static LINE_AUTO_INCREMENT: AtomicUsize = AtomicUsize::new(1); diff --git a/wlx-overlay-s/src/backend/openxr/mod.rs b/wlx-overlay-s/src/backend/openxr/mod.rs index 22f57e1..a5c2a04 100644 --- a/wlx-overlay-s/src/backend/openxr/mod.rs +++ b/wlx-overlay-s/src/backend/openxr/mod.rs @@ -1,7 +1,7 @@ use std::{ collections::VecDeque, ops::Add, - sync::{atomic::Ordering, Arc}, + sync::{Arc, atomic::Ordering}, time::{Duration, Instant}, }; @@ -14,17 +14,18 @@ use vulkano::{Handle, VulkanObject}; use wlx_common::overlays::ToastTopic; use crate::{ + FRAME_COUNTER, RUNNING, backend::{ + BackendError, XrBackend, input::interact, openxr::{lines::LinePool, overlay::OpenXrOverlayData}, task::{OverlayTask, TaskType}, - BackendError, XrBackend, }, config::save_state, - graphics::{init_openxr_graphics, GpuFutures}, + graphics::{GpuFutures, init_openxr_graphics}, overlays::{ toast::Toast, - watch::{watch_fade, WATCH_NAME}, + watch::{WATCH_NAME, watch_fade}, }, state::AppState, subsystem::notifications::NotificationManager, @@ -32,7 +33,6 @@ use crate::{ backend::{RenderResources, RenderTarget, ShouldRender}, manager::OverlayWindowManager, }, - FRAME_COUNTER, RUNNING, }; #[cfg(feature = "wayvr")] diff --git a/wlx-overlay-s/src/backend/openxr/overlay.rs b/wlx-overlay-s/src/backend/openxr/overlay.rs index 51c238c..5b2a78c 100644 --- a/wlx-overlay-s/src/backend/openxr/overlay.rs +++ b/wlx-overlay-s/src/backend/openxr/overlay.rs @@ -1,12 +1,12 @@ use glam::Vec3A; use openxr::{self as xr, CompositionLayerFlags}; -use smallvec::{smallvec, SmallVec}; +use smallvec::{SmallVec, smallvec}; use std::f32::consts::PI; use xr::EyeVisibility; -use super::{helpers, swapchain::WlxSwapchain, CompositionLayer, XrState}; +use super::{CompositionLayer, XrState, helpers, swapchain::WlxSwapchain}; use crate::{ - backend::openxr::swapchain::{create_swapchain, SwapchainOpts, WlxSwapchainImage}, + backend::openxr::swapchain::{SwapchainOpts, WlxSwapchainImage, create_swapchain}, state::AppState, windowing::window::OverlayWindowData, }; diff --git a/wlx-overlay-s/src/backend/openxr/skybox.rs b/wlx-overlay-s/src/backend/openxr/skybox.rs index e437bbf..5e9a108 100644 --- a/wlx-overlay-s/src/backend/openxr/skybox.rs +++ b/wlx-overlay-s/src/backend/openxr/skybox.rs @@ -15,13 +15,13 @@ use wgui::gfx::{cmd::WGfxClearMode, pipeline::WPipelineCreateInfo}; use crate::{ backend::openxr::{helpers::translation_rotation_to_posef, swapchain::SwapchainOpts}, config_io, - graphics::{dds::WlxCommandBufferDds, ExtentExt, GpuFutures}, + graphics::{ExtentExt, GpuFutures, dds::WlxCommandBufferDds}, state::AppState, }; use super::{ - swapchain::{create_swapchain, WlxSwapchain}, CompositionLayer, XrState, + swapchain::{WlxSwapchain, create_swapchain}, }; pub(super) struct Skybox { diff --git a/wlx-overlay-s/src/backend/openxr/swapchain.rs b/wlx-overlay-s/src/backend/openxr/swapchain.rs index 03b6573..9454f48 100644 --- a/wlx-overlay-s/src/backend/openxr/swapchain.rs +++ b/wlx-overlay-s/src/backend/openxr/swapchain.rs @@ -5,12 +5,12 @@ use openxr as xr; use smallvec::SmallVec; use vulkano::{ + Handle, image::{ + ImageCreateInfo, ImageUsage, sys::RawImage, view::{ImageView, ImageViewCreateInfo}, - ImageCreateInfo, ImageUsage, }, - Handle, }; use wgui::gfx::WGfx; diff --git a/wlx-overlay-s/src/graphics/mod.rs b/wlx-overlay-s/src/graphics/mod.rs index eba9a25..a73a794 100644 --- a/wlx-overlay-s/src/graphics/mod.rs +++ b/wlx-overlay-s/src/graphics/mod.rs @@ -6,7 +6,7 @@ use std::{ sync::{Arc, OnceLock}, }; -use glam::{vec2, Vec2}; +use glam::{Vec2, vec2}; use smallvec::SmallVec; use vulkano::{ buffer::{BufferCreateInfo, BufferUsage}, @@ -27,11 +27,11 @@ use crate::shaders::{frag_color, frag_grid, frag_screen, frag_srgb, vert_quad}; use {ash::vk, std::os::raw::c_void}; use vulkano::{ - self, + self, VulkanObject, buffer::{Buffer, BufferContents, IndexBuffer, Subbuffer}, device::{ - physical::{PhysicalDevice, PhysicalDeviceType}, DeviceCreateInfo, DeviceExtensions, DeviceFeatures, Queue, QueueCreateInfo, QueueFlags, + physical::{PhysicalDevice, PhysicalDeviceType}, }, format::Format, instance::{Instance, InstanceCreateInfo, InstanceExtensions}, @@ -40,7 +40,6 @@ use vulkano::{ vertex_input::Vertex, }, shader::ShaderModule, - VulkanObject, }; use dmabuf::get_drm_formats; diff --git a/wlx-overlay-s/src/gui/panel/mod.rs b/wlx-overlay-s/src/gui/panel/mod.rs index 1478cfa..518e57c 100644 --- a/wlx-overlay-s/src/gui/panel/mod.rs +++ b/wlx-overlay-s/src/gui/panel/mod.rs @@ -1,7 +1,7 @@ use std::{cell::RefCell, rc::Rc}; use button::setup_custom_button; -use glam::{vec2, Affine2, Vec2}; +use glam::{Affine2, Vec2, vec2}; use label::setup_custom_label; use wgui::{ assets::AssetPath, @@ -16,7 +16,7 @@ use wgui::{ layout::{Layout, LayoutParams, WidgetID}, parser::{CustomAttribsInfoOwned, Fetchable, ParserState}, renderer_vk::context::Context as WguiContext, - widget::{label::WidgetLabel, EventResult}, + widget::{EventResult, label::WidgetLabel}, }; use wlx_common::timestep::Timestep; @@ -25,8 +25,8 @@ use crate::{ state::AppState, subsystem::hid::WheelDelta, windowing::backend::{ - ui_transform, BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, - OverlayEventData, RenderResources, ShouldRender, + BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, OverlayEventData, + RenderResources, ShouldRender, ui_transform, }, }; diff --git a/wlx-overlay-s/src/overlays/custom.rs b/wlx-overlay-s/src/overlays/custom.rs index 9169109..db68125 100644 --- a/wlx-overlay-s/src/overlays/custom.rs +++ b/wlx-overlay-s/src/overlays/custom.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use glam::{vec3, Affine3A, Quat, Vec3}; +use glam::{Affine3A, Quat, Vec3, vec3}; use wlx_common::windowing::OverlayWindowState; use crate::{ diff --git a/wlx-overlay-s/src/overlays/edit/mod.rs b/wlx-overlay-s/src/overlays/edit/mod.rs index b16f50c..b05cc29 100644 --- a/wlx-overlay-s/src/overlays/edit/mod.rs +++ b/wlx-overlay-s/src/overlays/edit/mod.rs @@ -21,10 +21,10 @@ use crate::{ input::HoverResult, task::{OverlayTask, TaskContainer, TaskType}, }, - gui::panel::{button::BUTTON_EVENTS, GuiPanel, NewGuiPanelParams, OnCustomAttribFunc}, + gui::panel::{GuiPanel, NewGuiPanelParams, OnCustomAttribFunc, button::BUTTON_EVENTS}, overlays::edit::{ lock::InteractLockHandler, - pos::{new_pos_tab_handler, PosTabState}, + pos::{PosTabState, new_pos_tab_handler}, sprite_tab::SpriteTabHandler, stereo::new_stereo_tab_handler, tab::ButtonPaneTabSwitcher, @@ -32,12 +32,12 @@ use crate::{ state::AppState, subsystem::hid::WheelDelta, windowing::{ + OverlayID, OverlaySelector, backend::{ BackendAttrib, BackendAttribValue, DummyBackend, OverlayBackend, OverlayEventData, RenderResources, ShouldRender, StereoMode, }, window::OverlayWindowConfig, - OverlayID, OverlaySelector, }, }; diff --git a/wlx-overlay-s/src/overlays/edit/pos.rs b/wlx-overlay-s/src/overlays/edit/pos.rs index eb7fadc..986a43e 100644 --- a/wlx-overlay-s/src/overlays/edit/pos.rs +++ b/wlx-overlay-s/src/overlays/edit/pos.rs @@ -3,8 +3,8 @@ use wlx_common::{common::LeftRight, windowing::Positioning}; use crate::{ overlays::edit::{ - sprite_tab::{SpriteTabHandler, SpriteTabKey}, EditModeWrapPanel, + sprite_tab::{SpriteTabHandler, SpriteTabKey}, }, windowing::window, }; diff --git a/wlx-overlay-s/src/overlays/edit/stereo.rs b/wlx-overlay-s/src/overlays/edit/stereo.rs index 9a9ab48..f873f90 100644 --- a/wlx-overlay-s/src/overlays/edit/stereo.rs +++ b/wlx-overlay-s/src/overlays/edit/stereo.rs @@ -1,7 +1,7 @@ use crate::{ overlays::edit::{ - sprite_tab::{SpriteTabHandler, SpriteTabKey}, EditModeWrapPanel, + sprite_tab::{SpriteTabHandler, SpriteTabKey}, }, windowing::backend::{BackendAttribValue, StereoMode}, }; diff --git a/wlx-overlay-s/src/overlays/keyboard/mod.rs b/wlx-overlay-s/src/overlays/keyboard/mod.rs index 68b64b7..1ca7e96 100644 --- a/wlx-overlay-s/src/overlays/keyboard/mod.rs +++ b/wlx-overlay-s/src/overlays/keyboard/mod.rs @@ -6,13 +6,14 @@ use std::{ }; use crate::{ + KEYMAP_CHANGE, backend::input::{HoverResult, PointerHit}, gui::panel::GuiPanel, overlays::keyboard::{builder::create_keyboard_panel, layout::AltModifier}, state::AppState, subsystem::hid::{ - get_keymap_wl, get_keymap_x11, KeyModifier, VirtualKey, WheelDelta, XkbKeymap, ALT, CTRL, - META, SHIFT, SUPER, + ALT, CTRL, KeyModifier, META, SHIFT, SUPER, VirtualKey, WheelDelta, XkbKeymap, + get_keymap_wl, get_keymap_x11, }, windowing::{ backend::{ @@ -21,12 +22,11 @@ use crate::{ }, window::OverlayWindowConfig, }, - KEYMAP_CHANGE, }; use anyhow::Context; -use glam::{vec3, Affine3A, Quat, Vec3}; +use glam::{Affine3A, Quat, Vec3, vec3}; use regex::Regex; -use slotmap::{new_key_type, SlotMap}; +use slotmap::{SlotMap, new_key_type}; use wgui::{ drawing, event::{InternalStateChangeEvent, MouseButton, MouseButtonIndex}, diff --git a/wlx-overlay-s/src/overlays/mirror.rs b/wlx-overlay-s/src/overlays/mirror.rs index f40d4c9..5f4c59d 100644 --- a/wlx-overlay-s/src/overlays/mirror.rs +++ b/wlx-overlay-s/src/overlays/mirror.rs @@ -1,14 +1,14 @@ use std::{ sync::{ - atomic::{AtomicUsize, Ordering}, Arc, + atomic::{AtomicUsize, Ordering}, }, task::{Context, Poll}, }; use futures::{Future, FutureExt}; -use glam::{vec3, Affine2, Affine3A, Quat, Vec3}; -use wlx_capture::pipewire::{pipewire_select_screen, PipewireCapture, PipewireSelectScreenResult}; +use glam::{Affine2, Affine3A, Quat, Vec3, vec3}; +use wlx_capture::pipewire::{PipewireCapture, PipewireSelectScreenResult, pipewire_select_screen}; use wlx_common::windowing::OverlayWindowState; use crate::{ @@ -19,12 +19,12 @@ use crate::{ state::{AppSession, AppState}, subsystem::hid::WheelDelta, windowing::{ + OverlaySelector, backend::{ - ui_transform, BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, - OverlayEventData, RenderResources, ShouldRender, + BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, OverlayEventData, + RenderResources, ShouldRender, ui_transform, }, window::{OverlayCategory, OverlayWindowConfig}, - OverlaySelector, }, }; diff --git a/wlx-overlay-s/src/overlays/screen/backend.rs b/wlx-overlay-s/src/overlays/screen/backend.rs index 2f1a2e2..06febfd 100644 --- a/wlx-overlay-s/src/overlays/screen/backend.rs +++ b/wlx-overlay-s/src/overlays/screen/backend.rs @@ -1,26 +1,26 @@ use std::{ - sync::{atomic::AtomicU64, Arc, LazyLock}, + sync::{Arc, LazyLock, atomic::AtomicU64}, time::Instant, }; -use glam::{vec2, Affine2, Vec2}; -use wlx_capture::{frame::Transform, WlxCapture}; +use glam::{Affine2, Vec2, vec2}; +use wlx_capture::{WlxCapture, frame::Transform}; use crate::{ backend::{ - input::{HoverResult, PointerHit, PointerMode}, XrBackend, + input::{HoverResult, PointerHit, PointerMode}, }, graphics::ExtentExt, state::AppState, - subsystem::hid::{WheelDelta, MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_RIGHT}, + subsystem::hid::{MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_RIGHT, WheelDelta}, windowing::backend::{ BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, OverlayEventData, RenderResources, ShouldRender, StereoMode, }, }; -use super::capture::{receive_callback, ScreenPipeline, WlxCaptureIn, WlxCaptureOut}; +use super::capture::{ScreenPipeline, WlxCaptureIn, WlxCaptureOut, receive_callback}; const CURSOR_SIZE: f32 = 16. / 1440.; diff --git a/wlx-overlay-s/src/overlays/screen/capture.rs b/wlx-overlay-s/src/overlays/screen/capture.rs index 8a8d794..a5a7a27 100644 --- a/wlx-overlay-s/src/overlays/screen/capture.rs +++ b/wlx-overlay-s/src/overlays/screen/capture.rs @@ -1,31 +1,32 @@ use std::{f32::consts::PI, sync::Arc}; use glam::{Affine3A, Vec3}; -use smallvec::{smallvec, SmallVec}; +use smallvec::{SmallVec, smallvec}; use vulkano::{ buffer::{BufferUsage, Subbuffer}, command_buffer::CommandBufferUsage, device::Queue, format::Format, - image::{sampler::Filter, view::ImageView, Image}, + image::{Image, sampler::Filter, view::ImageView}, pipeline::graphics::color_blend::AttachmentBlend, }; use wgui::gfx::{ + WGfx, cmd::WGfxClearMode, pass::WGfxPass, pipeline::{WGfxPipeline, WPipelineCreateInfo}, - WGfx, }; use wlx_capture::{ - frame::{self as wlx_frame, DrmFormat, FrameFormat, MouseMeta, Transform, WlxFrame}, WlxCapture, + frame::{self as wlx_frame, DrmFormat, FrameFormat, MouseMeta, Transform, WlxFrame}, }; use wlx_common::config::GeneralConfig; use crate::{ graphics::{ - dmabuf::{fourcc_to_vk, WGfxDmabuf}, - upload_quad_vertices, Vert2Uv, + Vert2Uv, + dmabuf::{WGfxDmabuf, fourcc_to_vk}, + upload_quad_vertices, }, state::AppState, windowing::backend::{FrameMeta, RenderResources, StereoMode}, diff --git a/wlx-overlay-s/src/overlays/watch.rs b/wlx-overlay-s/src/overlays/watch.rs index 655ec7a..88b6dff 100644 --- a/wlx-overlay-s/src/overlays/watch.rs +++ b/wlx-overlay-s/src/overlays/watch.rs @@ -4,7 +4,7 @@ use std::{ time::{Duration, Instant}, }; -use glam::{vec3, Affine3A, Quat, Vec3, Vec3A}; +use glam::{Affine3A, Quat, Vec3, Vec3A, vec3}; use idmap::DirectIdMap; use wgui::{ components::button::ComponentButton, @@ -14,7 +14,7 @@ use wgui::{ parser::Fetchable, renderer_vk::text::custom_glyph::CustomGlyphData, taffy, - widget::{label::WidgetLabel, sprite::WidgetSprite, EventResult}, + widget::{EventResult, label::WidgetLabel, sprite::WidgetSprite}, }; use wlx_common::{ common::LeftRight, @@ -27,16 +27,16 @@ use crate::{ task::{OverlayTask, TaskType}, }, gui::{ - panel::{button::BUTTON_EVENTS, GuiPanel, NewGuiPanelParams, OnCustomAttribFunc}, + panel::{GuiPanel, NewGuiPanelParams, OnCustomAttribFunc, button::BUTTON_EVENTS}, timer::GuiTimer, }, overlays::edit::LongPressButtonState, state::AppState, windowing::{ + OverlaySelector, Z_ORDER_WATCH, backend::{OverlayEventData, OverlayMeta}, manager::MAX_OVERLAY_SETS, window::{OverlayCategory, OverlayWindowConfig, OverlayWindowData}, - OverlaySelector, Z_ORDER_WATCH, }, }; diff --git a/wlx-overlay-s/src/overlays/wayvr.rs b/wlx-overlay-s/src/overlays/wayvr.rs index 8cb4a3a..a996be5 100644 --- a/wlx-overlay-s/src/overlays/wayvr.rs +++ b/wlx-overlay-s/src/overlays/wayvr.rs @@ -1,18 +1,18 @@ use anyhow::Context; -use glam::{vec3, Affine2, Affine3A, Quat, Vec3}; +use glam::{Affine2, Affine3A, Quat, Vec3, vec3}; use smallvec::smallvec; use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc}; use vulkano::{ buffer::{BufferUsage, Subbuffer}, command_buffer::CommandBufferUsage, format::Format, - image::{view::ImageView, Image, ImageTiling, SubresourceLayout}, + image::{Image, ImageTiling, SubresourceLayout, view::ImageView}, }; use wayvr_ipc::packet_server::{self, PacketServer, WvrStateChanged}; use wgui::gfx::{ + WGfx, pass::WGfxPass, pipeline::{WGfxPipeline, WPipelineCreateInfo}, - WGfx, }; use wlx_capture::frame::{DmabufFrame, FourCC, FrameFormat, FramePlane}; use wlx_common::windowing::OverlayWindowState; @@ -22,23 +22,22 @@ use crate::{ input::{self, HoverResult}, task::{OverlayTask, TaskType}, wayvr::{ - self, display, + self, WayVR, WayVRAction, WayVRDisplayClickAction, display, server_ipc::{gen_args_vec, gen_env_vec}, - WayVR, WayVRAction, WayVRDisplayClickAction, }, }, config_wayvr, - graphics::{dmabuf::WGfxDmabuf, Vert2Uv}, + graphics::{Vert2Uv, dmabuf::WGfxDmabuf}, state::{self, AppState}, subsystem::{hid::WheelDelta, input::KeyboardFocus}, windowing::{ + OverlayID, OverlaySelector, Z_ORDER_DASHBOARD, backend::{ - ui_transform, BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, - OverlayEventData, RenderResources, ShouldRender, + BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, OverlayEventData, + RenderResources, ShouldRender, ui_transform, }, manager::OverlayWindowManager, window::{OverlayCategory, OverlayWindowConfig, OverlayWindowData}, - OverlayID, OverlaySelector, Z_ORDER_DASHBOARD, }, }; diff --git a/wlx-overlay-s/src/state.rs b/wlx-overlay-s/src/state.rs index 74b59f7..e68c80f 100644 --- a/wlx-overlay-s/src/state.rs +++ b/wlx-overlay-s/src/state.rs @@ -1,6 +1,6 @@ use glam::Affine3A; use idmap::IdMap; -use smallvec::{smallvec, SmallVec}; +use smallvec::{SmallVec, smallvec}; use std::sync::Arc; use wgui::{ font_config::WguiFontConfig, gfx::WGfx, globals::WguiGlobals, parser::parse_color_hex, @@ -22,7 +22,7 @@ use { use crate::subsystem::osc::OscSender; use crate::{ - backend::{input::InputState, task::TaskContainer, XrBackend}, + backend::{XrBackend, input::InputState, task::TaskContainer}, config::load_general_config, config_io::{self, get_config_file_path}, graphics::WGfxExtras, diff --git a/wlx-overlay-s/src/windowing/backend.rs b/wlx-overlay-s/src/windowing/backend.rs index 26e2762..971dfb4 100644 --- a/wlx-overlay-s/src/windowing/backend.rs +++ b/wlx-overlay-s/src/windowing/backend.rs @@ -3,8 +3,8 @@ use smallvec::SmallVec; use std::{any::Any, sync::Arc}; use vulkano::{command_buffer::CommandBufferUsage, format::Format, image::view::ImageView}; use wgui::gfx::{ - cmd::{GfxCommandBuffer, WGfxClearMode}, WGfx, + cmd::{GfxCommandBuffer, WGfxClearMode}, }; use crate::{ @@ -12,7 +12,7 @@ use crate::{ graphics::{ExtentExt, RenderResult}, state::AppState, subsystem::hid::WheelDelta, - windowing::{window::OverlayCategory, OverlayID}, + windowing::{OverlayID, window::OverlayCategory}, }; #[derive(Default, Clone, Copy)] diff --git a/wlx-overlay-s/src/windowing/manager.rs b/wlx-overlay-s/src/windowing/manager.rs index 0010b5f..dbae938 100644 --- a/wlx-overlay-s/src/windowing/manager.rs +++ b/wlx-overlay-s/src/windowing/manager.rs @@ -12,6 +12,7 @@ use wlx_common::{ }; use crate::{ + FRAME_COUNTER, backend::task::OverlayTask, overlays::{ anchor::create_anchor, custom::create_custom, edit::EditWrapperManager, @@ -19,13 +20,12 @@ use crate::{ }, state::AppState, windowing::{ + OverlayID, OverlaySelector, backend::{OverlayEventData, OverlayMeta}, set::OverlayWindowSet, snap_upright, window::{OverlayCategory, OverlayWindowData}, - OverlayID, OverlaySelector, }, - FRAME_COUNTER, }; pub const MAX_OVERLAY_SETS: usize = 7;