diff options
Diffstat (limited to 'src/app/input')
| -rw-r--r-- | src/app/input/mouse.rs | 4 | ||||
| -rw-r--r-- | src/app/input/terminal.rs | 13 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/app/input/mouse.rs b/src/app/input/mouse.rs index 3066c2a4..3c6c86f4 100644 --- a/src/app/input/mouse.rs +++ b/src/app/input/mouse.rs @@ -1761,9 +1761,7 @@ impl AppState { let Some(host) = self.host_mouse_pixels else { return Some(cell); }; - let wants_pixels = runtime.input_state().is_some_and(|state| { - state.mouse_protocol_encoding == crate::input::MouseProtocolEncoding::SgrPixels - }); + let wants_pixels = runtime.sgr_pixel_mouse_enabled(); if !wants_pixels { return Some(cell); } diff --git a/src/app/input/terminal.rs b/src/app/input/terminal.rs index e5b40a74..6b3d3537 100644 --- a/src/app/input/terminal.rs +++ b/src/app/input/terminal.rs @@ -154,8 +154,8 @@ impl App { if matches!(key_event.code, KeyCode::PageUp | KeyCode::PageDown) && key_event.modifiers.is_empty() { - if let Some(input_state) = rt.input_state() { - if input_state.plain_page_keys_use_host_scrollback() { + if let Some(host_scroll) = rt.plain_page_keys_use_host_scrollback() { + if host_scroll { if key_event.kind == crossterm::event::KeyEventKind::Release { return None; } @@ -282,14 +282,7 @@ impl App { None }; - runtime.is_some_and(|runtime| { - let protocol = runtime.keyboard_protocol(); - protocol.reports_all_keys() - || (protocol.reports_event_types() - && runtime - .input_state() - .is_some_and(|state| state.modify_other_keys)) - }) + runtime.is_some_and(crate::terminal::TerminalRuntime::keyboard_report_all_requested) } fn terminal_input_runtime( |