Try keybindings if no input handler is accepting text input

Author: reflectronic

crates/editor/src/editor.rs

@@ -23964,6 +23964,10 @@ impl EntityInputHandler for Editor {
         let utf16_offset = anchor.to_offset_utf16(&position_map.snapshot.buffer_snapshot());
         Some(utf16_offset.0)
     }
+
+    fn accepts_text_input(&self, _window: &mut Window, _cx: &mut Context<Self>) -> bool {
+        self.input_enabled
+    }
 }
 
 trait SelectionExt {

crates/gpui/src/input.rs

@@ -70,6 +70,11 @@ pub trait EntityInputHandler: 'static + Sized {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Option<usize>;
+
+    /// See [`InputHandler::accepts_text_input`] for details
+    fn accepts_text_input(&self, _window: &mut Window, _cx: &mut Context<Self>) -> bool {
+        true
+    }
 }
 
 /// The canonical implementation of [`crate::PlatformInputHandler`]. Call [`Window::handle_input`]
@@ -177,4 +182,9 @@ impl<V: EntityInputHandler> InputHandler for ElementInputHandler<V> {
             view.character_index_for_point(point, window, cx)
         })
     }
+
+    fn accepts_text_input(&mut self, window: &mut Window, cx: &mut App) -> bool {
+        self.view
+            .update(cx, |view, cx| view.accepts_text_input(window, cx))
+    }
 }

crates/gpui/src/platform.rs

@@ -974,6 +974,14 @@ impl PlatformInputHandler {
             .ok()
             .flatten()
     }
+
+    #[allow(dead_code)]
+    pub fn accepts_text_input(&mut self) -> bool {
+        self.cx
+            .update(|window, cx| self.handler.accepts_text_input(window, cx))
+            .ok()
+            .unwrap_or(true)
+    }
 }
 
 /// A struct representing a selection in a text buffer, in UTF16 characters.
@@ -1082,6 +1090,11 @@ pub trait InputHandler: 'static {
     fn apple_press_and_hold_enabled(&mut self) -> bool {
         true
     }
+
+    /// Returns whether this handler is accepting text input to be inserted.
+    fn accepts_text_input(&mut self, _window: &mut Window, _cx: &mut App) -> bool {
+        true
+    }
 }
 
 /// The variables that can be configured when creating a new window

crates/gpui/src/platform/windows/events.rs

@@ -27,6 +27,7 @@ pub(crate) const WM_GPUI_FORCE_UPDATE_WINDOW: u32 = WM_USER + 5;
 pub(crate) const WM_GPUI_KEYBOARD_LAYOUT_CHANGED: u32 = WM_USER + 6;
 pub(crate) const WM_GPUI_GPU_DEVICE_LOST: u32 = WM_USER + 7;
 pub(crate) const WM_GPUI_KEYDOWN: u32 = WM_USER + 8;
+pub(crate) const WM_GPUI_ACCEPTS_TEXT_INPUT: u32 = WM_USER + 9;
 
 const SIZE_MOVE_LOOP_TIMER_ID: usize = 1;
 const AUTO_HIDE_TASKBAR_THICKNESS_PX: i32 = 1;
@@ -106,6 +107,7 @@ impl WindowsWindowInner {
             WM_GPUI_CURSOR_STYLE_CHANGED => self.handle_cursor_changed(lparam),
             WM_GPUI_FORCE_UPDATE_WINDOW => self.draw_window(handle, true),
             WM_GPUI_GPU_DEVICE_LOST => self.handle_device_lost(lparam),
+            WM_GPUI_ACCEPTS_TEXT_INPUT => self.has_input_handler(),
             _ => None,
         };
         if let Some(n) = handled {
@@ -1131,6 +1133,15 @@ impl WindowsWindowInner {
         Some(0)
     }
 
+    fn has_input_handler(&self) -> Option<isize> {
+        let mut state = self.state.borrow_mut();
+        let has_enabled_handler = state
+            .input_handler
+            .as_mut()
+            .map_or(false, |handler| handler.accepts_text_input());
+        Some(if has_enabled_handler { 1 } else { 0 })
+    }
+
     #[inline]
     fn draw_window(&self, handle: HWND, force_render: bool) -> Option<isize> {
         let mut request_frame = self.state.borrow_mut().callbacks.request_frame.take()?;

crates/gpui/src/platform/windows/platform.rs

@@ -328,7 +328,7 @@ fn translate_accelerator(msg: &MSG) -> Option<()> {
     state_no_modifiers[VK_RWIN.0 as usize] = 0;
 
     let mut buffer_c_no_modifiers = [0u16; 8];
-    let result_c_no_modifers = unsafe {
+    let result_c_no_modifiers = unsafe {
         ToUnicode(
             vkey.0 as u32,
             scan_code,
@@ -338,15 +338,18 @@ fn translate_accelerator(msg: &MSG) -> Option<()> {
         )
     };
 
-    if result_c_no_modifers <= 0 {
+    if result_c_no_modifiers <= 0 {
         return dispatch_accelerator(msg);
     }
 
     let c_no_modifiers =
-        String::from_utf16_lossy(&buffer_c_no_modifiers[..result_c_no_modifers as usize]);
+        String::from_utf16_lossy(&buffer_c_no_modifiers[..result_c_no_modifiers as usize]);
 
     if c != c_no_modifiers {
-        return None;
+        let accepts_text_input = unsafe { SendMessageW(msg.hwnd, WM_GPUI_ACCEPTS_TEXT_INPUT, None, None) };
+        if accepts_text_input.0 != 0 {
+            return None;
+        }
     }
 
     dispatch_accelerator(msg)
@@ -361,7 +364,7 @@ fn dispatch_accelerator(msg: &MSG) -> Option<()> {
             Some(msg.lParam),
         )
     };
-    (result == LRESULT(0)).then_some(())
+    (result.0 == 0).then_some(())
 }
 
 impl Platform for WindowsPlatform {