mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-30 14:17:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #1285 from zed-industries/fix-terminal-backspace

Browse source 
Set up basic enviroment variables
This commit is contained in:
Mikayla Maki 2022-07-05 15:08:16 -07:00 committed by GitHub
commit e14b3db68a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crates/terminal/src/terminal.rs
View file

@ -5,7 +5,8 @@ use alacritty_terminal::{
grid::Scroll, grid::Scroll,
sync::FairMutex, sync::FairMutex,
term::{color::Rgb as AlacRgb, SizeInfo}, term::{color::Rgb as AlacRgb, SizeInfo},
tty, Term, tty::{self, setup_env},
Term,
}; };
use futures::{ use futures::{
@ -19,7 +20,7 @@ use gpui::{
use project::{Project, ProjectPath}; use project::{Project, ProjectPath};
use settings::Settings; use settings::Settings;
use smallvec::SmallVec; use smallvec::SmallVec;
use std::{path::PathBuf, sync::Arc}; use std::{collections::HashMap, path::PathBuf, sync::Arc};
use workspace::{Item, Workspace}; use workspace::{Item, Workspace};
use crate::terminal_element::{get_color_at_index, TerminalEl}; use crate::terminal_element::{get_color_at_index, TerminalEl};
@ -28,7 +29,7 @@ use crate::terminal_element::{get_color_at_index, TerminalEl};
const ETX_CHAR: char = 3_u8 as char; //'End of text', the control code for 'ctrl-c' const ETX_CHAR: char = 3_u8 as char; //'End of text', the control code for 'ctrl-c'
const TAB_CHAR: char = 9_u8 as char; const TAB_CHAR: char = 9_u8 as char;
const CARRIAGE_RETURN_CHAR: char = 13_u8 as char; const CARRIAGE_RETURN_CHAR: char = 13_u8 as char;
const ESC_CHAR: char = 27_u8 as char; const ESC_CHAR: char = 27_u8 as char; // == \x1b
const DEL_CHAR: char = 127_u8 as char; const DEL_CHAR: char = 127_u8 as char;
const LEFT_SEQ: &str = "\x1b[D"; const LEFT_SEQ: &str = "\x1b[D";
const RIGHT_SEQ: &str = "\x1b[C"; const RIGHT_SEQ: &str = "\x1b[C";
@ -127,11 +128,19 @@ impl Terminal {
hold: false, hold: false,
}; };
//Does this mangle the zed Env? I'm guessing it does... do child processes have a seperate ENV?
let mut env: HashMap<String, String> = HashMap::new();
//TODO: Properly set the current locale,
env.insert("LC_ALL".to_string(), "en_US.UTF-8".to_string());
let config = Config { let config = Config {
pty_config: pty_config.clone(), pty_config: pty_config.clone(),
env,
..Default::default() ..Default::default()
}; };
setup_env(&config);
//The details here don't matter, the terminal will be resized on the first layout //The details here don't matter, the terminal will be resized on the first layout
//Set to something small for easier debugging //Set to something small for easier debugging
let size_info = SizeInfo::new(200., 100.0, 5., 5., 0., 0., false); let size_info = SizeInfo::new(200., 100.0, 5., 5., 0., 0., false);
@ -286,11 +295,16 @@ impl Terminal {
///Write the Input payload to the tty. This locks the terminal so we can scroll it. ///Write the Input payload to the tty. This locks the terminal so we can scroll it.
fn write_to_pty(&mut self, input: &Input, cx: &mut ViewContext<Self>) { fn write_to_pty(&mut self, input: &Input, cx: &mut ViewContext<Self>) {
self.write_bytes_to_pty(input.0.clone().into_bytes(), cx);
}
///Write the Input payload to the tty. This locks the terminal so we can scroll it.
fn write_bytes_to_pty(&mut self, input: Vec<u8>, cx: &mut ViewContext<Self>) {
//iTerm bell behavior, bell stays until terminal is interacted with //iTerm bell behavior, bell stays until terminal is interacted with
self.has_bell = false; self.has_bell = false;
self.term.lock().scroll_display(Scroll::Bottom);
cx.emit(Event::TitleChanged); cx.emit(Event::TitleChanged);
self.pty_tx.notify(input.0.clone().into_bytes()); self.term.lock().scroll_display(Scroll::Bottom);
self.pty_tx.notify(input);
} }
///Send the `up` key ///Send the `up` key
@ -320,6 +334,7 @@ impl Terminal {
///Send the `delete` key. TODO: Difference between this and backspace? ///Send the `delete` key. TODO: Difference between this and backspace?
fn del(&mut self, _: &Del, cx: &mut ViewContext<Self>) { fn del(&mut self, _: &Del, cx: &mut ViewContext<Self>) {
// self.write_to_pty(&Input("\x1b[3~".to_string()), cx)
self.write_to_pty(&Input(DEL_CHAR.to_string()), cx); self.write_to_pty(&Input(DEL_CHAR.to_string()), cx);
} }