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

Added cursor blink and settings

Browse source
This commit is contained in:
Mikayla Maki 2022-08-15 18:05:07 -07:00
parent 7b3a7727c6
commit bba51c3ae6
6 changed files with 104 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ use futures::{
};
use modal::deploy_modal;
use settings::{Settings, Shell};
use settings::{Settings, Shell, TerminalBlink};
use std::{collections::HashMap, fmt::Display, path::PathBuf, sync::Arc, time::Duration};
use thiserror::Error;
@ -254,6 +254,7 @@ impl TerminalBuilder {
shell: Option<Shell>,
env: Option<HashMap<String, String>>,
initial_size: TerminalSize,
blink_settings: Option<TerminalBlink>,
) -> Result<TerminalBuilder> {
let pty_config = {
let alac_shell = shell.clone().and_then(|shell| match shell {
@ -290,7 +291,18 @@ impl TerminalBuilder {
//TODO: Remove with a bounded sender which can be dispatched on &self
let (events_tx, events_rx) = unbounded();
//Set up the terminal...
let term = Term::new(&config, &initial_size, ZedListener(events_tx.clone()));
let mut term = Term::new(&config, &initial_size, ZedListener(events_tx.clone()));
//Start off blinking if we need to
match blink_settings {
Some(setting) => match setting {
TerminalBlink::On | TerminalBlink::Always => {
term.set_mode(alacritty_terminal::ansi::Mode::BlinkingCursor)
}
_ => {}
},
None => term.set_mode(alacritty_terminal::ansi::Mode::BlinkingCursor),
}
let term = Arc::new(FairMutex::new(term));
//Setup the pty...
@ -322,7 +334,7 @@ impl TerminalBuilder {
//And connect them together
let event_loop = EventLoop::new(
term.clone(),
ZedListener(events_tx),
ZedListener(events_tx.clone()),
pty,
pty_config.hold,
false,
@ -583,7 +595,7 @@ impl Terminal {
pub fn render_lock<F, T>(&mut self, cx: &mut ModelContext<Self>, f: F) -> T
where
F: FnOnce(RenderableContent, char) -> T,
F: FnOnce(RenderableContent, char, bool) -> T,
{
let m = self.term.clone(); //Arc clone
let mut term = m.lock();
@ -599,7 +611,7 @@ impl Terminal {
let cursor_text = term.grid()[content.cursor.point].c;
f(content, cursor_text)
f(content, cursor_text, term.cursor_style().blinking)
}
///Scroll the terminal