Update smithay to the latest git

This fixes IME handling.
YaLTeR · Oct 17, 2023 · a5fab00 · a5fab00
1 parent 58f6b30
commit a5fab00
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,7 +35,8 @@ xcursor = "0.3.4"
 zbus = { version = "3.14.1", optional = true }
 
 [dependencies.smithay]
-git = "https://github.com/Smithay/smithay.git"
+git = "https://github.com/kchibisov/smithay.git"
+branch = "fix-ime-popup"
 # path = "../smithay"
 default-features = false
 features = [
@@ -55,7 +56,8 @@ features = [
 ]
 
 [dependencies.smithay-drm-extras]
-git = "https://github.com/Smithay/smithay.git"
+git = "https://github.com/kchibisov/smithay.git"
+branch = "fix-ime-popup"
 # path = "../smithay/smithay-drm-extras"
 
 [dev-dependencies]

diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
@@ -10,7 +10,7 @@ use std::thread;
 
 use smithay::backend::allocator::dmabuf::Dmabuf;
 use smithay::backend::renderer::ImportDma;
-use smithay::desktop::PopupKind;
+use smithay::desktop::{PopupKind, PopupManager};
 use smithay::input::pointer::CursorImageStatus;
 use smithay::input::{Seat, SeatHandler, SeatState};
 use smithay::reexports::wayland_server::protocol::wl_data_source::WlDataSource;
@@ -69,6 +69,11 @@ impl InputMethodHandler for State {
             warn!("error tracking ime popup {err:?}");
         }
     }
+    fn dismiss_popup(&mut self, surface: PopupSurface) {
+        if let Some(parent) = surface.get_parent().map(|parent| parent.surface.clone()) {
+            let _ = PopupManager::dismiss_popup(&parent, &PopupKind::from(surface));
+        }
+    }
     fn parent_geometry(&self, parent: &WlSurface) -> Rectangle<i32, Logical> {
         self.niri
             .layout