aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2023-09-11 19:24:09 +0400
committerIvan Molodetskikh <yalterz@gmail.com>2023-09-11 19:24:09 +0400
commit07c4632165782c49578c380b37a1f748e84540d0 (patch)
treea3cf6675ec04431c20630ed17b406d1707ef94b6
parentd52ca23caa4345ddf768da5af24f47eae6fd4738 (diff)
downloadniri-07c4632165782c49578c380b37a1f748e84540d0.tar.gz
niri-07c4632165782c49578c380b37a1f748e84540d0.tar.bz2
niri-07c4632165782c49578c380b37a1f748e84540d0.zip
Update dependencies
-rw-r--r--Cargo.lock68
-rw-r--r--src/niri.rs15
2 files changed, 45 insertions, 38 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 636cd0d4..68a7a266 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -77,9 +77,9 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
+checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
[[package]]
name = "anstyle-parse"
@@ -232,7 +232,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -249,7 +249,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -290,9 +290,9 @@ dependencies = [
[[package]]
name = "base64"
-version = "0.21.3"
+version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
[[package]]
name = "bindgen"
@@ -311,7 +311,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -392,7 +392,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -517,7 +517,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -770,7 +770,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -1113,7 +1113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi",
- "rustix 0.38.11",
+ "rustix 0.38.13",
"windows-sys 0.48.0",
]
@@ -1305,9 +1305,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
-version = "0.4.5"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
[[package]]
name = "log"
@@ -1418,7 +1418,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -1635,7 +1635,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -1890,7 +1890,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74c55e9e629af5298a40e0fa106435b2da30484c4ec76b41d19bc4d00dd8b903"
dependencies = [
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -2048,14 +2048,14 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.11"
+version = "0.38.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453"
+checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
dependencies = [
"bitflags 2.4.0",
"errno",
"libc",
- "linux-raw-sys 0.4.5",
+ "linux-raw-sys 0.4.7",
"windows-sys 0.48.0",
]
@@ -2100,7 +2100,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -2111,7 +2111,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -2207,7 +2207,7 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
[[package]]
name = "smithay"
version = "0.3.0"
-source = "git+https://github.com/Smithay/smithay.git#5a8264b3e30edc755b38bcfb8eedf9457208f2a0"
+source = "git+https://github.com/Smithay/smithay.git#2d77640d1beea21e0cfbccbeec920db3d6dccfcf"
dependencies = [
"appendlist",
"bitflags 2.4.0",
@@ -2269,7 +2269,7 @@ dependencies = [
[[package]]
name = "smithay-drm-extras"
version = "0.1.0"
-source = "git+https://github.com/Smithay/smithay.git#5a8264b3e30edc755b38bcfb8eedf9457208f2a0"
+source = "git+https://github.com/Smithay/smithay.git#2d77640d1beea21e0cfbccbeec920db3d6dccfcf"
dependencies = [
"drm",
"edid-rs",
@@ -2338,9 +2338,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.31"
+version = "2.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398"
+checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
dependencies = [
"proc-macro2",
"quote",
@@ -2375,7 +2375,7 @@ dependencies = [
"cfg-if",
"fastrand 2.0.0",
"redox_syscall 0.3.5",
- "rustix 0.38.11",
+ "rustix 0.38.13",
"windows-sys 0.48.0",
]
@@ -2417,7 +2417,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -2462,9 +2462,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.7.7"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0a3ab2091e52d7299a39d098e200114a972df0a7724add02a273aa9aada592"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
dependencies = [
"serde",
"serde_spanned",
@@ -2514,7 +2514,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
]
[[package]]
@@ -2690,7 +2690,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
"wasm-bindgen-shared",
]
@@ -2712,7 +2712,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.31",
+ "syn 2.0.32",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -3155,9 +3155,9 @@ dependencies = [
[[package]]
name = "xml-rs"
-version = "0.8.17"
+version = "0.8.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eee6bf5926be7cf998d7381a9a23d833fd493f6a8034658a9505a4dc4b20444"
+checksum = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a"
[[package]]
name = "zbus"
diff --git a/src/niri.rs b/src/niri.rs
index a48879e9..79165f93 100644
--- a/src/niri.rs
+++ b/src/niri.rs
@@ -15,7 +15,7 @@ use smithay::backend::renderer::element::surface::{
};
use smithay::backend::renderer::element::texture::{TextureBuffer, TextureRenderElement};
use smithay::backend::renderer::element::{
- render_elements, AsRenderElements, Element, RenderElement, RenderElementStates,
+ render_elements, AsRenderElements, Element, Kind, RenderElement, RenderElementStates,
};
use smithay::backend::renderer::gles::{GlesMapping, GlesRenderer, GlesTexture};
use smithay::backend::renderer::{Bind, ExportMem, Frame, ImportAll, Offscreen, Renderer};
@@ -737,11 +737,17 @@ impl Niri {
None,
None,
None,
+ Kind::Cursor,
),
)],
- CursorImageStatus::Surface(surface) => {
- render_elements_from_surface_tree(renderer, surface, pointer_pos, 1., 1.)
- }
+ CursorImageStatus::Surface(surface) => render_elements_from_surface_tree(
+ renderer,
+ surface,
+ pointer_pos,
+ 1.,
+ 1.,
+ Kind::Cursor,
+ ),
};
if let Some(dnd_icon) = &self.dnd_icon {
@@ -751,6 +757,7 @@ impl Niri {
pointer_pos,
1.,
1.,
+ Kind::Unspecified,
));
}