Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added clear screan command

Browse source
This commit is contained in:
Mikayla Maki 2022-07-13 13:19:21 -07:00
parent 4f9d88f3e0
commit 7885234fbc
3 changed files with 50 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/keymaps/default.json
View file

@ -419,7 +419,8 @@
"down": "terminal::Down", "down": "terminal::Down",
"tab": "terminal::Tab", "tab": "terminal::Tab",
"cmd-v": "terminal::Paste", "cmd-v": "terminal::Paste",
"cmd-c": "terminal::Copy" "cmd-c": "terminal::Copy",
"ctrl-l": "terminal::Clear"
} }
} }
] ]

29
crates/terminal/src/connection.rs
View file

@ -1,4 +1,5 @@
use alacritty_terminal::{ use alacritty_terminal::{
ansi::{ClearMode, Handler},
config::{Config, PtyConfig}, config::{Config, PtyConfig},
event::{Event as AlacTermEvent, Notify}, event::{Event as AlacTermEvent, Notify},
event_loop::{EventLoop, Msg, Notifier}, event_loop::{EventLoop, Msg, Notifier},
@ -120,7 +121,7 @@ impl TerminalConnection {
AlacTermEvent::Wakeup => { AlacTermEvent::Wakeup => {
cx.emit(Event::Wakeup); cx.emit(Event::Wakeup);
} }
AlacTermEvent::PtyWrite(out) => self.write_to_pty(out, cx), AlacTermEvent::PtyWrite(out) => self.write_to_pty(out),
AlacTermEvent::MouseCursorDirty => { AlacTermEvent::MouseCursorDirty => {
//Calculate new cursor style. //Calculate new cursor style.
//TODO: alacritty/src/input.rs:L922-L939 //TODO: alacritty/src/input.rs:L922-L939
@ -138,20 +139,17 @@ impl TerminalConnection {
AlacTermEvent::ClipboardStore(_, data) => { AlacTermEvent::ClipboardStore(_, data) => {
cx.write_to_clipboard(ClipboardItem::new(data)) cx.write_to_clipboard(ClipboardItem::new(data))
} }
AlacTermEvent::ClipboardLoad(_, format) => self.write_to_pty( AlacTermEvent::ClipboardLoad(_, format) => self.write_to_pty(format(
format( &cx.read_from_clipboard()
&cx.read_from_clipboard() .map(|ci| ci.text().to_string())
.map(|ci| ci.text().to_string()) .unwrap_or("".to_string()),
.unwrap_or("".to_string()), )),
),
cx,
),
AlacTermEvent::ColorRequest(index, format) => { AlacTermEvent::ColorRequest(index, format) => {
let color = self.term.lock().colors()[index].unwrap_or_else(|| { let color = self.term.lock().colors()[index].unwrap_or_else(|| {
let term_style = &cx.global::<Settings>().theme.terminal; let term_style = &cx.global::<Settings>().theme.terminal;
to_alac_rgb(get_color_at_index(&index, &term_style.colors)) to_alac_rgb(get_color_at_index(&index, &term_style.colors))
}); });
self.write_to_pty(format(color), cx) self.write_to_pty(format(color))
} }
AlacTermEvent::CursorBlinkingChange => { AlacTermEvent::CursorBlinkingChange => {
//TODO: Set a timer to blink the cursor on and off //TODO: Set a timer to blink the cursor on and off
@ -164,12 +162,12 @@ impl TerminalConnection {
} }
///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.
pub fn write_to_pty(&mut self, input: String, cx: &mut ModelContext<Self>) { pub fn write_to_pty(&mut self, input: String) {
self.write_bytes_to_pty(input.into_bytes(), cx); self.write_bytes_to_pty(input.into_bytes());
} }
///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_bytes_to_pty(&mut self, input: Vec<u8>, _: &mut ModelContext<Self>) { fn write_bytes_to_pty(&mut self, input: Vec<u8>) {
self.term.lock().scroll_display(Scroll::Bottom); self.term.lock().scroll_display(Scroll::Bottom);
self.pty_tx.notify(input); self.pty_tx.notify(input);
} }
@ -179,6 +177,11 @@ impl TerminalConnection {
self.pty_tx.0.send(Msg::Resize(new_size)).ok(); self.pty_tx.0.send(Msg::Resize(new_size)).ok();
self.term.lock().resize(new_size); self.term.lock().resize(new_size);
} }
pub fn clear(&mut self) {
self.write_to_pty("\x0c".into());
self.term.lock().clear_screen(ClearMode::Saved);
}
} }
impl Drop for TerminalConnection { impl Drop for TerminalConnection {

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

@ -88,6 +88,7 @@ pub fn init(cx: &mut MutableAppContext) {
cx.add_action(Terminal::paste); cx.add_action(Terminal::paste);
cx.add_action(Terminal::scroll_terminal); cx.add_action(Terminal::scroll_terminal);
cx.add_action(Terminal::input); cx.add_action(Terminal::input);
cx.add_action(Terminal::clear);
cx.add_action(deploy_modal); cx.add_action(deploy_modal);
} }
@ -177,9 +178,9 @@ impl Terminal {
} }
fn input(&mut self, Input(text): &Input, cx: &mut ViewContext<Self>) { fn input(&mut self, Input(text): &Input, cx: &mut ViewContext<Self>) {
self.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
//TODO: This is probably not encoding UTF8 correctly (see alacritty/src/input.rs:L825-837) //TODO: This is probably not encoding UTF8 correctly (see alacritty/src/input.rs:L825-837)
connection.write_to_pty(text.clone(), cx); connection.write_to_pty(text.clone());
}); });
if self.has_bell { if self.has_bell {
@ -188,6 +189,11 @@ impl Terminal {
} }
} }
fn clear(&mut self, _: &Clear, cx: &mut ViewContext<Self>) {
self.connection
.update(cx, |connection, _| connection.clear());
}
///Create a new Terminal in the current working directory or the user's home directory ///Create a new Terminal in the current working directory or the user's home directory
fn deploy(workspace: &mut Workspace, _: &Deploy, cx: &mut ViewContext<Workspace>) { fn deploy(workspace: &mut Workspace, _: &Deploy, cx: &mut ViewContext<Workspace>) {
let wd = get_wd_for_workspace(workspace, cx); let wd = get_wd_for_workspace(workspace, cx);
@ -212,72 +218,72 @@ impl Terminal {
///Attempt to paste the clipboard into the terminal ///Attempt to paste the clipboard into the terminal
fn paste(&mut self, _: &Paste, cx: &mut ViewContext<Self>) { fn paste(&mut self, _: &Paste, cx: &mut ViewContext<Self>) {
if let Some(item) = cx.read_from_clipboard() { if let Some(item) = cx.read_from_clipboard() {
self.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
connection.write_to_pty(item.text().to_owned(), cx); connection.write_to_pty(item.text().to_owned());
}) })
} }
} }
///Send the `up` key ///Send the `up` key
fn up(&mut self, _: &Up, cx: &mut ViewContext<Self>) { fn up(&mut self, _: &Up, cx: &mut ViewContext<Self>) {
self.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
connection.write_to_pty(UP_SEQ.to_string(), cx); connection.write_to_pty(UP_SEQ.to_string());
}); });
} }
///Send the `down` key ///Send the `down` key
fn down(&mut self, _: &Down, cx: &mut ViewContext<Self>) { fn down(&mut self, _: &Down, cx: &mut ViewContext<Self>) {
self.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
connection.write_to_pty(DOWN_SEQ.to_string(), cx); connection.write_to_pty(DOWN_SEQ.to_string());
}); });
} }
///Send the `tab` key ///Send the `tab` key
fn tab(&mut self, _: &Tab, cx: &mut ViewContext<Self>) { fn tab(&mut self, _: &Tab, cx: &mut ViewContext<Self>) {
self.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
connection.write_to_pty(TAB_CHAR.to_string(), cx); connection.write_to_pty(TAB_CHAR.to_string());
}); });
} }
///Send `SIGINT` (`ctrl-c`) ///Send `SIGINT` (`ctrl-c`)
fn send_sigint(&mut self, _: &Sigint, cx: &mut ViewContext<Self>) { fn send_sigint(&mut self, _: &Sigint, cx: &mut ViewContext<Self>) {
self.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
connection.write_to_pty(ETX_CHAR.to_string(), cx); connection.write_to_pty(ETX_CHAR.to_string());
}); });
} }
///Send the `escape` key ///Send the `escape` key
fn escape(&mut self, _: &Escape, cx: &mut ViewContext<Self>) { fn escape(&mut self, _: &Escape, cx: &mut ViewContext<Self>) {
self.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
connection.write_to_pty(ESC_CHAR.to_string(), cx); connection.write_to_pty(ESC_CHAR.to_string());
}); });
} }
///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.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
connection.write_to_pty(DEL_CHAR.to_string(), cx); connection.write_to_pty(DEL_CHAR.to_string());
}); });
} }
///Send a carriage return. TODO: May need to check the terminal mode. ///Send a carriage return. TODO: May need to check the terminal mode.
fn carriage_return(&mut self, _: &Return, cx: &mut ViewContext<Self>) { fn carriage_return(&mut self, _: &Return, cx: &mut ViewContext<Self>) {
self.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
connection.write_to_pty(CARRIAGE_RETURN_CHAR.to_string(), cx); connection.write_to_pty(CARRIAGE_RETURN_CHAR.to_string());
}); });
} }
//Send the `left` key //Send the `left` key
fn left(&mut self, _: &Left, cx: &mut ViewContext<Self>) { fn left(&mut self, _: &Left, cx: &mut ViewContext<Self>) {
self.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
connection.write_to_pty(LEFT_SEQ.to_string(), cx); connection.write_to_pty(LEFT_SEQ.to_string());
}); });
} }
//Send the `right` key //Send the `right` key
fn right(&mut self, _: &Right, cx: &mut ViewContext<Self>) { fn right(&mut self, _: &Right, cx: &mut ViewContext<Self>) {
self.connection.update(cx, |connection, cx| { self.connection.update(cx, |connection, _| {
connection.write_to_pty(RIGHT_SEQ.to_string(), cx); connection.write_to_pty(RIGHT_SEQ.to_string());
}); });
} }
} }
@ -467,8 +473,8 @@ mod tests {
let terminal = cx.add_view(Default::default(), |cx| Terminal::new(None, false, cx)); let terminal = cx.add_view(Default::default(), |cx| Terminal::new(None, false, cx));
terminal.update(cx, |terminal, cx| { terminal.update(cx, |terminal, cx| {
terminal.connection.update(cx, |connection, cx| { terminal.connection.update(cx, |connection, _| {
connection.write_to_pty("expr 3 + 4".to_string(), cx); connection.write_to_pty("expr 3 + 4".to_string());
}); });
terminal.carriage_return(&Return, cx); terminal.carriage_return(&Return, cx);
}); });
@ -492,8 +498,8 @@ mod tests {
cx.set_condition_duration(Some(Duration::from_secs(2))); cx.set_condition_duration(Some(Duration::from_secs(2)));
terminal.update(cx, |terminal, cx| { terminal.update(cx, |terminal, cx| {
terminal.connection.update(cx, |connection, cx| { terminal.connection.update(cx, |connection, _| {
connection.write_to_pty("expr 3 + 4".to_string(), cx); connection.write_to_pty("expr 3 + 4".to_string());
}); });
terminal.carriage_return(&Return, cx); terminal.carriage_return(&Return, cx);
}); });