zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-11-22 22:26:54 +03:00
Code Issues Projects Releases Wiki Activity

fix(input): properly query bracketed paste mode in terminals (#858)

Browse Source
This commit is contained in:
Aram Drevekenin 2021-11-10 17:41:19 +01:00 committed by GitHub
parent ba5ec8e493
commit 3f408b5251
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
zellij-client/src/input_handler.rs
View File

@ -95,10 +95,29 @@ impl InputHandler {
}
}
}
Ok((InputInstruction::PastedText(raw_bytes), _error_context)) => {
Ok((
InputInstruction::PastedText((
send_bracketed_paste_start,
raw_bytes,
send_bracketed_paste_end,
)),
_error_context,
)) => {
if self.mode == InputMode::Normal || self.mode == InputMode::Locked {
let action = Action::Write(raw_bytes);
self.dispatch_action(action);
if send_bracketed_paste_start {
let bracketed_paste_start = vec![27, 91, 50, 48, 48, 126]; // \u{1b}[200~
let paste_start_action = Action::Write(bracketed_paste_start);
self.dispatch_action(paste_start_action);
}
let pasted_text_action = Action::Write(raw_bytes);
self.dispatch_action(pasted_text_action);
if send_bracketed_paste_end {
let bracketed_paste_end = vec![27, 91, 50, 48, 49, 126]; // \u{1b}[201~
let paste_end_action = Action::Write(bracketed_paste_end);
self.dispatch_action(paste_end_action);
}
}
}
Ok((InputInstruction::SwitchToMode(input_mode), _error_context)) => {

2
zellij-client/src/lib.rs
View File

@ -95,7 +95,7 @@ pub enum ClientInfo {
pub(crate) enum InputInstruction {
KeyEvent(termion::event::Event, Vec<u8>),
SwitchToMode(InputMode),
PastedText(Vec<u8>),
PastedText((bool, Vec<u8>, bool)), // (send_brackted_paste_start, pasted_text, send_bracketed_paste_end)
}
pub fn start_client(

29
zellij-client/src/stdin_handler.rs
View File

@ -30,14 +30,14 @@ fn keys_to_adjust() -> HashMap<Vec<u8>, Vec<u8>> {
}
fn bracketed_paste_end_position(stdin_buffer: &[u8]) -> Option<usize> {
let bracketed_paste_end = vec![27, 91, 50, 48, 49, 126]; // \u{1b}[201
let bracketed_paste_end = vec![27, 91, 50, 48, 49, 126]; // \u{1b}[201~
let mut bp_position = 0;
let mut position = None;
for (i, byte) in stdin_buffer.iter().enumerate() {
if Some(byte) == bracketed_paste_end.get(bp_position) {
position = Some(i);
bp_position += 1;
if bp_position == bracketed_paste_end.len() - 1 {
if bp_position == bracketed_paste_end.len() {
break;
}
} else {
@ -45,7 +45,7 @@ fn bracketed_paste_end_position(stdin_buffer: &[u8]) -> Option<usize> {
position = None;
}
}
if bp_position == bracketed_paste_end.len() - 1 {
if bp_position == bracketed_paste_end.len() {
position
} else {
None
@ -70,15 +70,32 @@ pub(crate) fn stdin_loop(
{
match bracketed_paste_end_position(&stdin_buffer) {
Some(paste_end_position) => {
let pasted_input = stdin_buffer.drain(..=paste_end_position).collect();
let starts_with_bracketed_paste_start = stdin_buffer
.iter()
.take(bracketed_paste_start.len())
.eq(bracketed_paste_start.iter());
let ends_with_bracketed_paste_end = true;
let mut pasted_input: Vec<u8> =
stdin_buffer.drain(..=paste_end_position).collect();
if starts_with_bracketed_paste_start {
drop(pasted_input.drain(..6)); // bracketed paste start
}
drop(pasted_input.drain(pasted_input.len() - 6..)); // bracketed paste end
send_input_instructions
.send(InputInstruction::PastedText(pasted_input))
.send(InputInstruction::PastedText((
starts_with_bracketed_paste_start,
pasted_input,
ends_with_bracketed_paste_end,
)))
.unwrap();
pasting = false;
}
None => {
send_input_instructions
.send(InputInstruction::PastedText(stdin_buffer))
.send(InputInstruction::PastedText((true, stdin_buffer, false)))
.unwrap();
pasting = true;
continue;