From a4cd34177f21939e728d8a2b689a7a27ec5c1acb Mon Sep 17 00:00:00 2001 From: Aram Drevekenin Date: Tue, 3 Nov 2020 22:43:35 +0100 Subject: [PATCH] hotfix(controls): do not capture the ENTER key --- src/main.rs | 2 +- src/tests/integration/basic.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index f495dd21..3111ec3f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -250,7 +250,7 @@ pub fn start(mut os_input: Box, opts: Opt) { send_screen_instructions.send(ScreenInstruction::ResizeLeft).unwrap(); } else if buffer[0] == 12 { // ctrl-l send_screen_instructions.send(ScreenInstruction::ResizeRight).unwrap(); - } else if buffer[0] == 13 { // ctrl-m + } else if buffer[0] == 26 { // ctrl-z send_pty_instructions.send(PtyInstruction::SpawnTerminal(None)).unwrap(); } else if buffer[0] == 14 { // ctrl-n send_pty_instructions.send(PtyInstruction::SpawnTerminalVertically(None)).unwrap(); diff --git a/src/tests/integration/basic.rs b/src/tests/integration/basic.rs index aae545b0..eb7be818 100644 --- a/src/tests/integration/basic.rs +++ b/src/tests/integration/basic.rs @@ -73,7 +73,7 @@ pub fn split_largest_terminal () { ws_ypixel: 0, }; let mut fake_input_output = get_fake_os_input(&fake_win_size); - fake_input_output.add_terminal_input(&[13, 13, 13, 17]); // split-largest_terminal * 3 and quit (ctrl-m + ctrl-m + ctrl-m + ctrl-m + ctrl-q) + fake_input_output.add_terminal_input(&[26, 26, 26, 17]); // split-largest_terminal * 3 and quit (ctrl-z + ctrl-z + ctrl-z + ctrl-z + ctrl-q) start(Box::new(fake_input_output.clone()), Opt::default()); let output_frames = fake_input_output.stdout_writer.output_frames.lock().unwrap(); let snapshots = get_output_frame_snapshots(&output_frames, &fake_win_size); @@ -147,7 +147,7 @@ pub fn max_panes () { ws_ypixel: 0, }; let mut fake_input_output = get_fake_os_input(&fake_win_size); - fake_input_output.add_terminal_input(&[13, 13, 13, 13, 17]); // split-largest_terminal * 4 and quit (ctrl-m + ctrl-m + ctrl-m + ctrl-m + ctrl-q) + fake_input_output.add_terminal_input(&[26, 26, 26, 26, 17]); // split-largest_terminal * 4 and quit (ctrl-z + ctrl-z + ctrl-z + ctrl-z + ctrl-q) let mut opts = Opt::default(); opts.max_panes = Some(4); start(Box::new(fake_input_output.clone()), opts);