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

2
src/ifs/ext_foreign_toplevel_handle_v1.rs
View file

@ -4,7 +4,7 @@ use {
leaks::Tracker,
object::{Object, Version},
tree::ToplevelOpt,
wire::{ext_foreign_toplevel_handle_v1::*, ExtForeignToplevelHandleV1Id},
wire::{ExtForeignToplevelHandleV1Id, ext_foreign_toplevel_handle_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/ext_foreign_toplevel_image_capture_source_manager_v1.rs
View file

@ -6,8 +6,8 @@ use {
leaks::Tracker,
object::{Object, Version},
wire::{
ext_foreign_toplevel_image_capture_source_manager_v1::*,
ExtForeignToplevelImageCaptureSourceManagerV1Id,
ext_foreign_toplevel_image_capture_source_manager_v1::*,
},
},
std::rc::Rc,

6
src/ifs/ext_foreign_toplevel_list_v1.rs
View file

@ -1,6 +1,6 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_FOREIGN_TOPLEVEL_LIST},
client::{CAP_FOREIGN_TOPLEVEL_LIST, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::{
ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1,
@ -10,8 +10,8 @@ use {
object::{Object, Version},
tree::{NodeVisitorBase, ToplevelOpt},
wire::{
ext_foreign_toplevel_list_v1::*, ExtForeignToplevelHandleV1Id,
ExtForeignToplevelListV1Id,
ExtForeignToplevelHandleV1Id, ExtForeignToplevelListV1Id,
ext_foreign_toplevel_list_v1::*,
},
},
std::rc::Rc,

2
src/ifs/ext_idle_notification_v1.rs
View file

@ -6,7 +6,7 @@ use {
leaks::Tracker,
object::{Object, Version},
utils::asyncevent::AsyncEvent,
wire::{ext_idle_notification_v1::*, ExtIdleNotificationV1Id},
wire::{ExtIdleNotificationV1Id, ext_idle_notification_v1::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

4
src/ifs/ext_idle_notifier_v1.rs
View file

@ -1,12 +1,12 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_IDLE_NOTIFIER},
client::{CAP_IDLE_NOTIFIER, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::ext_idle_notification_v1::ExtIdleNotificationV1,
leaks::Tracker,
object::{Object, Version},
utils::errorfmt::ErrorFmt,
wire::{ext_idle_notifier_v1::*, ExtIdleNotificationV1Id, ExtIdleNotifierV1Id, WlSeatId},
wire::{ExtIdleNotificationV1Id, ExtIdleNotifierV1Id, WlSeatId, ext_idle_notifier_v1::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

2
src/ifs/ext_image_capture_source_v1.rs
View file

@ -5,7 +5,7 @@ use {
leaks::Tracker,
object::{Object, Version},
tree::ToplevelOpt,
wire::{ext_image_capture_source_v1::*, ExtImageCaptureSourceV1Id},
wire::{ExtImageCaptureSourceV1Id, ext_image_capture_source_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/ext_image_copy/ext_image_copy_capture_cursor_session_v1.rs
View file

@ -7,7 +7,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
wire::{ext_image_copy_capture_cursor_session_v1::*, ExtImageCopyCaptureCursorSessionV1Id},
wire::{ExtImageCopyCaptureCursorSessionV1Id, ext_image_copy_capture_cursor_session_v1::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

4
src/ifs/ext_image_copy/ext_image_copy_capture_frame_v1.rs
View file

@ -3,7 +3,7 @@ use {
client::{Client, ClientError},
gfx_api::{
AcquireSync, AsyncShmGfxTextureCallback, BufferResv, GfxError, GfxFramebuffer,
GfxTexture, ReleaseSync, SyncFile, STAGING_DOWNLOAD,
GfxTexture, ReleaseSync, STAGING_DOWNLOAD, SyncFile,
},
ifs::{
ext_image_capture_source_v1::ImageCaptureSource,
@ -15,7 +15,7 @@ use {
rect::Region,
tree::{Node, OutputNode},
utils::{cell_ext::CellExt, errorfmt::ErrorFmt, transform_ext::TransformExt},
wire::{ext_image_copy_capture_frame_v1::*, ExtImageCopyCaptureFrameV1Id},
wire::{ExtImageCopyCaptureFrameV1Id, ext_image_copy_capture_frame_v1::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/ext_image_copy/ext_image_copy_capture_manager_v1.rs
View file

@ -1,6 +1,6 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_SCREENCOPY_MANAGER},
client::{CAP_SCREENCOPY_MANAGER, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::{
ext_image_capture_source_v1::ImageCaptureSource,
@ -11,7 +11,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
wire::{ext_image_copy_capture_manager_v1::*, ExtImageCopyCaptureManagerV1Id},
wire::{ExtImageCopyCaptureManagerV1Id, ext_image_copy_capture_manager_v1::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/ext_image_copy/ext_image_copy_capture_session_v1.rs
View file

@ -1,7 +1,7 @@
use {
crate::{
client::{Client, ClientError},
format::{Format, FORMATS},
format::{FORMATS, Format},
gfx_api::{
AcquireSync, BufferResv, GfxInternalFramebuffer, GfxStagingBuffer, GfxTexture,
PendingShmTransfer, ReleaseSync,
@ -19,7 +19,7 @@ use {
tree::{LatchListener, OutputNode, PresentationListener},
utils::{cell_ext::CellExt, clonecell::CloneCell, event_listener::EventListener},
video::Modifier,
wire::{ext_image_copy_capture_session_v1::*, ExtImageCopyCaptureSessionV1Id},
wire::{ExtImageCopyCaptureSessionV1Id, ext_image_copy_capture_session_v1::*},
},
std::{
cell::Cell,

2
src/ifs/ext_output_image_capture_source_manager_v1.rs
View file

@ -6,7 +6,7 @@ use {
leaks::Tracker,
object::{Object, Version},
wire::{
ext_output_image_capture_source_manager_v1::*, ExtOutputImageCaptureSourceManagerV1Id,
ExtOutputImageCaptureSourceManagerV1Id, ext_output_image_capture_source_manager_v1::*,
},
},
std::rc::Rc,

4
src/ifs/ext_session_lock_manager_v1.rs
View file

@ -1,11 +1,11 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_SESSION_LOCK_MANAGER},
client::{CAP_SESSION_LOCK_MANAGER, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::ext_session_lock_v1::ExtSessionLockV1,
leaks::Tracker,
object::{Object, Version},
wire::{ext_session_lock_manager_v1::*, ExtSessionLockManagerV1Id},
wire::{ExtSessionLockManagerV1Id, ext_session_lock_manager_v1::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

2
src/ifs/ext_session_lock_v1.rs
View file

@ -6,7 +6,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
wire::{ext_session_lock_v1::*, ExtSessionLockV1Id},
wire::{ExtSessionLockV1Id, ext_session_lock_v1::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

6
src/ifs/ipc/data_control/ext_data_control_device_v1.rs
View file

@ -6,8 +6,8 @@ use {
ext_data_control_offer_v1::ExtDataControlOfferV1,
ext_data_control_source_v1::ExtDataControlSourceV1,
private::{
logic::{self, DataControlError},
DataControlDevice, DataControlDeviceData, DataControlIpc, DataControlOfferData,
logic::{self, DataControlError},
},
},
wl_seat::WlSeatGlobal,
@ -15,8 +15,8 @@ use {
leaks::Tracker,
object::{Object, Version},
wire::{
ext_data_control_device_v1::*, ExtDataControlDeviceV1Id, ExtDataControlOfferV1Id,
ExtDataControlSourceV1Id,
ExtDataControlDeviceV1Id, ExtDataControlOfferV1Id, ExtDataControlSourceV1Id,
ext_data_control_device_v1::*,
},
},
std::rc::Rc,

12
src/ifs/ipc/data_control/ext_data_control_manager_v1.rs
View file

@ -1,17 +1,17 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_DATA_CONTROL_MANAGER},
client::{CAP_DATA_CONTROL_MANAGER, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::ipc::{
data_control::{
ext_data_control_device_v1::ExtDataControlDeviceV1,
ext_data_control_source_v1::ExtDataControlSourceV1, DynDataControlDevice,
},
IpcLocation,
data_control::{
DynDataControlDevice, ext_data_control_device_v1::ExtDataControlDeviceV1,
ext_data_control_source_v1::ExtDataControlSourceV1,
},
},
leaks::Tracker,
object::{Object, Version},
wire::{ext_data_control_manager_v1::*, ExtDataControlManagerV1Id},
wire::{ExtDataControlManagerV1Id, ext_data_control_manager_v1::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/ipc/data_control/ext_data_control_offer_v1.rs
View file

@ -3,13 +3,13 @@ use {
ifs::ipc::data_control::{
ext_data_control_device_v1::ExtDataControlIpc,
private::{
logic::{self, DataControlError},
DataControlOffer, DataControlOfferData,
logic::{self, DataControlError},
},
},
leaks::Tracker,
object::Object,
wire::{ext_data_control_offer_v1::*, ExtDataControlOfferV1Id},
wire::{ExtDataControlOfferV1Id, ext_data_control_offer_v1::*},
},
std::rc::Rc,
thiserror::Error,

6
src/ifs/ipc/data_control/ext_data_control_source_v1.rs
View file

@ -2,18 +2,18 @@ use {
crate::{
client::Client,
ifs::ipc::{
IpcLocation, SourceData,
data_control::{
ext_data_control_device_v1::ExtDataControlIpc,
private::{
logic::{self, DataControlError},
DataControlSource, DataControlSourceData,
logic::{self, DataControlError},
},
},
IpcLocation, SourceData,
},
leaks::Tracker,
object::{Object, Version},
wire::{ext_data_control_source_v1::*, ExtDataControlSourceV1Id},
wire::{ExtDataControlSourceV1Id, ext_data_control_source_v1::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

9
src/ifs/ipc/data_control/private.rs
View file

@ -3,12 +3,11 @@ use {
client::{Client, ClientError, ClientId, WaylandObject, WaylandObjectLookup},
ifs::{
ipc::{
cancel_offer, cancel_offers,
DataOffer, DataOfferId, DataSource, DeviceData, DynDataOffer, DynDataSource,
IpcLocation, IpcVtable, OfferData, Role, SourceData, cancel_offer, cancel_offers,
data_control::{DataControlDeviceId, DynDataControlDevice},
detach_seat, offer_source_to_data_control_device, offer_source_to_x,
x_data_device::{XClipboardIpc, XIpcDevice, XPrimarySelectionIpc},
DataOffer, DataOfferId, DataSource, DeviceData, DynDataOffer, DynDataSource,
IpcLocation, IpcVtable, OfferData, Role, SourceData,
},
wl_seat::WlSeatGlobal,
},
@ -294,14 +293,14 @@ pub mod logic {
client::ClientError,
ifs::{
ipc::{
add_data_source_mime_type, break_device_loops, break_offer_loops,
IpcLocation, add_data_source_mime_type, break_device_loops, break_offer_loops,
break_source_loops,
data_control::private::{
Clipboard, DataControlDevice, DataControlOffer, DataControlSource,
PrimarySelection, Source, SourceId,
},
destroy_data_device, destroy_data_offer, destroy_data_source,
receive_data_offer, IpcLocation,
receive_data_offer,
},
wl_seat::WlSeatError,
},

6
src/ifs/ipc/data_control/zwlr_data_control_device_v1.rs
View file

@ -4,8 +4,8 @@ use {
ifs::{
ipc::data_control::{
private::{
logic::{self, DataControlError},
DataControlDevice, DataControlDeviceData, DataControlIpc, DataControlOfferData,
logic::{self, DataControlError},
},
zwlr_data_control_offer_v1::ZwlrDataControlOfferV1,
zwlr_data_control_source_v1::ZwlrDataControlSourceV1,
@ -15,8 +15,8 @@ use {
leaks::Tracker,
object::{Object, Version},
wire::{
zwlr_data_control_device_v1::*, ZwlrDataControlDeviceV1Id, ZwlrDataControlOfferV1Id,
ZwlrDataControlSourceV1Id,
ZwlrDataControlDeviceV1Id, ZwlrDataControlOfferV1Id, ZwlrDataControlSourceV1Id,
zwlr_data_control_device_v1::*,
},
},
std::rc::Rc,

12
src/ifs/ipc/data_control/zwlr_data_control_manager_v1.rs
View file

@ -1,17 +1,17 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_DATA_CONTROL_MANAGER},
client::{CAP_DATA_CONTROL_MANAGER, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::ipc::{
data_control::{
zwlr_data_control_device_v1::ZwlrDataControlDeviceV1,
zwlr_data_control_source_v1::ZwlrDataControlSourceV1, DynDataControlDevice,
},
IpcLocation,
data_control::{
DynDataControlDevice, zwlr_data_control_device_v1::ZwlrDataControlDeviceV1,
zwlr_data_control_source_v1::ZwlrDataControlSourceV1,
},
},
leaks::Tracker,
object::{Object, Version},
wire::{zwlr_data_control_manager_v1::*, ZwlrDataControlManagerV1Id},
wire::{ZwlrDataControlManagerV1Id, zwlr_data_control_manager_v1::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/ipc/data_control/zwlr_data_control_offer_v1.rs
View file

@ -2,14 +2,14 @@ use {
crate::{
ifs::ipc::data_control::{
private::{
logic::{self, DataControlError},
DataControlOffer, DataControlOfferData,
logic::{self, DataControlError},
},
zwlr_data_control_device_v1::WlrDataControlIpc,
},
leaks::Tracker,
object::Object,
wire::{zwlr_data_control_offer_v1::*, ZwlrDataControlOfferV1Id},
wire::{ZwlrDataControlOfferV1Id, zwlr_data_control_offer_v1::*},
},
std::rc::Rc,
thiserror::Error,

6
src/ifs/ipc/data_control/zwlr_data_control_source_v1.rs
View file

@ -2,18 +2,18 @@ use {
crate::{
client::Client,
ifs::ipc::{
IpcLocation, SourceData,
data_control::{
private::{
logic::{self, DataControlError},
DataControlSource, DataControlSourceData,
logic::{self, DataControlError},
},
zwlr_data_control_device_v1::WlrDataControlIpc,
},
IpcLocation, SourceData,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwlr_data_control_source_v1::*, ZwlrDataControlSourceV1Id},
wire::{ZwlrDataControlSourceV1Id, zwlr_data_control_source_v1::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

7
src/ifs/ipc/wl_data_device.rs
View file

@ -4,16 +4,15 @@ use {
fixed::Fixed,
ifs::{
ipc::{
break_device_loops, destroy_data_device, wl_data_offer::WlDataOffer,
wl_data_source::WlDataSource, DeviceData, IpcVtable, IterableIpcVtable, OfferData,
Role,
DeviceData, IpcVtable, IterableIpcVtable, OfferData, Role, break_device_loops,
destroy_data_device, wl_data_offer::WlDataOffer, wl_data_source::WlDataSource,
},
wl_seat::{WlSeatError, WlSeatGlobal},
wl_surface::WlSurfaceError,
},
leaks::Tracker,
object::{Object, Version},
wire::{wl_data_device::*, WlDataDeviceId, WlDataOfferId, WlSurfaceId},
wire::{WlDataDeviceId, WlDataOfferId, WlSurfaceId, wl_data_device::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/ipc/wl_data_device_manager.rs
View file

@ -5,7 +5,7 @@ use {
ifs::ipc::{wl_data_device::WlDataDevice, wl_data_source::WlDataSource},
leaks::Tracker,
object::{Object, Version},
wire::{wl_data_device_manager::*, WlDataDeviceManagerId},
wire::{WlDataDeviceManagerId, wl_data_device_manager::*},
},
std::rc::Rc,
thiserror::Error,

8
src/ifs/ipc/wl_data_offer.rs
View file

@ -4,18 +4,18 @@ use {
fixed::Fixed,
ifs::{
ipc::{
break_offer_loops, cancel_offer, destroy_data_offer, receive_data_offer,
DataOffer, DataOfferId, DynDataOffer, OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED,
OFFER_STATE_FINISHED, OfferData, Role, SOURCE_STATE_FINISHED, break_offer_loops,
cancel_offer, destroy_data_offer, receive_data_offer,
wl_data_device::{ClipboardIpc, WlDataDevice},
wl_data_device_manager::DND_ALL,
DataOffer, DataOfferId, DynDataOffer, OfferData, Role, OFFER_STATE_ACCEPTED,
OFFER_STATE_DROPPED, OFFER_STATE_FINISHED, SOURCE_STATE_FINISHED,
},
wl_seat::WlSeatGlobal,
},
leaks::Tracker,
object::Object,
utils::bitflags::BitflagsExt,
wire::{wl_data_offer::*, WlDataOfferId, WlSurfaceId},
wire::{WlDataOfferId, WlSurfaceId, wl_data_offer::*},
},
std::rc::Rc,
thiserror::Error,

7
src/ifs/ipc/wl_data_source.rs
View file

@ -3,14 +3,13 @@ use {
client::{Client, ClientError},
ifs::{
ipc::{
DataSource, DynDataOffer, DynDataSource, OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED,
SOURCE_STATE_CANCELLED, SOURCE_STATE_DROPPED, SharedState, SourceData,
add_data_source_mime_type, break_source_loops, cancel_offers, destroy_data_source,
detach_seat, offer_source_to_x,
wl_data_device::ClipboardIpc,
wl_data_device_manager::{DND_ALL, DND_NONE},
x_data_device::{XClipboardIpc, XIpcDevice},
DataSource, DynDataOffer, DynDataSource, SharedState, SourceData,
OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED, SOURCE_STATE_CANCELLED,
SOURCE_STATE_DROPPED,
},
wl_seat::WlSeatGlobal,
xdg_toplevel_drag_v1::XdgToplevelDragV1,
@ -18,7 +17,7 @@ use {
leaks::Tracker,
object::{Object, Version},
utils::{bitflags::BitflagsExt, cell_ext::CellExt, clonecell::CloneCell},
wire::{wl_data_source::*, WlDataSourceId},
wire::{WlDataSourceId, wl_data_source::*},
},
std::rc::Rc,
thiserror::Error,

6
src/ifs/ipc/x_data_device.rs
View file

@ -3,16 +3,16 @@ use {
client::{Client, ClientError},
ifs::{
ipc::{
x_data_offer::XDataOffer, x_data_source::XDataSource, DeviceData, IpcLocation,
IpcVtable, OfferData, Role,
DeviceData, IpcLocation, IpcVtable, OfferData, Role, x_data_offer::XDataOffer,
x_data_source::XDataSource,
},
wl_seat::WlSeatGlobal,
},
state::State,
xwayland::XWaylandEvent,
},
std::rc::Rc,
XWaylandEvent::IpcSetOffer,
std::rc::Rc,
};
linear_ids!(XIpcDeviceIds, XIpcDeviceId, u64);

5
src/ifs/ipc/x_data_offer.rs
View file

@ -3,17 +3,16 @@ use {
client::ClientId,
ifs::{
ipc::{
cancel_offer,
DataOffer, DataOfferId, DynDataOffer, IpcLocation, OfferData, cancel_offer,
x_data_device::{XClipboardIpc, XIpcDevice, XPrimarySelectionIpc},
DataOffer, DataOfferId, DynDataOffer, IpcLocation, OfferData,
},
wl_seat::WlSeatGlobal,
},
leaks::Tracker,
xwayland::XWaylandEvent,
},
std::rc::Rc,
XWaylandEvent::IpcAddOfferMimeType,
std::rc::Rc,
};
pub struct XDataOffer {

4
src/ifs/ipc/x_data_source.rs
View file

@ -2,8 +2,8 @@ use {
crate::{
ifs::{
ipc::{
cancel_offers, detach_seat, x_data_device::XIpcDevice, DataSource, DynDataSource,
IpcLocation, SourceData,
DataSource, DynDataSource, IpcLocation, SourceData, cancel_offers, detach_seat,
x_data_device::XIpcDevice,
},
wl_seat::WlSeatGlobal,
},

2
src/ifs/ipc/zwp_primary_selection_device_manager_v1.rs
View file

@ -8,7 +8,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_primary_selection_device_manager_v1::*, ZwpPrimarySelectionDeviceManagerV1Id},
wire::{ZwpPrimarySelectionDeviceManagerV1Id, zwp_primary_selection_device_manager_v1::*},
},
std::rc::Rc,
thiserror::Error,

11
src/ifs/ipc/zwp_primary_selection_device_v1.rs
View file

@ -3,18 +3,17 @@ use {
client::{Client, ClientError, ClientId},
ifs::{
ipc::{
break_device_loops, destroy_data_device,
zwp_primary_selection_offer_v1::ZwpPrimarySelectionOfferV1,
zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1, DeviceData,
IpcVtable, IterableIpcVtable, OfferData, Role,
DeviceData, IpcVtable, IterableIpcVtable, OfferData, Role, break_device_loops,
destroy_data_device, zwp_primary_selection_offer_v1::ZwpPrimarySelectionOfferV1,
zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1,
},
wl_seat::{WlSeatError, WlSeatGlobal},
},
leaks::Tracker,
object::{Object, Version},
wire::{
zwp_primary_selection_device_v1::*, ZwpPrimarySelectionDeviceV1Id,
ZwpPrimarySelectionOfferV1Id,
ZwpPrimarySelectionDeviceV1Id, ZwpPrimarySelectionOfferV1Id,
zwp_primary_selection_device_v1::*,
},
},
std::rc::Rc,

6
src/ifs/ipc/zwp_primary_selection_offer_v1.rs
View file

@ -3,17 +3,17 @@ use {
client::{Client, ClientError, ClientId},
ifs::{
ipc::{
break_offer_loops, cancel_offer, destroy_data_offer, receive_data_offer,
DataOffer, DataOfferId, DynDataOffer, OfferData, break_offer_loops, cancel_offer,
destroy_data_offer, receive_data_offer,
zwp_primary_selection_device_v1::{
PrimarySelectionIpc, ZwpPrimarySelectionDeviceV1,
},
DataOffer, DataOfferId, DynDataOffer, OfferData,
},
wl_seat::WlSeatGlobal,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_primary_selection_offer_v1::*, ZwpPrimarySelectionOfferV1Id},
wire::{ZwpPrimarySelectionOfferV1Id, zwp_primary_selection_offer_v1::*},
},
std::rc::Rc,
thiserror::Error,

8
src/ifs/ipc/zwp_primary_selection_source_v1.rs
View file

@ -3,17 +3,17 @@ use {
client::{Client, ClientError},
ifs::{
ipc::{
add_data_source_mime_type, break_source_loops, cancel_offers, destroy_data_source,
detach_seat, offer_source_to_x,
DataSource, DynDataSource, SourceData, add_data_source_mime_type,
break_source_loops, cancel_offers, destroy_data_source, detach_seat,
offer_source_to_x,
x_data_device::{XIpcDevice, XPrimarySelectionIpc},
zwp_primary_selection_device_v1::PrimarySelectionIpc,
DataSource, DynDataSource, SourceData,
},
wl_seat::WlSeatGlobal,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_primary_selection_source_v1::*, ZwpPrimarySelectionSourceV1Id},
wire::{ZwpPrimarySelectionSourceV1Id, zwp_primary_selection_source_v1::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/jay_compositor.rs
View file

@ -1,7 +1,7 @@
use {
crate::{
cli::CliLogLevel,
client::{Client, ClientCaps, ClientError, CAP_JAY_COMPOSITOR},
client::{CAP_JAY_COMPOSITOR, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::{
jay_ei_session_builder::JayEiSessionBuilder,
@ -24,7 +24,7 @@ use {
object::{Object, Version},
screenshoter::take_screenshot,
utils::{errorfmt::ErrorFmt, toplevel_identifier::ToplevelIdentifier},
wire::{jay_compositor::*, JayCompositorId, JayScreenshotId},
wire::{JayCompositorId, JayScreenshotId, jay_compositor::*},
},
bstr::ByteSlice,
log::Level,

4
src/ifs/jay_damage_tracking.rs
View file

@ -1,16 +1,16 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_JAY_COMPOSITOR},
client::{CAP_JAY_COMPOSITOR, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
leaks::Tracker,
object::{Object, Version},
theme::Color,
wire::{
JayCompositorId,
jay_damage_tracking::{
Destroy, JayDamageTrackingRequestHandler, SetVisualizerColor, SetVisualizerDecay,
SetVisualizerEnabled,
},
JayCompositorId,
},
},
std::{rc::Rc, time::Duration},

2
src/ifs/jay_ei_session.rs
View file

@ -4,8 +4,8 @@ use {
leaks::Tracker,
object::{Object, Version},
wire::{
jay_ei_session::{Created, Destroyed, Failed, JayEiSessionRequestHandler, Release},
JayEiSessionId,
jay_ei_session::{Created, Destroyed, Failed, JayEiSessionRequestHandler, Release},
},
},
std::rc::Rc,

2
src/ifs/jay_ei_session_builder.rs
View file

@ -7,8 +7,8 @@ use {
object::{Object, Version},
utils::{errorfmt::ErrorFmt, oserror::OsError},
wire::{
jay_ei_session_builder::{Commit, JayEiSessionBuilderRequestHandler, SetAppId},
JayEiSessionBuilderId,
jay_ei_session_builder::{Commit, JayEiSessionBuilderRequestHandler, SetAppId},
},
},
std::{cell::RefCell, rc::Rc},

2
src/ifs/jay_idle.rs
View file

@ -4,7 +4,7 @@ use {
ifs::wl_surface::zwp_idle_inhibitor_v1::ZwpIdleInhibitorV1,
leaks::Tracker,
object::{Object, Version},
wire::{jay_idle::*, JayIdleId},
wire::{JayIdleId, jay_idle::*},
},
std::{rc::Rc, time::Duration},
thiserror::Error,

2
src/ifs/jay_input.rs
View file

@ -13,7 +13,7 @@ use {
object::{Object, Version},
state::{DeviceHandlerData, InputDeviceData},
utils::errorfmt::ErrorFmt,
wire::{jay_input::*, JayInputId},
wire::{JayInputId, jay_input::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/jay_log_file.rs
View file

@ -3,7 +3,7 @@ use {
client::{Client, ClientError},
leaks::Tracker,
object::{Object, Version},
wire::{jay_log_file::*, JayLogFileId},
wire::{JayLogFileId, jay_log_file::*},
},
bstr::BStr,
std::rc::Rc,

2
src/ifs/jay_output.rs
View file

@ -4,7 +4,7 @@ use {
ifs::wl_output::OutputGlobalOpt,
leaks::Tracker,
object::{Object, Version},
wire::{jay_output::*, JayOutputId},
wire::{JayOutputId, jay_output::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/jay_pointer.rs
View file

@ -5,7 +5,7 @@ use {
ifs::wl_seat::WlSeatGlobal,
leaks::Tracker,
object::{Object, Version},
wire::{jay_pointer::*, JayPointerId},
wire::{JayPointerId, jay_pointer::*},
},
num_traits::FromPrimitive,
std::rc::Rc,

2
src/ifs/jay_randr.rs
View file

@ -10,7 +10,7 @@ use {
state::{ConnectorData, DrmDevData, OutputData},
tree::{OutputNode, TearingMode, VrrMode},
utils::{gfx_api_ext::GfxApiExt, transform_ext::TransformExt},
wire::{jay_randr::*, JayRandrId},
wire::{JayRandrId, jay_randr::*},
},
jay_config::video::{
GfxApi, TearingMode as ConfigTearingMode, Transform, VrrMode as ConfigVrrMode,

2
src/ifs/jay_render_ctx.rs
View file

@ -5,7 +5,7 @@ use {
leaks::Tracker,
object::{Object, Version},
utils::errorfmt::ErrorFmt,
wire::{jay_render_ctx::*, JayRenderCtxId},
wire::{JayRenderCtxId, jay_render_ctx::*},
},
std::rc::Rc,
thiserror::Error,

8
src/ifs/jay_screencast.rs
View file

@ -1,6 +1,6 @@
use {
crate::{
allocator::{AllocatorError, BufferObject, BO_USE_LINEAR, BO_USE_RENDERING},
allocator::{AllocatorError, BO_USE_LINEAR, BO_USE_RENDERING, BufferObject},
client::{Client, ClientError},
format::XRGB8888,
gfx_api::{
@ -19,8 +19,8 @@ use {
numcell::NumCell,
option_ext::OptionExt,
},
video::{dmabuf::DmaBuf, INVALID_MODIFIER, LINEAR_MODIFIER},
wire::{jay_screencast::*, JayScreencastId},
video::{INVALID_MODIFIER, LINEAR_MODIFIER, dmabuf::DmaBuf},
wire::{JayScreencastId, jay_screencast::*},
},
ahash::AHashSet,
jay_config::video::Transform,
@ -437,7 +437,7 @@ impl JayScreencast {
}
true => return Err(JayScreencastError::Modifier),
false if format.write_modifiers.is_empty() => {
return Err(JayScreencastError::XRGB8888Writing)
return Err(JayScreencastError::XRGB8888Writing);
}
false => format.write_modifiers.keys().copied().collect(),
};

2
src/ifs/jay_screenshot.rs
View file

@ -4,7 +4,7 @@ use {
leaks::Tracker,
object::{Object, Version},
video::dmabuf::{DmaBuf, DmaBufPlane},
wire::{jay_screenshot::*, JayScreenshotId},
wire::{JayScreenshotId, jay_screenshot::*},
},
std::{convert::Infallible, rc::Rc},
uapi::OwnedFd,

4
src/ifs/jay_seat_events.rs
View file

@ -4,16 +4,16 @@ use {
client::Client,
fixed::Fixed,
ifs::wl_seat::{
SeatId,
tablet::{
PadButtonState, TabletRingEventSource, TabletStripEventSource, TabletTool,
TabletToolChanges, TabletToolId, ToolButtonState,
},
wl_pointer::PendingScroll,
SeatId,
},
leaks::Tracker,
object::{Object, Version},
wire::{jay_seat_events::*, JaySeatEventsId},
wire::{JaySeatEventsId, jay_seat_events::*},
},
std::{convert::Infallible, rc::Rc},
};

4
src/ifs/jay_select_toplevel.rs
View file

@ -2,14 +2,14 @@ use {
crate::{
client::{Client, ClientError},
ifs::{
jay_toplevel::{JayToplevel, ID_SINCE},
jay_toplevel::{ID_SINCE, JayToplevel},
wl_seat::ToplevelSelector,
},
leaks::Tracker,
object::{Object, Version},
tree::ToplevelNode,
utils::clonecell::CloneCell,
wire::{jay_select_toplevel::*, JaySelectToplevelId, JayToplevelId},
wire::{JaySelectToplevelId, JayToplevelId, jay_select_toplevel::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

2
src/ifs/jay_select_workspace.rs
View file

@ -6,7 +6,7 @@ use {
object::{Object, Version},
tree::WorkspaceNode,
utils::clonecell::CloneCell,
wire::{jay_select_workspace::*, JaySelectWorkspaceId, JayWorkspaceId},
wire::{JaySelectWorkspaceId, JayWorkspaceId, jay_select_workspace::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

2
src/ifs/jay_toplevel.rs
View file

@ -4,7 +4,7 @@ use {
leaks::Tracker,
object::{Object, Version},
tree::ToplevelNode,
wire::{jay_toplevel::*, JayToplevelId},
wire::{JayToplevelId, jay_toplevel::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

2
src/ifs/jay_tray_v1.rs
View file

@ -8,7 +8,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
wire::{jay_tray_v1::*, JayTrayV1Id},
wire::{JayTrayV1Id, jay_tray_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/jay_workspace.rs
View file

@ -5,7 +5,7 @@ use {
object::{Object, Version},
tree::{OutputNode, WorkspaceNode},
utils::clonecell::CloneCell,
wire::{jay_workspace::*, JayWorkspaceId},
wire::{JayWorkspaceId, jay_workspace::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/jay_workspace_watcher.rs
View file

@ -6,7 +6,7 @@ use {
object::{Object, Version},
tree::WorkspaceNode,
utils::clonecell::CloneCell,
wire::{jay_workspace_watcher::*, JayWorkspaceWatcherId},
wire::{JayWorkspaceWatcherId, jay_workspace_watcher::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/jay_xwayland.rs
View file

@ -3,7 +3,7 @@ use {
client::{Client, ClientError},
leaks::Tracker,
object::{Object, Version},
wire::{jay_xwayland::*, JayXwaylandId},
wire::{JayXwaylandId, jay_xwayland::*},
},
jay_config::xwayland::XScalingMode,
std::rc::Rc,

2
src/ifs/org_kde_kwin_server_decoration.rs
View file

@ -3,7 +3,7 @@ use {
client::{Client, ClientError},
leaks::Tracker,
object::{Object, Version},
wire::{org_kde_kwin_server_decoration::*, OrgKdeKwinServerDecorationId},
wire::{OrgKdeKwinServerDecorationId, org_kde_kwin_server_decoration::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

2
src/ifs/org_kde_kwin_server_decoration_manager.rs
View file

@ -7,7 +7,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
wire::{org_kde_kwin_server_decoration_manager::*, OrgKdeKwinServerDecorationManagerId},
wire::{OrgKdeKwinServerDecorationManagerId, org_kde_kwin_server_decoration_manager::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/wl_buffer.rs
View file

@ -2,7 +2,7 @@ use {
crate::{
client::{Client, ClientError},
clientmem::{ClientMem, ClientMemError, ClientMemOffset},
format::{Format, ARGB8888},
format::{ARGB8888, Format},
gfx_api::{GfxError, GfxFramebuffer, GfxImage, GfxTexture},
ifs::wl_surface::WlSurface,
leaks::Tracker,
@ -11,7 +11,7 @@ use {
theme::Color,
utils::errorfmt::ErrorFmt,
video::dmabuf::DmaBuf,
wire::{wl_buffer::*, WlBufferId},
wire::{WlBufferId, wl_buffer::*},
},
std::{
cell::{Cell, RefCell},

2
src/ifs/wl_callback.rs
View file

@ -3,7 +3,7 @@ use {
client::Client,
leaks::Tracker,
object::{Object, Version},
wire::{wl_callback::*, WlCallbackId},
wire::{WlCallbackId, wl_callback::*},
},
std::{convert::Infallible, rc::Rc},
thiserror::Error,

2
src/ifs/wl_compositor.rs
View file

@ -5,7 +5,7 @@ use {
ifs::{wl_region::WlRegion, wl_surface::WlSurface},
leaks::Tracker,
object::{Object, Version},
wire::{wl_compositor::*, WlCompositorId},
wire::{WlCompositorId, wl_compositor::*},
xwayland::XWaylandEvent,
},
std::rc::Rc,

2
src/ifs/wl_display.rs
View file

@ -4,7 +4,7 @@ use {
ifs::{wl_callback::WlCallback, wl_registry::WlRegistry},
leaks::Tracker,
object::{Object, ObjectId, Version, WL_DISPLAY_ID},
wire::{wl_display::*, WlDisplayId},
wire::{WlDisplayId, wl_display::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/wl_drm.rs
View file

@ -7,10 +7,10 @@ use {
leaks::Tracker,
object::{Object, Version},
video::{
dmabuf::{DmaBuf, DmaBufPlane, PlaneVec},
INVALID_MODIFIER,
dmabuf::{DmaBuf, DmaBufPlane, PlaneVec},
},
wire::{wl_drm::*, WlDrmId},
wire::{WlDrmId, wl_drm::*},
},
bstr::ByteSlice,
std::{ffi::CString, rc::Rc},

2
src/ifs/wl_fixes.rs
View file

@ -4,7 +4,7 @@ use {
globals::{Global, GlobalName},
leaks::Tracker,
object::{Object, Version},
wire::{wl_fixes::*, WlFixesId},
wire::{WlFixesId, wl_fixes::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/wl_output.rs
View file

@ -12,12 +12,12 @@ use {
object::{Object, Version},
rect::Rect,
state::{ConnectorData, State},
tree::{calculate_logical_size, OutputNode, TearingMode, VrrMode},
tree::{OutputNode, TearingMode, VrrMode, calculate_logical_size},
utils::{
cell_ext::CellExt, clonecell::CloneCell, copyhashmap::CopyHashMap, rc_eq::rc_eq,
transform_ext::TransformExt,
},
wire::{wl_output::*, WlOutputId, ZxdgOutputV1Id},
wire::{WlOutputId, ZxdgOutputV1Id, wl_output::*},
},
ahash::AHashMap,
jay_config::video::Transform,

2
src/ifs/wl_output/removed_output.rs
View file

@ -2,7 +2,7 @@ use {
crate::{
client::{Client, ClientError},
globals::{Global, GlobalName, RemovableWaylandGlobal},
ifs::wl_output::{WlOutput, WlOutputGlobal, OUTPUT_VERSION},
ifs::wl_output::{OUTPUT_VERSION, WlOutput, WlOutputGlobal},
object::Version,
wire::WlOutputId,
},

2
src/ifs/wl_region.rs
View file

@ -4,7 +4,7 @@ use {
leaks::Tracker,
object::{Object, Version},
rect::{Rect, Region, RegionBuilder},
wire::{wl_region::*, WlRegionId},
wire::{WlRegionId, wl_region::*},
},
std::{cell::RefCell, rc::Rc},
thiserror::Error,

2
src/ifs/wl_registry.rs
View file

@ -4,7 +4,7 @@ use {
globals::{Global, GlobalName, GlobalsError},
leaks::Tracker,
object::{Interface, Object, Version},
wire::{wl_registry::*, WlRegistryId},
wire::{WlRegistryId, wl_registry::*},
},
std::rc::Rc,
thiserror::Error,

17
src/ifs/wl_seat.rs
View file

@ -32,7 +32,7 @@ use {
ifs::{
ext_idle_notification_v1::ExtIdleNotificationV1,
ipc::{
self,
self, DynDataSource, IpcError, IpcLocation,
data_control::{DataControlDeviceId, DynDataControlDevice},
offer_source_to_regular_client,
wl_data_device::{ClipboardIpc, WlDataDevice},
@ -42,7 +42,6 @@ use {
PrimarySelectionIpc, ZwpPrimarySelectionDeviceV1,
},
zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1,
DynDataSource, IpcError, IpcLocation,
},
wl_output::WlOutputGlobal,
wl_seat::{
@ -55,7 +54,7 @@ use {
zwp_input_method_v2::ZwpInputMethodV2, zwp_text_input_v3::ZwpTextInputV3,
},
touch_owner::TouchOwnerHolder,
wl_keyboard::{WlKeyboard, WlKeyboardError, REPEAT_INFO_SINCE},
wl_keyboard::{REPEAT_INFO_SINCE, WlKeyboard, WlKeyboardError},
wl_pointer::WlPointer,
wl_touch::WlTouch,
zwp_pointer_constraints_v1::{SeatConstraint, SeatConstraintStatus},
@ -65,10 +64,10 @@ use {
zwp_relative_pointer_v1::ZwpRelativePointerV1,
},
wl_surface::{
WlSurface,
dnd_icon::DndIcon,
tray::{DynTrayItem, TrayItemId},
xdg_surface::xdg_popup::XdgPopup,
WlSurface,
},
xdg_toplevel_drag_v1::XdgToplevelDragV1,
},
@ -79,8 +78,8 @@ use {
rect::Rect,
state::{DeviceHandlerData, State},
tree::{
generic_node_visitor, ContainerNode, ContainerSplit, Direction, FoundNode, Node,
OutputNode, ToplevelNode, WorkspaceNode,
ContainerNode, ContainerSplit, Direction, FoundNode, Node, OutputNode, ToplevelNode,
WorkspaceNode, generic_node_visitor,
},
utils::{
asyncevent::AsyncEvent, bindings::PerClientBindings, clonecell::CloneCell,
@ -88,9 +87,9 @@ use {
smallmap::SmallMap,
},
wire::{
wl_seat::*, ExtIdleNotificationV1Id, WlDataDeviceId, WlKeyboardId, WlPointerId,
WlSeatId, WlTouchId, XdgPopupId, ZwpPrimarySelectionDeviceV1Id, ZwpRelativePointerV1Id,
ZwpTextInputV3Id,
ExtIdleNotificationV1Id, WlDataDeviceId, WlKeyboardId, WlPointerId, WlSeatId,
WlTouchId, XdgPopupId, ZwpPrimarySelectionDeviceV1Id, ZwpRelativePointerV1Id,
ZwpTextInputV3Id, wl_seat::*,
},
wire_ei::EiSeatId,
},

18
src/ifs/wl_seat/event_handling.rs
View file

@ -1,7 +1,7 @@
use {
crate::{
backend::{
AxisSource, ConnectorId, InputDeviceId, InputEvent, KeyState, ScrollAxis, AXIS_120,
AXIS_120, AxisSource, ConnectorId, InputDeviceId, InputEvent, KeyState, ScrollAxis,
},
client::ClientId,
config::InvokedShortcut,
@ -17,21 +17,21 @@ use {
},
},
wl_seat::{
CHANGE_CURSOR_MOVED, CHANGE_TREE, Dnd, SeatId, WlSeat, WlSeatGlobal,
tablet::{TabletPad, TabletPadId, TabletTool, TabletToolId},
text_input::TextDisconnectReason,
wl_keyboard::WlKeyboard,
wl_pointer::{
self, PendingScroll, WlPointer, AXIS_DISCRETE_SINCE_VERSION,
AXIS_RELATIVE_DIRECTION_SINCE_VERSION, AXIS_SOURCE_SINCE_VERSION,
AXIS_STOP_SINCE_VERSION, AXIS_VALUE120_SINCE_VERSION, IDENTICAL, INVERTED,
POINTER_FRAME_SINCE_VERSION, WHEEL_TILT, WHEEL_TILT_SINCE_VERSION,
self, AXIS_DISCRETE_SINCE_VERSION, AXIS_RELATIVE_DIRECTION_SINCE_VERSION,
AXIS_SOURCE_SINCE_VERSION, AXIS_STOP_SINCE_VERSION,
AXIS_VALUE120_SINCE_VERSION, IDENTICAL, INVERTED, POINTER_FRAME_SINCE_VERSION,
PendingScroll, WHEEL_TILT, WHEEL_TILT_SINCE_VERSION, WlPointer,
},
wl_touch::WlTouch,
zwp_pointer_constraints_v1::{ConstraintType, SeatConstraintStatus},
zwp_relative_pointer_v1::ZwpRelativePointerV1,
Dnd, SeatId, WlSeat, WlSeatGlobal, CHANGE_CURSOR_MOVED, CHANGE_TREE,
},
wl_surface::{xdg_surface::xdg_popup::XdgPopup, WlSurface},
wl_surface::{WlSurface, xdg_surface::xdg_popup::XdgPopup},
},
kbvm::KbvmState,
keyboard::KeyboardState,
@ -49,11 +49,11 @@ use {
jay_config::{
input::SwitchEvent,
keyboard::{
mods::{Modifiers, CAPS, NUM, RELEASE},
mods::{CAPS, Modifiers, NUM, RELEASE},
syms::{KeySym, SYM_Escape},
},
},
kbvm::{state_machine::Event, ModifierMask},
kbvm::{ModifierMask, state_machine::Event},
smallvec::SmallVec,
std::{cell::RefCell, collections::hash_map::Entry, mem, rc::Rc},
};

4
src/ifs/wl_seat/ext_transient_seat_manager_v1.rs
View file

@ -1,11 +1,11 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_SEAT_MANAGER},
client::{CAP_SEAT_MANAGER, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::wl_seat::ext_transient_seat_v1::ExtTransientSeatV1,
leaks::Tracker,
object::{Object, Version},
wire::{ext_transient_seat_manager_v1::*, ExtTransientSeatManagerV1Id},
wire::{ExtTransientSeatManagerV1Id, ext_transient_seat_manager_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/wl_seat/ext_transient_seat_v1.rs
View file

@ -3,7 +3,7 @@ use {
client::{Client, ClientError},
leaks::Tracker,
object::{Object, Version},
wire::{ext_transient_seat_v1::*, ExtTransientSeatV1Id},
wire::{ExtTransientSeatV1Id, ext_transient_seat_v1::*},
},
std::rc::Rc,
thiserror::Error,

14
src/ifs/wl_seat/pointer_owner.rs
View file

@ -1,23 +1,23 @@
use {
crate::{
backend::{AxisSource, KeyState, ScrollAxis, AXIS_120},
backend::{AXIS_120, AxisSource, KeyState, ScrollAxis},
cursor::KnownCursor,
fixed::Fixed,
ifs::{
ipc,
ipc::wl_data_source::WlDataSource,
wl_seat::{
wl_pointer::PendingScroll, Dnd, DroppedDnd, NodeSeatState, WlSeatError,
WlSeatGlobal, BTN_LEFT, BTN_RIGHT, CHANGE_CURSOR_MOVED, CHANGE_TREE,
BTN_LEFT, BTN_RIGHT, CHANGE_CURSOR_MOVED, CHANGE_TREE, Dnd, DroppedDnd,
NodeSeatState, WlSeatError, WlSeatGlobal, wl_pointer::PendingScroll,
},
wl_surface::{dnd_icon::DndIcon, WlSurface},
wl_surface::{WlSurface, dnd_icon::DndIcon},
xdg_toplevel_drag_v1::XdgToplevelDragV1,
},
rect::Rect,
tree::{
move_ws_to_output, ContainerNode, ContainerSplit, ContainingNode, FindTreeUsecase,
FoundNode, Node, PlaceholderNode, TddType, ToplevelNode, WorkspaceDragDestination,
WorkspaceNode, WsMoveConfig,
ContainerNode, ContainerSplit, ContainingNode, FindTreeUsecase, FoundNode, Node,
PlaceholderNode, TddType, ToplevelNode, WorkspaceDragDestination, WorkspaceNode,
WsMoveConfig, move_ws_to_output,
},
utils::{clonecell::CloneCell, smallmap::SmallMap},
},

2
src/ifs/wl_seat/tablet.rs
View file

@ -4,6 +4,7 @@ use {
cursor_user::CursorUser,
ifs::{
wl_seat::{
WlSeatGlobal,
tablet::{
pad_owner::PadOwnerHolder, tablet_bindings::TabletBindings,
tool_owner::ToolOwnerHolder, zwp_tablet_pad_group_v2::ZwpTabletPadGroupV2,
@ -12,7 +13,6 @@ use {
zwp_tablet_pad_v2::ZwpTabletPadV2, zwp_tablet_seat_v2::ZwpTabletSeatV2,
zwp_tablet_tool_v2::ZwpTabletToolV2, zwp_tablet_v2::ZwpTabletV2,
},
WlSeatGlobal,
},
wl_surface::WlSurface,
},

4
src/ifs/wl_seat/tablet/pad.rs
View file

@ -4,12 +4,12 @@ use {
fixed::Fixed,
ifs::{
wl_seat::{
WlSeatGlobal,
tablet::{
normalizeu, zwp_tablet_pad_v2::ZwpTabletPadV2, zwp_tablet_v2::ZwpTabletV2,
PadButtonState, TabletPad, TabletPadGroup, TabletPadId, TabletPadInit,
TabletPadRing, TabletPadStrip, TabletRingEventSource, TabletStripEventSource,
normalizeu, zwp_tablet_pad_v2::ZwpTabletPadV2, zwp_tablet_v2::ZwpTabletV2,
},
WlSeatGlobal,
},
wl_surface::WlSurface,
},

10
src/ifs/wl_seat/tablet/tool.rs
View file

@ -4,12 +4,12 @@ use {
fixed::Fixed,
ifs::{
wl_seat::{
tablet::{
normalizei, normalizeu, zwp_tablet_tool_v2::ZwpTabletToolV2,
zwp_tablet_v2::ZwpTabletV2, TabletTool, TabletToolChanges, TabletToolId,
TabletToolInit, TabletToolOpt, TabletToolType, ToolButtonState,
},
WlSeatGlobal,
tablet::{
TabletTool, TabletToolChanges, TabletToolId, TabletToolInit, TabletToolOpt,
TabletToolType, ToolButtonState, normalizei, normalizeu,
zwp_tablet_tool_v2::ZwpTabletToolV2, zwp_tablet_v2::ZwpTabletV2,
},
},
wl_surface::WlSurface,
},

2
src/ifs/wl_seat/tablet/zwp_tablet_manager_v2.rs
View file

@ -5,7 +5,7 @@ use {
ifs::wl_seat::tablet::zwp_tablet_seat_v2::ZwpTabletSeatV2,
leaks::Tracker,
object::{Object, Version},
wire::{zwp_tablet_manager_v2::*, ZwpTabletManagerV2Id},
wire::{ZwpTabletManagerV2Id, zwp_tablet_manager_v2::*},
},
std::rc::Rc,
thiserror::Error,

5
src/ifs/wl_seat/tablet/zwp_tablet_pad_group_v2.rs
View file

@ -2,13 +2,12 @@ use {
crate::{
client::{Client, ClientError},
ifs::wl_seat::tablet::{
zwp_tablet_pad_ring_v2::ZwpTabletPadRingV2,
TabletPadGroup, zwp_tablet_pad_ring_v2::ZwpTabletPadRingV2,
zwp_tablet_pad_strip_v2::ZwpTabletPadStripV2, zwp_tablet_seat_v2::ZwpTabletSeatV2,
TabletPadGroup,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_tablet_pad_group_v2::*, ZwpTabletPadGroupV2Id},
wire::{ZwpTabletPadGroupV2Id, zwp_tablet_pad_group_v2::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/wl_seat/tablet/zwp_tablet_pad_ring_v2.rs
View file

@ -3,11 +3,11 @@ use {
client::{Client, ClientError},
fixed::Fixed,
ifs::wl_seat::tablet::{
zwp_tablet_seat_v2::ZwpTabletSeatV2, TabletPadRing, TabletRingEventSource,
TabletPadRing, TabletRingEventSource, zwp_tablet_seat_v2::ZwpTabletSeatV2,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_tablet_pad_ring_v2::*, ZwpTabletPadRingV2Id},
wire::{ZwpTabletPadRingV2Id, zwp_tablet_pad_ring_v2::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/wl_seat/tablet/zwp_tablet_pad_strip_v2.rs
View file

@ -2,11 +2,11 @@ use {
crate::{
client::{Client, ClientError},
ifs::wl_seat::tablet::{
zwp_tablet_seat_v2::ZwpTabletSeatV2, TabletPadStrip, TabletStripEventSource,
TabletPadStrip, TabletStripEventSource, zwp_tablet_seat_v2::ZwpTabletSeatV2,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_tablet_pad_strip_v2::*, ZwpTabletPadStripV2Id},
wire::{ZwpTabletPadStripV2Id, zwp_tablet_pad_strip_v2::*},
},
std::rc::Rc,
thiserror::Error,

6
src/ifs/wl_seat/tablet/zwp_tablet_pad_v2.rs
View file

@ -3,14 +3,14 @@ use {
client::{Client, ClientError},
ifs::{
wl_seat::tablet::{
zwp_tablet_pad_group_v2::ZwpTabletPadGroupV2, zwp_tablet_seat_v2::ZwpTabletSeatV2,
zwp_tablet_v2::ZwpTabletV2, PadButtonState, TabletPad,
PadButtonState, TabletPad, zwp_tablet_pad_group_v2::ZwpTabletPadGroupV2,
zwp_tablet_seat_v2::ZwpTabletSeatV2, zwp_tablet_v2::ZwpTabletV2,
},
wl_surface::WlSurface,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_tablet_pad_v2::*, ZwpTabletPadV2Id},
wire::{ZwpTabletPadV2Id, zwp_tablet_pad_v2::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

9
src/ifs/wl_seat/tablet/zwp_tablet_seat_v2.rs
View file

@ -2,18 +2,17 @@ use {
crate::{
client::{Client, ClientError},
ifs::wl_seat::{
WlSeatGlobal,
tablet::{
zwp_tablet_pad_group_v2::ZwpTabletPadGroupV2,
Tablet, TabletPad, TabletTool, zwp_tablet_pad_group_v2::ZwpTabletPadGroupV2,
zwp_tablet_pad_ring_v2::ZwpTabletPadRingV2,
zwp_tablet_pad_strip_v2::ZwpTabletPadStripV2, zwp_tablet_pad_v2::ZwpTabletPadV2,
zwp_tablet_tool_v2::ZwpTabletToolV2, zwp_tablet_v2::ZwpTabletV2, Tablet, TabletPad,
TabletTool,
zwp_tablet_tool_v2::ZwpTabletToolV2, zwp_tablet_v2::ZwpTabletV2,
},
WlSeatGlobal,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_tablet_seat_v2::*, ZwpTabletSeatV2Id},
wire::{ZwpTabletSeatV2Id, zwp_tablet_seat_v2::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

4
src/ifs/wl_seat/tablet/zwp_tablet_tool_v2.rs
View file

@ -5,14 +5,14 @@ use {
fixed::Fixed,
ifs::{
wl_seat::tablet::{
zwp_tablet_seat_v2::ZwpTabletSeatV2, zwp_tablet_v2::ZwpTabletV2,
TabletToolCapability, TabletToolOpt, TabletToolType, ToolButtonState,
zwp_tablet_seat_v2::ZwpTabletSeatV2, zwp_tablet_v2::ZwpTabletV2,
},
wl_surface::{WlSurface, WlSurfaceError},
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_tablet_tool_v2::*, ZwpTabletToolV2Id},
wire::{ZwpTabletToolV2Id, zwp_tablet_tool_v2::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

4
src/ifs/wl_seat/tablet/zwp_tablet_v2.rs
View file

@ -1,10 +1,10 @@
use {
crate::{
client::{Client, ClientError},
ifs::wl_seat::tablet::{zwp_tablet_seat_v2::ZwpTabletSeatV2, Tablet},
ifs::wl_seat::tablet::{Tablet, zwp_tablet_seat_v2::ZwpTabletSeatV2},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_tablet_v2::*, ZwpTabletV2Id},
wire::{ZwpTabletV2Id, zwp_tablet_v2::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/wl_seat/text_input.rs
View file

@ -1,10 +1,10 @@
use {
crate::ifs::{
wl_seat::{
WlSeatGlobal,
text_input::{
zwp_input_method_v2::ZwpInputMethodV2, zwp_text_input_v3::ZwpTextInputV3,
},
WlSeatGlobal,
},
wl_surface::WlSurface,
},

2
src/ifs/wl_seat/text_input/zwp_input_method_keyboard_grab_v2.rs
View file

@ -7,7 +7,7 @@ use {
leaks::Tracker,
object::{Object, Version},
utils::errorfmt::ErrorFmt,
wire::{zwp_input_method_keyboard_grab_v2::*, ZwpInputMethodKeyboardGrabV2Id},
wire::{ZwpInputMethodKeyboardGrabV2Id, zwp_input_method_keyboard_grab_v2::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

6
src/ifs/wl_seat/text_input/zwp_input_method_manager_v2.rs
View file

@ -1,11 +1,11 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_INPUT_METHOD},
client::{CAP_INPUT_METHOD, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::wl_seat::text_input::{zwp_input_method_v2::ZwpInputMethodV2, TextConnectReason},
ifs::wl_seat::text_input::{TextConnectReason, zwp_input_method_v2::ZwpInputMethodV2},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_input_method_manager_v2::*, ZwpInputMethodManagerV2Id},
wire::{ZwpInputMethodManagerV2Id, zwp_input_method_manager_v2::*},
},
std::rc::Rc,
thiserror::Error,

10
src/ifs/wl_seat/text_input/zwp_input_method_v2.rs
View file

@ -3,11 +3,11 @@ use {
client::{Client, ClientError},
ifs::{
wl_seat::{
text_input::{
zwp_input_method_keyboard_grab_v2::ZwpInputMethodKeyboardGrabV2,
TextDisconnectReason, TextInputConnection, MAX_TEXT_SIZE,
},
WlSeatGlobal,
text_input::{
MAX_TEXT_SIZE, TextDisconnectReason, TextInputConnection,
zwp_input_method_keyboard_grab_v2::ZwpInputMethodKeyboardGrabV2,
},
},
wl_surface::zwp_input_popup_surface_v2::{
ZwpInputPopupSurfaceV2, ZwpInputPopupSurfaceV2Error,
@ -17,7 +17,7 @@ use {
leaks::Tracker,
object::{Object, Version},
utils::{clonecell::CloneCell, numcell::NumCell, smallmap::SmallMap},
wire::{zwp_input_method_v2::*, ZwpInputMethodV2Id, ZwpInputPopupSurfaceV2Id},
wire::{ZwpInputMethodV2Id, ZwpInputPopupSurfaceV2Id, zwp_input_method_v2::*},
},
std::{
cell::{Cell, RefCell},

2
src/ifs/wl_seat/text_input/zwp_text_input_manager_v3.rs
View file

@ -5,7 +5,7 @@ use {
ifs::wl_seat::text_input::zwp_text_input_v3::ZwpTextInputV3,
leaks::Tracker,
object::{Object, Version},
wire::{zwp_text_input_manager_v3::*, ZwpTextInputManagerV3Id},
wire::{ZwpTextInputManagerV3Id, zwp_text_input_manager_v3::*},
},
std::rc::Rc,
thiserror::Error,

10
src/ifs/wl_seat/text_input/zwp_text_input_v3.rs
View file

@ -3,11 +3,11 @@ use {
client::{Client, ClientError},
ifs::{
wl_seat::{
text_input::{
zwp_input_method_v2::ZwpInputMethodV2, TextConnectReason, TextDisconnectReason,
TextInputConnection, MAX_TEXT_SIZE,
},
WlSeatGlobal,
text_input::{
MAX_TEXT_SIZE, TextConnectReason, TextDisconnectReason, TextInputConnection,
zwp_input_method_v2::ZwpInputMethodV2,
},
},
wl_surface::WlSurface,
},
@ -15,7 +15,7 @@ use {
object::{Object, Version},
rect::Rect,
utils::{clonecell::CloneCell, numcell::NumCell},
wire::{zwp_text_input_v3::*, ZwpTextInputV3Id},
wire::{ZwpTextInputV3Id, zwp_text_input_v3::*},
},
std::{cell::RefCell, collections::hash_map::Entry, mem, rc::Rc},
thiserror::Error,

2
src/ifs/wl_seat/wl_keyboard.rs
View file

@ -7,7 +7,7 @@ use {
leaks::Tracker,
object::{Object, Version},
utils::{errorfmt::ErrorFmt, vecset::VecSet},
wire::{wl_keyboard::*, WlKeyboardId, WlSurfaceId},
wire::{WlKeyboardId, WlSurfaceId, wl_keyboard::*},
},
kbvm::Components,
std::{

2
src/ifs/wl_seat/wl_pointer.rs
View file

@ -6,7 +6,7 @@ use {
ifs::{wl_seat::WlSeat, wl_surface::WlSurfaceError},
leaks::Tracker,
object::{Object, Version},
wire::{wl_pointer::*, WlPointerId, WlSurfaceId},
wire::{WlPointerId, WlSurfaceId, wl_pointer::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

2
src/ifs/wl_seat/wl_touch.rs
View file

@ -5,7 +5,7 @@ use {
ifs::wl_seat::WlSeat,
leaks::Tracker,
object::{Object, Version},
wire::{wl_touch::*, WlSurfaceId, WlTouchId},
wire::{WlSurfaceId, WlTouchId, wl_touch::*},
},
std::rc::Rc,
thiserror::Error,

6
src/ifs/wl_seat/zwp_pointer_constraints_v1.rs
View file

@ -5,8 +5,8 @@ use {
globals::{Global, GlobalName},
ifs::{
wl_seat::{
zwp_pointer_constraints_v1::zwp_confined_pointer_v1::ZwpConfinedPointerV1,
WlSeatGlobal,
zwp_pointer_constraints_v1::zwp_confined_pointer_v1::ZwpConfinedPointerV1,
},
wl_surface::WlSurface,
},
@ -15,8 +15,8 @@ use {
rect::{Rect, Region},
utils::clonecell::CloneCell,
wire::{
zwp_pointer_constraints_v1::*, WlPointerId, WlRegionId, WlSurfaceId,
ZwpPointerConstraintsV1Id,
WlPointerId, WlRegionId, WlSurfaceId, ZwpPointerConstraintsV1Id,
zwp_pointer_constraints_v1::*,
},
},
std::{cell::Cell, rc::Rc},

2
src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_confined_pointer_v1.rs
View file

@ -6,7 +6,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_confined_pointer_v1::*, ZwpConfinedPointerV1Id},
wire::{ZwpConfinedPointerV1Id, zwp_confined_pointer_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/wl_seat/zwp_pointer_constraints_v1/zwp_locked_pointer_v1.rs
View file

@ -6,7 +6,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_locked_pointer_v1::*, ZwpLockedPointerV1Id},
wire::{ZwpLockedPointerV1Id, zwp_locked_pointer_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/wl_seat/zwp_pointer_gesture_hold_v1.rs
View file

@ -4,7 +4,7 @@ use {
ifs::{wl_seat::WlSeatGlobal, wl_surface::WlSurface},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_pointer_gesture_hold_v1::*, ZwpPointerGestureHoldV1Id},
wire::{ZwpPointerGestureHoldV1Id, zwp_pointer_gesture_hold_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/wl_seat/zwp_pointer_gesture_pinch_v1.rs
View file

@ -5,7 +5,7 @@ use {
ifs::{wl_seat::WlSeatGlobal, wl_surface::WlSurface},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_pointer_gesture_pinch_v1::*, ZwpPointerGesturePinchV1Id},
wire::{ZwpPointerGesturePinchV1Id, zwp_pointer_gesture_pinch_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/wl_seat/zwp_pointer_gesture_swipe_v1.rs
View file

@ -5,7 +5,7 @@ use {
ifs::{wl_seat::WlSeatGlobal, wl_surface::WlSurface},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_pointer_gesture_swipe_v1::*, ZwpPointerGestureSwipeV1Id},
wire::{ZwpPointerGestureSwipeV1Id, zwp_pointer_gesture_swipe_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/wl_seat/zwp_pointer_gestures_v1.rs
View file

@ -9,7 +9,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_pointer_gestures_v1::*, ZwpPointerGesturesV1Id},
wire::{ZwpPointerGesturesV1Id, zwp_pointer_gestures_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/wl_seat/zwp_relative_pointer_manager_v1.rs
View file

@ -5,7 +5,7 @@ use {
ifs::wl_seat::zwp_relative_pointer_v1::ZwpRelativePointerV1,
leaks::Tracker,
object::{Object, Version},
wire::{zwp_relative_pointer_manager_v1::*, ZwpRelativePointerManagerV1Id},
wire::{ZwpRelativePointerManagerV1Id, zwp_relative_pointer_manager_v1::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/wl_seat/zwp_relative_pointer_v1.rs
View file

@ -5,7 +5,7 @@ use {
ifs::wl_seat::WlSeat,
leaks::Tracker,
object::{Object, Version},
wire::{zwp_relative_pointer_v1::*, ZwpRelativePointerV1Id},
wire::{ZwpRelativePointerV1Id, zwp_relative_pointer_v1::*},
},
std::rc::Rc,
thiserror::Error,

Some files were not shown because too many files have changed in this diff Show more