kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

all: set rust edition to 2024

Browse source
This commit is contained in:
Julian Orth 2025-02-21 10:44:29 +01:00
parent 02a18f620b
commit 3338909170
515 changed files with 1225 additions and 1187 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/portal/ptl_display.rs
View file

@ -1,14 +1,14 @@
use {
crate::{
gfx_api::{cross_intersect_formats, GfxFormat},
gfx_api::{GfxFormat, cross_intersect_formats},
gfx_apis::create_gfx_context,
ifs::wl_seat::POINTER,
object::Version,
portal::{
PortalState,
ptl_render_ctx::{PortalRenderCtx, PortalServerRenderCtx},
ptl_session::PortalSession,
ptr_gui::WindowData,
PortalState,
},
utils::{
bitflags::BitflagsExt,
@ -16,15 +16,16 @@ use {
copyhashmap::CopyHashMap,
errorfmt::ErrorFmt,
hash_map_ext::HashMapExt,
opaque::{opaque, Opaque},
opaque::{Opaque, opaque},
oserror::OsError,
},
video::drm::Drm,
wire::{
wl_pointer, JayCompositor, WlCompositor, WlOutput, WlSeat, WlSurfaceId,
WpFractionalScaleManagerV1, WpViewporter, ZwlrLayerShellV1, ZwpLinuxDmabufV1,
JayCompositor, WlCompositor, WlOutput, WlSeat, WlSurfaceId, WpFractionalScaleManagerV1,
WpViewporter, ZwlrLayerShellV1, ZwpLinuxDmabufV1, wl_pointer,
},
wl_usr::{
UsrCon, UsrConOwner,
usr_ifs::{
usr_jay_compositor::UsrJayCompositor,
usr_jay_output::{UsrJayOutput, UsrJayOutputOwner},
@ -42,7 +43,6 @@ use {
usr_wp_fractional_scale_manager::UsrWpFractionalScaleManager,
usr_wp_viewporter::UsrWpViewporter,
},
UsrCon, UsrConOwner,
},
},
ahash::AHashMap,
@ -54,7 +54,7 @@ use {
rc::Rc,
str::FromStr,
},
uapi::{c, AsUstr, OwnedFd},
uapi::{AsUstr, OwnedFd, c},
};
struct PortalDisplayPrelude {

4
src/portal/ptl_remote_desktop.rs
View file

@ -2,14 +2,14 @@ mod remote_desktop_gui;
use {
crate::{
dbus::{prelude::Variant, DbusObject, PendingReply},
dbus::{DbusObject, PendingReply, prelude::Variant},
ifs::jay_compositor::CREATE_EI_SESSION_SINCE,
portal::{
PORTAL_SUCCESS, PortalState,
ptl_display::{PortalDisplay, PortalDisplayId},
ptl_remote_desktop::remote_desktop_gui::SelectionGui,
ptl_screencast::ScreencastPhase,
ptl_session::{PortalSession, PortalSessionReply},
PortalState, PORTAL_SUCCESS,
},
utils::{
clonecell::{CloneCell, UnsafeCellCloneSafe},

2
src/portal/ptl_remote_desktop/remote_desktop_gui.rs
View file

@ -1,6 +1,6 @@
use {
crate::{
ifs::wl_seat::{wl_pointer::PRESSED, BTN_LEFT},
ifs::wl_seat::{BTN_LEFT, wl_pointer::PRESSED},
portal::{
ptl_display::{PortalDisplay, PortalOutput, PortalSeat},
ptl_remote_desktop::{PortalSession, RemoteDesktopPhase},

14
src/portal/ptl_screencast.rs
View file

@ -2,8 +2,8 @@ mod screencast_gui;
use {
crate::{
allocator::{AllocatorError, BufferObject, BufferUsage, BO_USE_RENDERING},
dbus::{prelude::Variant, DbusObject, DictEntry, PendingReply},
allocator::{AllocatorError, BO_USE_RENDERING, BufferObject, BufferUsage},
dbus::{DbusObject, DictEntry, PendingReply, prelude::Variant},
format::{Format, XRGB8888},
ifs::{jay_compositor::GET_TOPLEVEL_SINCE, jay_screencast::CLIENT_BUFFERS_SINCE},
pipewire::{
@ -14,17 +14,17 @@ use {
SUPPORTED_META_VIDEO_CROP,
},
pw_pod::{
spa_point, spa_rectangle, spa_region, PwPodRectangle, SPA_DATA_DmaBuf,
SPA_MEDIA_SUBTYPE_raw, SPA_MEDIA_TYPE_video, SpaChunkFlags, SPA_STATUS_HAVE_DATA,
SPA_VIDEO_FORMAT_UNKNOWN,
PwPodRectangle, SPA_DATA_DmaBuf, SPA_MEDIA_SUBTYPE_raw, SPA_MEDIA_TYPE_video,
SPA_STATUS_HAVE_DATA, SPA_VIDEO_FORMAT_UNKNOWN, SpaChunkFlags, spa_point,
spa_rectangle, spa_region,
},
},
portal::{
PORTAL_SUCCESS, PortalState,
ptl_display::{PortalDisplay, PortalDisplayId, PortalOutput},
ptl_remote_desktop::RemoteDesktopPhase,
ptl_screencast::screencast_gui::SelectionGui,
ptl_session::{PortalSession, PortalSessionReply},
PortalState, PORTAL_SUCCESS,
},
utils::{
clonecell::{CloneCell, UnsafeCellCloneSafe},
@ -32,7 +32,7 @@ use {
errorfmt::ErrorFmt,
opaque::Opaque,
},
video::{dmabuf::DmaBuf, Modifier, LINEAR_MODIFIER},
video::{LINEAR_MODIFIER, Modifier, dmabuf::DmaBuf},
wire::jay_screencast::Ready,
wire_dbus::{
org,

2
src/portal/ptl_screencast/screencast_gui.rs
View file

@ -1,6 +1,6 @@
use {
crate::{
ifs::wl_seat::{wl_pointer::PRESSED, BTN_LEFT},
ifs::wl_seat::{BTN_LEFT, wl_pointer::PRESSED},
portal::{
ptl_display::{PortalDisplay, PortalOutput, PortalSeat},
ptl_screencast::{

4
src/portal/ptl_session.rs
View file

@ -1,11 +1,11 @@
use {
crate::{
dbus::{prelude::Variant, DbusObject, DictEntry, DynamicType, PendingReply, FALSE},
dbus::{DbusObject, DictEntry, DynamicType, FALSE, PendingReply, prelude::Variant},
pipewire::pw_con::PwCon,
portal::{
PORTAL_SUCCESS, PortalState,
ptl_remote_desktop::{DeviceTypes, RemoteDesktopPhase},
ptl_screencast::{ScreencastPhase, ScreencastTarget},
PortalState, PORTAL_SUCCESS,
},
utils::{clonecell::CloneCell, hash_map_ext::HashMapExt},
wire_dbus::org::freedesktop::impl_::portal::{

2
src/portal/ptl_text.rs
View file

@ -3,8 +3,8 @@ use {
format::ARGB8888,
gfx_api::{GfxContext, GfxTexture},
pango::{
consts::{CAIRO_FORMAT_ARGB32, CAIRO_OPERATOR_SOURCE},
CairoContext, CairoImageSurface, PangoCairoContext, PangoFontDescription, PangoLayout,
consts::{CAIRO_FORMAT_ARGB32, CAIRO_OPERATOR_SOURCE},
},
rect::Rect,
theme::Color,

8
src/portal/ptr_gui.rs
View file

@ -1,12 +1,12 @@
use {
crate::{
allocator::{BufferObject, BufferUsage, BO_USE_RENDERING},
allocator::{BO_USE_RENDERING, BufferObject, BufferUsage},
async_engine::{Phase, SpawnedFuture},
cursor::KnownCursor,
fixed::Fixed,
format::ARGB8888,
gfx_api::{
needs_render_usage, AcquireSync, GfxContext, GfxFramebuffer, GfxTexture, ReleaseSync,
AcquireSync, GfxContext, GfxFramebuffer, GfxTexture, ReleaseSync, needs_render_usage,
},
ifs::zwlr_layer_shell_v1::OVERLAY,
portal::{
@ -21,8 +21,8 @@ use {
errorfmt::ErrorFmt, hash_map_ext::HashMapExt, rc_eq::rc_eq,
},
wire::{
wp_fractional_scale_v1::PreferredScale, zwlr_layer_surface_v1::Configure,
ZwpLinuxBufferParamsV1Id,
ZwpLinuxBufferParamsV1Id, wp_fractional_scale_v1::PreferredScale,
zwlr_layer_surface_v1::Configure,
},
wl_usr::usr_ifs::{
usr_linux_buffer_params::{UsrLinuxBufferParams, UsrLinuxBufferParamsOwner},