deps: Update smithay and smithay-egui

Cargo.lock

@@ -334,9 +334,9 @@ dependencies = [
 
 [[package]]
 name = "gethostname"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028"
+checksum = "4addc164932852d066774c405dbbdb7914742d2b39e39e1a7ca949c856d054d1"
 dependencies = [
  "libc",
  "winapi",
@@ -344,9 +344,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if",
  "libc",
@@ -424,9 +424,9 @@ checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
 
 [[package]]
 name = "libloading"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52"
+checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
 dependencies = [
  "cfg-if",
  "winapi",
@@ -745,14 +745,14 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "smithay"
 version = "0.3.0"
-source = "git+https://github.com/Smithay/smithay.git?branch=feature/egl_userdata#5cbd4352b9043cf634fb0b950ef244d9aaa9e151"
+source = "git+https://github.com/Smithay/smithay.git?rev=92d04ba8#92d04ba8fe858da349f5607df308be52adf31c72"
 dependencies = [
  "appendlist",
  "bitflags",
@@ -787,13 +787,14 @@ dependencies = [
 [[package]]
 name = "smithay-egui"
 version = "0.1.0"
-source = "git+https://github.com/Smithay/smithay-egui.git#baa131d77b2fc2e3c2e87e881bba3ee18b315d14"
+source = "git+https://github.com/Smithay/smithay-egui.git?rev=e6c41f6#e6c41f6aec4b5978e6f2f8cbbb14de602c6d1706"
 dependencies = [
  "egui",
  "lazy_static",
  "memoffset",
  "slog",
  "smithay",
+ "xkbcommon",
 ]
 
 [[package]]

Cargo.toml

@@ -9,7 +9,6 @@ authors = ["Victoria Brekenfeld"]
 anyhow = { version = "1.0.51", features = ["backtrace"] }
 bitflags = "1.3.2"
 slog = "2.7"
-#slog = { version = "2.7", features = ["max_level_trace"] }
 slog-term = "2.8"
 slog-async = "2.7"
 slog-scope = "4.4"
@@ -19,12 +18,13 @@ egui = { version = "0.16", optional = true }
 [dependencies.smithay]
 version = "0.3"
 git = "https://github.com/Smithay/smithay.git"
-branch = "feature/egl_userdata"
+rev = "92d04ba8"
 default-features = false
 features = ["backend_x11", "backend_egl", "desktop", "use_system_lib", "renderer_gl", "wayland_frontend", "slog-stdlog"]
 
 [dependencies.smithay-egui]
 git = "https://github.com/Smithay/smithay-egui.git"
+rev = "e6c41f6"
 optional = true
 
 [features]

src/input/mod.rs

@@ -2,18 +2,23 @@
 
 use crate::state::State;
 use smithay::{
-    backend::input::{Device, DeviceCapability, InputBackend, InputEvent, KeyState},
+    backend::input::{Device, DeviceCapability, InputBackend, InputEvent},
     desktop::{layer_map_for_output, Space},
     reexports::wayland_server::{protocol::wl_surface::WlSurface, Display},
     utils::{Logical, Point},
     wayland::{
         data_device::set_data_device_focus,
         output::Output,
-        seat::{keysyms, CursorImageStatus, FilterResult, KeysymHandle, Seat, XkbConfig},
+        seat::{CursorImageStatus, FilterResult, KeysymHandle, Seat, XkbConfig},
         shell::wlr_layer::Layer as WlrLayer,
         SERIAL_COUNTER,
     },
 };
+#[cfg(feature = "debug")]
+use smithay::{
+    backend::input::KeyState,
+    wayland::seat::keysyms,
+};
 use std::{cell::RefCell, collections::HashMap};
 
 pub struct ActiveOutput(pub RefCell<Output>);
@@ -230,7 +235,7 @@ impl State {
                                         && self.common.egui.state.wants_keyboard()
                                     {
                                         self.common.egui.state.handle_keyboard(
-                                            handle.raw_syms(),
+                                            &handle,
                                             state == KeyState::Pressed,
                                             modifiers.clone(),
                                         );