diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2025-08-11 09:02:28 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2025-08-11 09:07:13 +0300 |
| commit | 2fb993d2211b97950e4a3172718d70d6b236991c (patch) | |
| tree | 3a3c8d302af2e4a2978741e68a180f0179c20a52 | |
| parent | 67361f88fd01974ebee4cf80f0e29c87d805cc39 (diff) | |
| download | niri-2fb993d2211b97950e4a3172718d70d6b236991c.tar.gz niri-2fb993d2211b97950e4a3172718d70d6b236991c.tar.bz2 niri-2fb993d2211b97950e4a3172718d70d6b236991c.zip | |
Bump Smithay (xkbcommon wvkbd fix)
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | niri-visual-tests/src/cases/layout.rs | 1 | ||||
| -rw-r--r-- | src/backend/headless.rs | 1 | ||||
| -rw-r--r-- | src/backend/tty.rs | 5 | ||||
| -rw-r--r-- | src/backend/winit.rs | 1 | ||||
| -rw-r--r-- | src/layout/tests.rs | 2 | ||||
| -rw-r--r-- | src/niri.rs | 1 |
7 files changed, 15 insertions, 4 deletions
@@ -3504,7 +3504,7 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "smithay" version = "0.7.0" -source = "git+https://github.com/Smithay/smithay.git#1d05641d72fd1d8ee077c969f956631502207c66" +source = "git+https://github.com/Smithay/smithay.git#bdf094ab687aa85f84abbeeaff06e3b66ab1e054" dependencies = [ "aliasable", "appendlist", @@ -3578,7 +3578,7 @@ dependencies = [ [[package]] name = "smithay-drm-extras" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay.git#1d05641d72fd1d8ee077c969f956631502207c66" +source = "git+https://github.com/Smithay/smithay.git#bdf094ab687aa85f84abbeeaff06e3b66ab1e054" dependencies = [ "drm", "libdisplay-info", @@ -4851,9 +4851,9 @@ checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" [[package]] name = "xkbcommon" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9" +checksum = "a7a974f48060a14e95705c01f24ad9c3345022f4d97441b8a36beb7ed5c4a02d" dependencies = [ "libc", "memmap2", diff --git a/niri-visual-tests/src/cases/layout.rs b/niri-visual-tests/src/cases/layout.rs index 879af48b..a3c935bf 100644 --- a/niri-visual-tests/src/cases/layout.rs +++ b/niri-visual-tests/src/cases/layout.rs @@ -36,6 +36,7 @@ impl Layout { subpixel: Subpixel::Unknown, make: String::new(), model: String::new(), + serial_number: String::new(), }, ); let mode = Some(Mode { diff --git a/src/backend/headless.rs b/src/backend/headless.rs index 3c96f731..e961daa2 100644 --- a/src/backend/headless.rs +++ b/src/backend/headless.rs @@ -45,6 +45,7 @@ impl Headless { subpixel: Subpixel::Unknown, make: make.clone(), model: model.clone(), + serial_number: serial.clone(), }, ); diff --git a/src/backend/tty.rs b/src/backend/tty.rs index 3c7f512a..1f0eae32 100644 --- a/src/backend/tty.rs +++ b/src/backend/tty.rs @@ -923,6 +923,11 @@ impl Tty { subpixel: connector.subpixel().into(), model: output_name.model.as_deref().unwrap_or("Unknown").to_owned(), make: output_name.make.as_deref().unwrap_or("Unknown").to_owned(), + serial_number: output_name + .serial + .as_deref() + .unwrap_or("Unknown") + .to_owned(), }, ); diff --git a/src/backend/winit.rs b/src/backend/winit.rs index 667b9209..ebec64c9 100644 --- a/src/backend/winit.rs +++ b/src/backend/winit.rs @@ -49,6 +49,7 @@ impl Winit { subpixel: Subpixel::Unknown, make: "Smithay".into(), model: "Winit".into(), + serial_number: "Unknown".into(), }, ); diff --git a/src/layout/tests.rs b/src/layout/tests.rs index 524ade8b..d7c66ba4 100644 --- a/src/layout/tests.rs +++ b/src/layout/tests.rs @@ -695,6 +695,7 @@ impl Op { subpixel: Subpixel::Unknown, make: String::new(), model: String::new(), + serial_number: String::new(), }, ); output.change_current_state( @@ -727,6 +728,7 @@ impl Op { subpixel: Subpixel::Unknown, make: String::new(), model: String::new(), + serial_number: String::new(), }, ); output.change_current_state( diff --git a/src/niri.rs b/src/niri.rs index a990023e..f257d785 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -4850,6 +4850,7 @@ impl Niri { subpixel: Subpixel::Unknown, make: String::new(), model: String::new(), + serial_number: String::new(), }, ); let output = &output; |