Skip to content

re-export feature client_system from wayland_backend #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hack3rmann wants to merge 3 commits into
base: master
Choose a base branch
from
+10 −10
Open

re-export feature client_system from wayland_backend #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84b927d
re-export feature `client_system` from `wayland_backend`
hack3rmann Apr 20, 2026
1533d54
remove explicit dependency on `wayland-backend`
hack3rmann Apr 21, 2026
0cff051
format `src/seat/pointer/mod.rs`
hack3rmann Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ log = "0.4"
memmap2 = "0.9.0"
rustix = { version = "1.0.7", features = ["fs", "pipe", "shm"] }
thiserror = "2.0.12"
wayland-backend = "0.3.0"
wayland-client = "0.31.1"
wayland-cursor = "0.31.0"
wayland-protocols = { version = "0.32.9", features = ["client", "staging", "unstable"] }
Expand All @@ -44,6 +43,7 @@ calloop-wayland-source = { version = "0.4.0", optional = true }
default = ["calloop", "xkbcommon"]
calloop = ["dep:calloop", "calloop-wayland-source"]
xkbcommon = ["dep:xkbcommon", "bytemuck", "pkg-config", "xkeysym/bytemuck"]
system = ["wayland-client/system"]

[build-dependencies]
pkg-config = { version = "0.3", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/seat/pointer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::{
sync::{Arc, Mutex},
};

use wayland_backend::{client::InvalidId, smallvec::SmallVec};
use wayland_client::backend::{smallvec::SmallVec, InvalidId};
use wayland_client::{
protocol::{
wl_pointer::{self, WlPointer},
Expand Down
2 changes: 1 addition & 1 deletion src/shell/xdg/fallback_frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use crate::{
subcompositor::{SubcompositorState, SubsurfaceData},
};

use wayland_backend::client::ObjectId;
use wayland_client::backend::ObjectId;

/// The size of the header bar.
const HEADER_SIZE: u32 = 24;
Expand Down
8 changes: 4 additions & 4 deletions src/shm/multi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,9 @@ struct BufferObjectData {
impl wayland_client::backend::ObjectData for BufferObjectData {
fn event(
self: Arc<Self>,
_backend: &wayland_backend::client::Backend,
msg: wayland_backend::protocol::Message<wayland_backend::client::ObjectId, OwnedFd>,
) -> Option<Arc<dyn wayland_backend::client::ObjectData>> {
_backend: &wayland_client::backend::Backend,
msg: wayland_client::backend::protocol::Message<wayland_client::backend::ObjectId, OwnedFd>,
) -> Option<Arc<dyn wayland_client::backend::ObjectData>> {
debug_assert!(wayland_client::backend::protocol::same_interface(
msg.sender_id.interface(),
wl_buffer::WlBuffer::interface()
Expand All @@ -417,5 +417,5 @@ impl wayland_client::backend::ObjectData for BufferObjectData {
None
}

fn destroyed(&self, _: wayland_backend::client::ObjectId) {}
fn destroyed(&self, _: wayland_client::backend::ObjectId) {}
}
6 changes: 3 additions & 3 deletions src/shm/slot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,8 +505,8 @@ impl wayland_client::backend::ObjectData for BufferData {
fn event(
self: Arc<Self>,
handle: &wayland_client::backend::Backend,
msg: wayland_backend::protocol::Message<wayland_backend::client::ObjectId, OwnedFd>,
) -> Option<Arc<dyn wayland_backend::client::ObjectData>> {
msg: wayland_client::backend::protocol::Message<wayland_client::backend::ObjectId, OwnedFd>,
) -> Option<Arc<dyn wayland_client::backend::ObjectData>> {
debug_assert!(wayland_client::backend::protocol::same_interface(
msg.sender_id.interface(),
wl_buffer::WlBuffer::interface()
Expand Down Expand Up @@ -539,7 +539,7 @@ impl wayland_client::backend::ObjectData for BufferData {
None
}

fn destroyed(&self, _: wayland_backend::client::ObjectId) {}
fn destroyed(&self, _: wayland_client::backend::ObjectId) {}
}

impl Drop for BufferData {
Expand Down