zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 11:26:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1765 from zed-industries/fix-terminal-hyperlinks

Browse Source 
Open hyperlinks on up, not down, and disable them when dragging.
This commit is contained in:
Mikayla Maki 2022-10-17 15:41:40 -07:00 committed by GitHub
commit 318b923bac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
crates/terminal/src/terminal.rs
View File

@ -1018,55 +1018,34 @@ impl Terminal {
self.last_content.size, self.last_content.size,
self.last_content.display_offset, self.last_content.display_offset,
); );
// let side = mouse_side(position, self.last_content.size);
if self.mouse_mode(e.shift) { if self.mouse_mode(e.shift) {
if let Some(bytes) = mouse_button_report(point, e, true, self.last_content.mode) { if let Some(bytes) = mouse_button_report(point, e, true, 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 {
self.left_click(e, origin) let position = e.position.sub(origin);
} let point = grid_point(
} position,
self.last_content.size,
self.last_content.display_offset,
);
let side = mouse_side(position, self.last_content.size);
pub fn left_click(&mut self, e: &DownRegionEvent, origin: Vector2F) { let selection_type = match e.click_count {
let position = e.position.sub(origin); 0 => return, //This is a release
if !self.mouse_mode(e.shift) { 1 => Some(SelectionType::Simple),
//Hyperlinks 2 => Some(SelectionType::Semantic),
{ 3 => Some(SelectionType::Lines),
let mouse_cell_index = content_index_for_mouse(position, &self.last_content); _ => None,
if let Some(link) = self.last_content.cells[mouse_cell_index].hyperlink() { };
open_uri(link.uri()).log_err();
} else {
self.events
.push_back(InternalEvent::FindHyperlink(position, true));
}
}
// Selections let selection =
{ selection_type.map(|selection_type| Selection::new(selection_type, point, side));
let point = grid_point(
position,
self.last_content.size,
self.last_content.display_offset,
);
let side = mouse_side(position, self.last_content.size);
let selection_type = match e.click_count { if let Some(sel) = selection {
0 => return, //This is a release self.events
1 => Some(SelectionType::Simple), .push_back(InternalEvent::SetSelection(Some((sel, point))));
2 => Some(SelectionType::Semantic),
3 => Some(SelectionType::Lines),
_ => None,
};
let selection = selection_type
.map(|selection_type| Selection::new(selection_type, point, side));
if let Some(sel) = selection {
self.events
.push_back(InternalEvent::SetSelection(Some((sel, point))));
}
} }
} }
} }
@ -1094,8 +1073,21 @@ 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 && copy_on_select { } else {
self.copy(); if e.button == MouseButton::Left && copy_on_select {
self.copy();
}
//Hyperlinks
if self.selection_phase == SelectionPhase::Ended {
let mouse_cell_index = content_index_for_mouse(position, &self.last_content);
if let Some(link) = self.last_content.cells[mouse_cell_index].hyperlink() {
open_uri(link.uri()).log_err();
} else {
self.events
.push_back(InternalEvent::FindHyperlink(position, true));
}
}
} }
self.selection_phase = SelectionPhase::Ended; self.selection_phase = SelectionPhase::Ended;