diff options
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/encode.rs | 16 | ||||
| -rw-r--r-- | src/input/mod.rs | 2 | ||||
| -rw-r--r-- | src/input/model.rs | 22 | ||||
| -rw-r--r-- | src/input/tests.rs | 6 |
4 files changed, 34 insertions, 12 deletions
diff --git a/src/input/encode.rs b/src/input/encode.rs index 6d661377..610cc694 100644 --- a/src/input/encode.rs +++ b/src/input/encode.rs @@ -1,6 +1,6 @@ use crossterm::event::{KeyCode, KeyEvent, KeyModifiers, MouseButton, MouseEventKind}; -use super::{KeyboardProtocol, TerminalKey}; +use super::{KeyboardProtocol, MouseProtocolEncoding, TerminalKey}; const KITTY_FLAG_REPORT_EVENT_TYPES: u16 = 0b0000_0010; const KITTY_FLAG_REPORT_ALTERNATE_KEYS: u16 = 0b0000_0100; @@ -44,7 +44,7 @@ pub fn encode_mouse_scroll( column: u16, row: u16, modifiers: KeyModifiers, - encoding: vt100::MouseProtocolEncoding, + encoding: MouseProtocolEncoding, ) -> Option<Vec<u8>> { let button = match kind { MouseEventKind::ScrollUp => 64u16, @@ -61,7 +61,7 @@ pub fn encode_mouse_button( column: u16, row: u16, modifiers: KeyModifiers, - encoding: vt100::MouseProtocolEncoding, + encoding: MouseProtocolEncoding, ) -> Option<Vec<u8>> { let (button, release) = match kind { MouseEventKind::Down(MouseButton::Left) => (0u16, false), @@ -84,10 +84,10 @@ fn encode_mouse_cb( column: u16, row: u16, modifiers: KeyModifiers, - encoding: vt100::MouseProtocolEncoding, + encoding: MouseProtocolEncoding, ) -> Option<Vec<u8>> { let mut cb = match (encoding, release) { - (vt100::MouseProtocolEncoding::Sgr, true) => base_button, + (MouseProtocolEncoding::Sgr, true) => base_button, (_, true) => 3, (_, false) => base_button, }; @@ -105,20 +105,20 @@ fn encode_mouse_cb( let row = row as u32 + 1; match encoding { - vt100::MouseProtocolEncoding::Sgr => Some( + MouseProtocolEncoding::Sgr => Some( format!( "\x1b[<{cb};{column};{row}{}", if release { 'm' } else { 'M' } ) .into_bytes(), ), - vt100::MouseProtocolEncoding::Default => { + MouseProtocolEncoding::Default => { let cb = u8::try_from(cb + 32).ok()?; let column = u8::try_from(column + 32).ok()?; let row = u8::try_from(row + 32).ok()?; Some(vec![0x1b, b'[', b'M', cb, column, row]) } - vt100::MouseProtocolEncoding::Utf8 => { + MouseProtocolEncoding::Utf8 => { let mut bytes = Vec::with_capacity(16); bytes.extend_from_slice(b"\x1b[M"); push_mouse_codepoint(&mut bytes, cb as u32 + 32)?; diff --git a/src/input/mod.rs b/src/input/mod.rs index 026d51d9..4e34674c 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -7,7 +7,7 @@ pub use encode::encode_key; pub use encode::{ encode_cursor_key, encode_mouse_button, encode_mouse_scroll, encode_terminal_key, }; -pub use model::{KeyboardProtocol, TerminalKey}; +pub use model::{KeyboardProtocol, MouseProtocolEncoding, MouseProtocolMode, TerminalKey}; pub use parse::parse_terminal_key_sequence; #[cfg(test)] diff --git a/src/input/model.rs b/src/input/model.rs index 31c521e8..9339b965 100644 --- a/src/input/model.rs +++ b/src/input/model.rs @@ -55,3 +55,25 @@ impl KeyboardProtocol { } } } + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum MouseProtocolMode { + None, + Press, + PressRelease, + ButtonMotion, + AnyMotion, +} + +impl MouseProtocolMode { + pub fn reporting_enabled(self) -> bool { + self != Self::None + } +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum MouseProtocolEncoding { + Default, + Utf8, + Sgr, +} diff --git a/src/input/tests.rs b/src/input/tests.rs index f7e18f24..a3c71675 100644 --- a/src/input/tests.rs +++ b/src/input/tests.rs @@ -2,7 +2,7 @@ use crossterm::event::{KeyCode, KeyEvent, KeyModifiers, ModifierKeyCode}; use super::{ encode_cursor_key, encode_key, encode_mouse_button, encode_mouse_scroll, encode_terminal_key, - parse_terminal_key_sequence, KeyboardProtocol, TerminalKey, + parse_terminal_key_sequence, KeyboardProtocol, MouseProtocolEncoding, TerminalKey, }; fn assert_terminal_key_eq( @@ -198,7 +198,7 @@ fn sgr_mouse_scroll_encodes_wheel_button_and_coordinates() { 4, 6, KeyModifiers::SHIFT, - vt100::MouseProtocolEncoding::Sgr, + MouseProtocolEncoding::Sgr, ) .expect("mouse scroll should encode"); @@ -212,7 +212,7 @@ fn sgr_mouse_release_keeps_button_code() { 11, 9, KeyModifiers::empty(), - vt100::MouseProtocolEncoding::Sgr, + MouseProtocolEncoding::Sgr, ) .expect("mouse release should encode"); |
