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

Don't select on copy by default in the terminal

Browse source 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
This commit is contained in:
Julia 2022-10-10 10:29:51 -04:00
parent 00188511cb
commit 2f96a09c46
4 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/settings/default.json
View file

@ -148,6 +148,9 @@
// 2. Make the option keys behave as a 'meta' key, e.g. for emacs // 2. Make the option keys behave as a 'meta' key, e.g. for emacs
// "option_to_meta": true, // "option_to_meta": true,
"option_as_meta": false, "option_as_meta": false,
// Whether or not selecting text in the terminal will automatically
// copy to the system clipboard.
"copy_on_select": false,
// Any key-value pairs added to this list will be added to the terminal's // Any key-value pairs added to this list will be added to the terminal's
// enviroment. Use `:` to seperate multiple values. // enviroment. Use `:` to seperate multiple values.
"env": { "env": {

4
crates/settings/src/settings.rs
View file

@ -129,6 +129,7 @@ pub struct TerminalSettings {
pub blinking: Option<TerminalBlink>, pub blinking: Option<TerminalBlink>,
pub alternate_scroll: Option<AlternateScroll>, pub alternate_scroll: Option<AlternateScroll>,
pub option_as_meta: Option<bool>, pub option_as_meta: Option<bool>,
pub copy_on_select: Option<bool>,
} }
#[derive(Clone, Debug, Deserialize, PartialEq, Eq, JsonSchema)] #[derive(Clone, Debug, Deserialize, PartialEq, Eq, JsonSchema)]
@ -274,7 +275,7 @@ impl Settings {
editor_overrides: Default::default(), editor_overrides: Default::default(),
git: defaults.git.unwrap(), git: defaults.git.unwrap(),
git_overrides: Default::default(), git_overrides: Default::default(),
terminal_defaults: Default::default(), terminal_defaults: defaults.terminal,
terminal_overrides: Default::default(), terminal_overrides: Default::default(),
language_defaults: defaults.languages, language_defaults: defaults.languages,
language_overrides: Default::default(), language_overrides: Default::default(),
@ -327,6 +328,7 @@ impl Settings {
self.editor_overrides = data.editor; self.editor_overrides = data.editor;
self.git_overrides = data.git.unwrap_or_default(); self.git_overrides = data.git.unwrap_or_default();
self.terminal_defaults.font_size = data.terminal.font_size; self.terminal_defaults.font_size = data.terminal.font_size;
self.terminal_overrides.copy_on_select = data.terminal.copy_on_select;
self.terminal_overrides = data.terminal; self.terminal_overrides = data.terminal;
self.language_overrides = data.languages; self.language_overrides = data.languages;
self.lsp = data.lsp; self.lsp = data.lsp;

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

@ -1045,7 +1045,18 @@ impl Terminal {
} }
} }
pub fn mouse_up(&mut self, e: &UpRegionEvent, origin: Vector2F) { pub fn mouse_up(&mut self, e: &UpRegionEvent, origin: Vector2F, cx: &mut ModelContext<Self>) {
let settings = cx.global::<Settings>();
let copy_on_select = settings
.terminal_overrides
.copy_on_select
.unwrap_or_else(|| {
settings
.terminal_defaults
.copy_on_select
.expect("Should be set in defaults")
});
let position = e.position.sub(origin); let position = e.position.sub(origin);
if self.mouse_mode(e.shift) { if self.mouse_mode(e.shift) {
let point = grid_point( let point = grid_point(
@ -1057,11 +1068,10 @@ impl Terminal {
if let Some(bytes) = mouse_button_report(point, e, false, self.last_content.mode) { if let Some(bytes) = mouse_button_report(point, e, false, self.last_content.mode) {
self.pty_tx.notify(bytes); self.pty_tx.notify(bytes);
} }
} else if e.button == MouseButton::Left { } else if e.button == MouseButton::Left && copy_on_select {
// Seems pretty standard to automatically copy on mouse_up for terminals,
// so let's do that here
self.copy(); self.copy();
} }
self.selection_phase = SelectionPhase::Ended; self.selection_phase = SelectionPhase::Ended;
self.last_mouse = None; self.last_mouse = None;
} }

12
crates/terminal/src/terminal_element.rs
View file

@ -424,8 +424,8 @@ impl TerminalElement {
TerminalElement::generic_button_handler( TerminalElement::generic_button_handler(
connection, connection,
origin, origin,
move |terminal, origin, e, _cx| { move |terminal, origin, e, cx| {
terminal.mouse_up(&e, origin); terminal.mouse_up(&e, origin, cx);
}, },
), ),
) )
@ -492,8 +492,8 @@ impl TerminalElement {
TerminalElement::generic_button_handler( TerminalElement::generic_button_handler(
connection, connection,
origin, origin,
move |terminal, origin, e, _cx| { move |terminal, origin, e, cx| {
terminal.mouse_up(&e, origin); terminal.mouse_up(&e, origin, cx);
}, },
), ),
) )
@ -502,8 +502,8 @@ impl TerminalElement {
TerminalElement::generic_button_handler( TerminalElement::generic_button_handler(
connection, connection,
origin, origin,
move |terminal, origin, e, _cx| { move |terminal, origin, e, cx| {
terminal.mouse_up(&e, origin); terminal.mouse_up(&e, origin, cx);
}, },
), ),
) )