Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion src/escape/csi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ impl Default for SgrModifiers {

// Cursor

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum Cursor {
/// CBT Moves cursor to the Ps tabs backward. The default value of Ps is 1.
BackwardTabulation(u32),
Expand Down Expand Up @@ -592,6 +592,18 @@ pub enum Cursor {
},

CursorStyle(CursorStyle),

/// Response to cursor shape query (kitty multi-cursor protocol).
CursorShapeQueryResponse(Vec<u8>),

SetMultipleCursors {
/// Cursor shape (29 = follow main cursor shape)
shape: u8,
/// List of cursor positions (line, col) 1-indexed
positions: Vec<(u16, u16)>,
},

ClearSecondaryCursors,
}

impl Display for Cursor {
Expand Down Expand Up @@ -648,6 +660,24 @@ impl Display for Cursor {
}
}
Cursor::CursorStyle(style) => write!(f, "{} q", *style as u8),
Cursor::CursorShapeQueryResponse(shapes) => {
write!(f, ">")?;
for (i, shape) in shapes.iter().enumerate() {
if i > 0 {
write!(f, ";")?;
}
write!(f, "{}", shape)?;
}
write!(f, " q")
}
Cursor::SetMultipleCursors { shape, positions } => {
write!(f, ">{}", shape)?;
for (line, col) in positions {
write!(f, ";2:{}:{}", line, col)?;
}
write!(f, " q")
}
Cursor::ClearSecondaryCursors => write!(f, ">0;4 q"),
}
}
}
Expand Down
27 changes: 27 additions & 0 deletions src/parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,10 @@ fn parse_csi(buffer: &[u8]) -> Result<Option<Event>> {
b'y' => return parse_csi_synchronized_output_mode(buffer),
_ => None,
},
b'>' => match buffer[buffer.len() - 2..buffer.len()] {
[b' ', b'q'] => return parse_csi_cursor_shape_query_response(buffer),
_ => None,
},
b'0'..=b'9' => {
// Numbered escape code.
if buffer.len() == 3 {
Expand Down Expand Up @@ -905,6 +909,29 @@ fn parse_csi_cursor_position(buffer: &[u8]) -> Result<Option<Event>> {
))))
}

fn parse_csi_cursor_shape_query_response(buffer: &[u8]) -> Result<Option<Event>> {
assert!(buffer.starts_with(b"\x1B[>")); // CSI >
assert!(buffer.ends_with(b" q"));

if buffer.len() < 5 {
// Minimum: ESC [ > SP q
return Ok(None);
}

let s = str::from_utf8(&buffer[3..buffer.len() - 2])?;

let shapes: Vec<u8> = s
.split(';')
.filter(|part| !part.is_empty())
.map(|part| part.parse::<u8>())
.collect::<std::result::Result<Vec<u8>, _>>()
.map_err(|_| MalformedSequenceError)?;

Ok(Some(Event::Csi(Csi::Cursor(
csi::Cursor::CursorShapeQueryResponse(shapes),
))))
}

fn parse_csi_keyboard_enhancement_flags(buffer: &[u8]) -> Result<Option<Event>> {
// CSI ? flags u
assert!(buffer.starts_with(b"\x1B[?")); // ESC [ ?
Expand Down