aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2024-09-13 14:59:32 +0300
committerIvan Molodetskikh <yalterz@gmail.com>2024-09-13 14:59:32 +0300
commit8b3715eabff6665f15488a5348641e1f4be060b2 (patch)
tree7016e8e7ba8bc9292ea5c0267dc9b7720bce87f4
parentd0f2b9abd0d230a3cdc250373a534c60e57339ac (diff)
downloadniri-8b3715eabff6665f15488a5348641e1f4be060b2.tar.gz
niri-8b3715eabff6665f15488a5348641e1f4be060b2.tar.bz2
niri-8b3715eabff6665f15488a5348641e1f4be060b2.zip
Update Smithay
-rw-r--r--Cargo.lock42
-rw-r--r--src/input/mod.rs3
2 files changed, 20 insertions, 25 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 6b10a793..cb66c7d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -991,12 +991,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]]
-name = "edid-rs"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c"
-
-[[package]]
name = "either"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3123,9 +3117,9 @@ dependencies = [
[[package]]
name = "quick-xml"
-version = "0.34.0"
+version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
+checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
dependencies = [
"memchr",
]
@@ -3511,7 +3505,7 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
[[package]]
name = "smithay"
version = "0.3.0"
-source = "git+https://github.com/Smithay/smithay.git#13333624f878a1cee3fb4ec6a041f0896913570f"
+source = "git+https://github.com/Smithay/smithay.git#f364c73cae953aebfa189075e9f118f9008e100b"
dependencies = [
"appendlist",
"bitflags 2.6.0",
@@ -3585,10 +3579,10 @@ dependencies = [
[[package]]
name = "smithay-drm-extras"
version = "0.1.0"
-source = "git+https://github.com/Smithay/smithay.git#13333624f878a1cee3fb4ec6a041f0896913570f"
+source = "git+https://github.com/Smithay/smithay.git#f364c73cae953aebfa189075e9f118f9008e100b"
dependencies = [
"drm",
- "edid-rs",
+ "libdisplay-info",
]
[[package]]
@@ -4167,9 +4161,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
[[package]]
name = "wayland-backend"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
+checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
dependencies = [
"cc",
"downcast-rs",
@@ -4181,9 +4175,9 @@ dependencies = [
[[package]]
name = "wayland-client"
-version = "0.31.5"
+version = "0.31.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
+checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d"
dependencies = [
"bitflags 2.6.0",
"rustix 0.38.34",
@@ -4225,9 +4219,9 @@ dependencies = [
[[package]]
name = "wayland-protocols"
-version = "0.32.3"
+version = "0.32.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa"
+checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
@@ -4278,20 +4272,20 @@ dependencies = [
[[package]]
name = "wayland-scanner"
-version = "0.31.4"
+version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
+checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
dependencies = [
"proc-macro2",
- "quick-xml 0.34.0",
+ "quick-xml 0.36.1",
"quote",
]
[[package]]
name = "wayland-server"
-version = "0.31.4"
+version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a4bab6d420ee4a609b63ef4d5f9b5d309c6b93a029fccab70f2594c0cb3ae"
+checksum = "0f18d47038c0b10479e695d99ed073e400ccd9bdbb60e6e503c96f62adcb12b6"
dependencies = [
"bitflags 2.6.0",
"downcast-rs",
@@ -4303,9 +4297,9 @@ dependencies = [
[[package]]
name = "wayland-sys"
-version = "0.31.4"
+version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
+checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
dependencies = [
"dlib",
"libc",
diff --git a/src/input/mod.rs b/src/input/mod.rs
index 44832911..7fc606ba 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -1897,7 +1897,8 @@ impl State {
let under = self.niri.surface_under_and_global_space(pos);
let tablet_seat = self.niri.seat.tablet_seat();
- let tool = tablet_seat.add_tool::<Self>(&self.niri.display_handle, &event.tool());
+ let display_handle = self.niri.display_handle.clone();
+ let tool = tablet_seat.add_tool::<Self>(self, &display_handle, &event.tool());
let tablet = tablet_seat.get_tablet(&TabletDescriptor::from(&event.device()));
if let Some(tablet) = tablet {
match event.state() {