suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use crossterm cursor in editor when out of focus (#6858) 

Use crossterm cursor in the editor when the terminal is out of focus to achieve consistent out-of-focus cursor behaviour
pull/8926/head
Hendrik Norkowski 2023-11-27 20:11:16 +01:00 committed by GitHub
parent b7f98d1d99
commit 71fd85894b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
helix-term/src/ui/editor.rs
View File

@ -158,6 +158,7 @@ impl EditorView {
view, view,
theme, theme,
&config.cursor_shape, &config.cursor_shape,
self.terminal_focused,
), ),
); );
let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme); let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
@ -420,6 +421,7 @@ impl EditorView {
view: &View, view: &View,
theme: &Theme, theme: &Theme,
cursor_shape_config: &CursorShapeConfig, cursor_shape_config: &CursorShapeConfig,
is_terminal_focused: bool,
) -> Vec<(usize, std::ops::Range<usize>)> { ) -> Vec<(usize, std::ops::Range<usize>)> {
let text = doc.text().slice(..); let text = doc.text().slice(..);
let selection = doc.selection(view.id); let selection = doc.selection(view.id);
@ -490,13 +492,17 @@ impl EditorView {
cursor_start cursor_start
}; };
spans.push((selection_scope, range.anchor..selection_end)); spans.push((selection_scope, range.anchor..selection_end));
if !selection_is_primary || cursor_is_block { // add block cursors
// skip primary cursor if terminal is unfocused - crossterm cursor is used in that case
if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
spans.push((cursor_scope, cursor_start..range.head)); spans.push((cursor_scope, cursor_start..range.head));
} }
} else { } else {
// Reverse case. // Reverse case.
let cursor_end = next_grapheme_boundary(text, range.head); let cursor_end = next_grapheme_boundary(text, range.head);
if !selection_is_primary || cursor_is_block { // add block cursors
// skip primary cursor if terminal is unfocused - crossterm cursor is used in that case
if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
spans.push((cursor_scope, range.head..cursor_end)); spans.push((cursor_scope, range.head..cursor_end));
} }
// non block cursors look like they exclude the cursor // non block cursors look like they exclude the cursor
@ -1520,8 +1526,15 @@ impl Component for EditorView {
fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) { fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
match editor.cursor() { match editor.cursor() {
// All block cursors are drawn manually // all block cursors are drawn manually
(pos, CursorKind::Block) => (pos, CursorKind::Hidden), (pos, CursorKind::Block) => {
if self.terminal_focused {
(pos, CursorKind::Hidden)
} else {
// use crossterm cursor when terminal loses focus
(pos, CursorKind::Underline)
}
}
cursor => cursor, cursor => cursor,
} }
} }