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

fix: use real terminal cursor for block mode 

Previously, block cursors were always drawn manually as part of the
selection/highlight rendering, which prevented terminal cursor effects
(like cursor trails) from working. This change makes block cursors
behave like bar/underline cursors by using the terminal's real cursor
for the primary selection.

- Skip rendering primary cursor in block mode when terminal is focused
- Let terminal handle primary cursor rendering for all cursor types
- Simplify cursor method to return actual cursor kind when focused

This allows terminal-based cursor effects to work with block cursors
while maintaining proper cursor visibility when the terminal is unfocused.
pull/13821/head
cor 2025-06-23 15:07:26 +02:00
parent 171dfc60e5
commit 395371db51
No known key found for this signature in database
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,12 +481,9 @@ impl EditorView {
// Special-case: cursor at end of the rope. // Special-case: cursor at end of the rope.
if range.head == range.anchor && range.head == text.len_chars() { if range.head == range.anchor && range.head == text.len_chars() {
if !selection_is_primary || (cursor_is_block && is_terminal_focused) { if !selection_is_primary || !is_terminal_focused {
// Bar and underline cursors are drawn by the terminal // Primary cursor is drawn by the terminal when focused
// BUG: If the editor area loses focus while having a bar or // Secondary cursors and unfocused primary cursor are drawn manually
// underline cursor (eg. when a regex prompt has focus) then
// the primary cursor will be invisible. This doesn't happen
// with block cursors since we manually draw *all* cursors.
spans.push((cursor_scope, range.head..range.head + 1)); spans.push((cursor_scope, range.head..range.head + 1));
} }
continue; continue;
@ -504,17 +501,17 @@ impl EditorView {
cursor_start cursor_start
}; };
spans.push((selection_scope, range.anchor..selection_end)); spans.push((selection_scope, range.anchor..selection_end));
// add block cursors // add cursors
// skip primary cursor if terminal is unfocused - crossterm cursor is used in that case // skip primary cursor if terminal is focused - terminal cursor is used in that case
if !selection_is_primary || (cursor_is_block && is_terminal_focused) { if !selection_is_primary || !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);
// add block cursors // add cursors
// skip primary cursor if terminal is unfocused - crossterm cursor is used in that case // skip primary cursor if terminal is focused - terminal cursor is used in that case
if !selection_is_primary || (cursor_is_block && is_terminal_focused) { if !selection_is_primary || !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
@ -1592,16 +1589,14 @@ 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 (pos, kind) => {
(pos, CursorKind::Block) => {
if self.terminal_focused { if self.terminal_focused {
(pos, CursorKind::Hidden) (pos, kind)
} else { } else {
// use crossterm cursor when terminal loses focus // use underline cursor when terminal loses focus for visibility
(pos, CursorKind::Underline) (pos, CursorKind::Underline)
} }
} }
cursor => cursor,
} }
} }
} }