bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies and bump version

Browse source
This commit is contained in:
Shawn Wallace 2024-06-12 00:15:20 -04:00
parent 721fe5ee77
commit b6d281967c
5 changed files with 105 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

157
Cargo.lock generated
View file

@ -43,9 +43,9 @@ dependencies = [
[[package]] [[package]]
name = "anstyle-query" name = "anstyle-query"
version = "1.0.3" version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
dependencies = [ dependencies = [
"windows-sys", "windows-sys",
] ]
@ -62,23 +62,24 @@ dependencies = [
[[package]] [[package]]
name = "bindgen" name = "bindgen"
version = "0.64.0" version = "0.69.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 2.5.0",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools",
"lazy_static", "lazy_static",
"lazycell", "lazycell",
"log", "log",
"peeking_take_while", "prettyplease",
"proc-macro2", "proc-macro2",
"quote", "quote",
"regex", "regex",
"rustc-hash", "rustc-hash",
"shlex", "shlex",
"syn 1.0.109", "syn",
"which", "which",
] ]
@ -96,9 +97,9 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.97" version = "1.0.99"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
[[package]] [[package]]
name = "cexpr" name = "cexpr"
@ -117,9 +118,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "clang-sys" name = "clang-sys"
version = "1.7.0" version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
dependencies = [ dependencies = [
"glob", "glob",
"libc", "libc",
@ -255,6 +256,15 @@ version = "1.70.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
[[package]]
name = "itertools"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
[[package]] [[package]]
name = "lazy_static" name = "lazy_static"
version = "1.4.0" version = "1.4.0"
@ -338,12 +348,6 @@ version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]]
name = "peeking_take_while"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
[[package]] [[package]]
name = "pkg-config" name = "pkg-config"
version = "0.3.30" version = "0.3.30"
@ -361,10 +365,20 @@ dependencies = [
] ]
[[package]] [[package]]
name = "proc-macro2" name = "prettyplease"
version = "1.0.82" version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
dependencies = [
"proc-macro2",
"syn",
]
[[package]]
name = "proc-macro2"
version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -398,9 +412,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.10.4" version = "1.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -410,9 +424,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-automata" name = "regex-automata"
version = "0.4.6" version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -421,9 +435,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.8.3" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
[[package]] [[package]]
name = "rustc-hash" name = "rustc-hash"
@ -473,9 +487,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]] [[package]]
name = "smithay-client-toolkit" name = "smithay-client-toolkit"
version = "0.18.1" version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" checksum = "837d3067369e24aeda699a5d9fc5aa14ca14a84dd70aeed7156bfa04a5605b32"
dependencies = [ dependencies = [
"bitflags 2.5.0", "bitflags 2.5.0",
"cursor-icon", "cursor-icon",
@ -488,7 +502,7 @@ dependencies = [
"wayland-client", "wayland-client",
"wayland-csd-frame", "wayland-csd-frame",
"wayland-cursor", "wayland-cursor",
"wayland-protocols", "wayland-protocols 0.32.1",
"wayland-protocols-wlr", "wayland-protocols-wlr",
"wayland-scanner", "wayland-scanner",
"xkeysym", "xkeysym",
@ -496,20 +510,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.109" version = "2.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -530,7 +533,7 @@ name = "testwl"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"rustix", "rustix",
"wayland-protocols", "wayland-protocols 0.31.2",
"wayland-server", "wayland-server",
"wl_drm", "wl_drm",
] ]
@ -552,7 +555,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.65", "syn",
] ]
[[package]] [[package]]
@ -563,9 +566,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]] [[package]]
name = "utf8parse" name = "utf8parse"
version = "0.2.1" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]] [[package]]
name = "version_check" name = "version_check"
@ -575,9 +578,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]] [[package]]
name = "wayland-backend" name = "wayland-backend"
version = "0.3.3" version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07"
dependencies = [ dependencies = [
"cc", "cc",
"downcast-rs", "downcast-rs",
@ -589,9 +592,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-client" name = "wayland-client"
version = "0.31.2" version = "0.31.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133"
dependencies = [ dependencies = [
"bitflags 2.5.0", "bitflags 2.5.0",
"rustix", "rustix",
@ -612,9 +615,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-cursor" name = "wayland-cursor"
version = "0.31.1" version = "0.31.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9"
dependencies = [ dependencies = [
"rustix", "rustix",
"wayland-client", "wayland-client",
@ -635,23 +638,35 @@ dependencies = [
] ]
[[package]] [[package]]
name = "wayland-protocols-wlr" name = "wayland-protocols"
version = "0.2.0" version = "0.32.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c"
dependencies = [ dependencies = [
"bitflags 2.5.0", "bitflags 2.5.0",
"wayland-backend", "wayland-backend",
"wayland-client", "wayland-client",
"wayland-protocols", "wayland-scanner",
]
[[package]]
name = "wayland-protocols-wlr"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24"
dependencies = [
"bitflags 2.5.0",
"wayland-backend",
"wayland-client",
"wayland-protocols 0.32.1",
"wayland-scanner", "wayland-scanner",
] ]
[[package]] [[package]]
name = "wayland-scanner" name = "wayland-scanner"
version = "0.31.1" version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quick-xml 0.31.0", "quick-xml 0.31.0",
@ -660,9 +675,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-server" name = "wayland-server"
version = "0.31.1" version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00e6e4d5c285bc24ba4ed2d5a4bd4febd5fd904451f465973225c8e99772fdb7" checksum = "63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559"
dependencies = [ dependencies = [
"bitflags 2.5.0", "bitflags 2.5.0",
"downcast-rs", "downcast-rs",
@ -674,9 +689,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-sys" name = "wayland-sys"
version = "0.31.1" version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12"
dependencies = [ dependencies = [
"dlib", "dlib",
"log", "log",
@ -799,9 +814,9 @@ dependencies = [
[[package]] [[package]]
name = "xcb-util-cursor" name = "xcb-util-cursor"
version = "0.3.2" version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42cca04fb82324e278cdcc920289ab454635d17f2d3036e2aec1c320b435b036" checksum = "adc4566d84acf11570d684ae89c6da06ab0452aa647a80a7b2f4bc741733e4ac"
dependencies = [ dependencies = [
"xcb", "xcb",
"xcb-util-cursor-sys", "xcb-util-cursor-sys",
@ -809,11 +824,13 @@ dependencies = [
[[package]] [[package]]
name = "xcb-util-cursor-sys" name = "xcb-util-cursor-sys"
version = "0.1.3" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b13724e3af85816d1bbd617cc899b9ff7a55ca53413c4cc5c269e8c62bcc1702" checksum = "e2675ff3564723a6c85e22cedcc05ae84da546470aa1646931d5efdfba3ba601"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"pkg-config",
"xcb",
] ]
[[package]] [[package]]
@ -824,13 +841,13 @@ checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911"
[[package]] [[package]]
name = "xkeysym" name = "xkeysym"
version = "0.2.0" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
[[package]] [[package]]
name = "xwayland-satellite" name = "xwayland-satellite"
version = "0.2.0" version = "0.4.0"
dependencies = [ dependencies = [
"bitflags 2.5.0", "bitflags 2.5.0",
"env_logger 0.11.3", "env_logger 0.11.3",
@ -843,7 +860,7 @@ dependencies = [
"smithay-client-toolkit", "smithay-client-toolkit",
"testwl", "testwl",
"wayland-client", "wayland-client",
"wayland-protocols", "wayland-protocols 0.31.2",
"wayland-scanner", "wayland-scanner",
"wayland-server", "wayland-server",
"wl_drm", "wl_drm",

4
Cargo.toml
View file

@ -8,7 +8,7 @@ rustix = "0.38.31"
[package] [package]
name = "xwayland-satellite" name = "xwayland-satellite"
version = "0.2.0" version = "0.4.0"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -32,7 +32,7 @@ env_logger = "0.11.3"
pretty_env_logger = "0.5.0" pretty_env_logger = "0.5.0"
slotmap = "1.0.7" slotmap = "1.0.7"
xcb-util-cursor = "0.3.2" xcb-util-cursor = "0.3.2"
smithay-client-toolkit = { version = "0.18.1", default-features = false } smithay-client-toolkit = { version = "0.19.1", default-features = false }
[dev-dependencies] [dev-dependencies]
rustix = { workspace = true, features = ["fs"] } rustix = { workspace = true, features = ["fs"] }

6
src/clientside.rs
View file

@ -1,5 +1,4 @@
use crate::server::{ObjectEvent, ObjectKey}; use crate::server::{ObjectEvent, ObjectKey};
use std::os::fd::OwnedFd;
use std::os::unix::net::UnixStream; use std::os::unix::net::UnixStream;
use std::sync::mpsc; use std::sync::mpsc;
use wayland_client::protocol::{ use wayland_client::protocol::{
@ -58,11 +57,6 @@ pub struct Globals {
pub type ClientQueueHandle = QueueHandle<Globals>; pub type ClientQueueHandle = QueueHandle<Globals>;
pub struct ClientShmPool {
pub pool: WlShmPool,
pub fd: OwnedFd,
}
pub struct ClientState { pub struct ClientState {
pub connection: Connection, pub connection: Connection,
pub queue: EventQueue<Globals>, pub queue: EventQueue<Globals>,

5
src/data_device.rs
View file

@ -31,6 +31,8 @@ impl DataDeviceHandler for Globals {
_: &wayland_client::Connection, _: &wayland_client::Connection,
_: &wayland_client::QueueHandle<Self>, _: &wayland_client::QueueHandle<Self>,
_: &wayland_client::protocol::wl_data_device::WlDataDevice, _: &wayland_client::protocol::wl_data_device::WlDataDevice,
_: f64,
_: f64,
) { ) {
} }
@ -47,6 +49,9 @@ impl DataDeviceHandler for Globals {
_: &wayland_client::Connection, _: &wayland_client::Connection,
_: &wayland_client::QueueHandle<Self>, _: &wayland_client::QueueHandle<Self>,
_: &wayland_client::protocol::wl_data_device::WlDataDevice, _: &wayland_client::protocol::wl_data_device::WlDataDevice,
_: f64,
_: f64,
_: &wayland_client::protocol::wl_surface::WlSurface,
) { ) {
} }
} }

20
src/xstate/mod.rs
View file

@ -139,15 +139,17 @@ impl XState {
}) })
.unwrap(); .unwrap();
// Setup default cursor theme {
let ctx = CursorContext::new(&connection, screen).unwrap(); // Setup default cursor theme
let left_ptr = ctx.load_cursor(Cursor::LeftPtr); let ctx = CursorContext::new(&connection, screen).unwrap();
connection let left_ptr = ctx.load_cursor(Cursor::LeftPtr);
.send_and_check_request(&x::ChangeWindowAttributes { connection
window: root, .send_and_check_request(&x::ChangeWindowAttributes {
value_list: &[x::Cw::Cursor(left_ptr)], window: root,
}) value_list: &[x::Cw::Cursor(left_ptr)],
.unwrap(); })
.unwrap();
}
let wm_window = connection.generate_id(); let wm_window = connection.generate_id();