pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(input): ANSI code sent to terminal on startup and resize

Browse source 
* fix macos parsing issues

* format

* fix(ansiparser): validate first key on parse

Co-authored-by: Aram Drevekenin <aram@poor.dev>
This commit is contained in:
Thomas Linford 2022-05-16 15:32:17 +02:00 • committed by GitHub
parent 84d8f94f36
commit 6ed4bf8c0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
zellij-client/src/stdin_ansi_parser.rs
View file

@ -17,7 +17,7 @@ impl StdinAnsiParser {
} }
} }
pub fn increment_expected_ansi_instructions(&mut self, to: usize) { pub fn increment_expected_ansi_instructions(&mut self, to: usize) {
self.expected_ansi_instructions = to; self.expected_ansi_instructions += to;
} }
pub fn decrement_expected_ansi_instructions(&mut self, by: usize) { pub fn decrement_expected_ansi_instructions(&mut self, by: usize) {
self.expected_ansi_instructions = self.expected_ansi_instructions.saturating_sub(by); self.expected_ansi_instructions = self.expected_ansi_instructions.saturating_sub(by);
@ -26,6 +26,16 @@ impl StdinAnsiParser {
self.expected_ansi_instructions self.expected_ansi_instructions
} }
pub fn parse(&mut self, key: Key, raw_bytes: Vec<u8>) -> Option<AnsiStdinInstructionOrKeys> { pub fn parse(&mut self, key: Key, raw_bytes: Vec<u8>) -> Option<AnsiStdinInstructionOrKeys> {
if self.current_buffer.is_empty()
&& (key != Key::Esc && key != Key::Alt(CharOrArrow::Char(']')))
{
// the first key of a sequence is always Esc, but termwiz interprets esc + ] as Alt+]
self.current_buffer.push((key, raw_bytes));
self.expected_ansi_instructions = 0;
return Some(AnsiStdinInstructionOrKeys::Keys(
self.current_buffer.drain(..).collect(),
));
}
if let Key::Char('t') = key { if let Key::Char('t') = key {
self.current_buffer.push((key, raw_bytes)); self.current_buffer.push((key, raw_bytes));
match AnsiStdinInstructionOrKeys::pixel_dimensions_from_keys(&self.current_buffer) { match AnsiStdinInstructionOrKeys::pixel_dimensions_from_keys(&self.current_buffer) {
@ -41,7 +51,7 @@ impl StdinAnsiParser {
)) ))
} }
} }
} else if let Key::Alt(CharOrArrow::Char('\\')) = key { } else if let Key::Alt(CharOrArrow::Char('\\')) | Key::Ctrl('g') = key {
match AnsiStdinInstructionOrKeys::color_sequence_from_keys(&self.current_buffer) { match AnsiStdinInstructionOrKeys::color_sequence_from_keys(&self.current_buffer) {
Ok(color_instruction) => { Ok(color_instruction) => {
self.decrement_expected_ansi_instructions(1); self.decrement_expected_ansi_instructions(1);
@ -67,12 +77,6 @@ impl StdinAnsiParser {
} }
} }
fn key_is_valid(&self, key: Key) -> bool { fn key_is_valid(&self, key: Key) -> bool {
if self.current_buffer.is_empty()
&& (key != Key::Esc && key != Key::Alt(CharOrArrow::Char(']')))
{
// the first key of a sequence is always Esc, but termwiz interprets esc + ] as Alt+]
return false;
}
match key { match key {
Key::Esc => { Key::Esc => {
// this is a UX improvement // this is a UX improvement