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

hotfix: do not send bracketed paste to panes where it is not on

Browse source
This commit is contained in:
Aram Drevekenin 2022-03-16 09:42:48 +01:00
parent 12cb2cf0fa
commit 08d2014cfe
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zellij-client/src/input_handler.rs
View file

@ -63,6 +63,8 @@ impl InputHandler {
let mut err_ctx = OPENCALLS.with(|ctx| *ctx.borrow()); let mut err_ctx = OPENCALLS.with(|ctx| *ctx.borrow());
err_ctx.add_call(ContextType::StdinHandler); err_ctx.add_call(ContextType::StdinHandler);
let alt_left_bracket = vec![27, 91]; let alt_left_bracket = vec![27, 91];
let bracketed_paste_start = vec![27, 91, 50, 48, 48, 126]; // \u{1b}[200~
let bracketed_paste_end = vec![27, 91, 50, 48, 49, 126]; // \u{1b}[201~
if self.options.mouse_mode.unwrap_or(true) { if self.options.mouse_mode.unwrap_or(true) {
self.os_input.enable_mouse(); self.os_input.enable_mouse();
} }
@ -97,7 +99,9 @@ impl InputHandler {
} }
Ok((InputInstruction::PastedText(raw_bytes), _error_context)) => { Ok((InputInstruction::PastedText(raw_bytes), _error_context)) => {
if self.mode == InputMode::Normal || self.mode == InputMode::Locked { if self.mode == InputMode::Normal || self.mode == InputMode::Locked {
self.dispatch_action(Action::Write(bracketed_paste_start.clone()));
self.dispatch_action(Action::Write(raw_bytes)); self.dispatch_action(Action::Write(raw_bytes));
self.dispatch_action(Action::Write(bracketed_paste_end.clone()));
} }
} }
Ok((InputInstruction::SwitchToMode(input_mode), _error_context)) => { Ok((InputInstruction::SwitchToMode(input_mode), _error_context)) => {

4
zellij-client/src/stdin_handler.rs
View file

@ -19,12 +19,10 @@ pub(crate) fn stdin_loop(
if key_event == bracketed_paste_start { if key_event == bracketed_paste_start {
pasting = true; pasting = true;
pasted_text.append(&mut raw_bytes);
continue; continue;
} else if pasting && key_event == bracketed_paste_end { } else if pasting && key_event == bracketed_paste_end {
pasting = false; pasting = false;
let mut pasted_text: Vec<u8> = pasted_text.drain(..).collect(); let pasted_text: Vec<u8> = pasted_text.drain(..).collect();
pasted_text.append(&mut raw_bytes);
send_input_instructions send_input_instructions
.send(InputInstruction::PastedText(pasted_text)) .send(InputInstruction::PastedText(pasted_text))
.unwrap(); .unwrap();