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

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,

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

@ -1,12 +1,12 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_VIRTUAL_KEYBOARD_MANAGER},
client::{CAP_VIRTUAL_KEYBOARD_MANAGER, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::wl_seat::zwp_virtual_keyboard_v1::ZwpVirtualKeyboardV1,
keyboard::KeyboardState,
leaks::Tracker,
object::{Object, Version},
wire::{zwp_virtual_keyboard_manager_v1::*, ZwpVirtualKeyboardManagerV1Id},
wire::{ZwpVirtualKeyboardManagerV1Id, zwp_virtual_keyboard_manager_v1::*},
},
std::{cell::RefCell, rc::Rc},
thiserror::Error,

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

@ -5,8 +5,8 @@ use {
clientmem::{ClientMem, ClientMemError},
ifs::{
wl_seat::{
wl_keyboard::{self, WlKeyboard},
WlSeatGlobal,
wl_keyboard::{self, WlKeyboard},
},
wl_surface::WlSurface,
},
@ -14,7 +14,7 @@ use {
keyboard::KeyboardState,
leaks::Tracker,
object::{Object, Version},
wire::{zwp_virtual_keyboard_v1::*, ZwpVirtualKeyboardV1Id},
wire::{ZwpVirtualKeyboardV1Id, zwp_virtual_keyboard_v1::*},
},
std::{cell::RefCell, rc::Rc},
thiserror::Error,