leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use requested terminal cursor color

Browse source
This commit is contained in:
Mattias Eriksson 2024-06-27 09:06:31 +02:00
parent 09e2073f9b
commit a33bdd1277
1 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/terminal.rs
View file

@ -44,6 +44,10 @@ use crate::{
mouse_reporter::MouseReporter, mouse_reporter::MouseReporter,
}; };
/// Minimum contrast between a fixed cursor color and the cell's background.
/// Duplicated from alacritty
pub const MIN_CURSOR_CONTRAST: f64 = 1.5;
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug)]
pub struct Size { pub struct Size {
pub width: u32, pub width: u32,
@ -738,7 +742,34 @@ impl Terminal {
if indexed.point == grid.cursor.point { if indexed.point == grid.cursor.point {
//TODO: better handling of cursor //TODO: better handling of cursor
if term.mode().contains(TermMode::SHOW_CURSOR) { if term.mode().contains(TermMode::SHOW_CURSOR) {
mem::swap(&mut fg, &mut bg); //Use specific cursor color if requested
if term.colors()[NamedColor::Cursor].is_some() {
fg = bg;
bg = convert_color(term.colors(), Color::Named(NamedColor::Cursor));
} else {
mem::swap(&mut fg, &mut bg);
}
let fg_rgb = Rgb {
r: fg.r(),
g: fg.g(),
b: fg.b(),
};
let bg_rgb = Rgb {
r: bg.r(),
g: bg.g(),
b: bg.b(),
};
let contrast = fg_rgb.contrast(bg_rgb);
if contrast < MIN_CURSOR_CONTRAST {
fg = convert_color(
&self.colors,
Color::Named(NamedColor::Background),
);
bg = convert_color(
&self.colors,
Color::Named(NamedColor::Foreground),
);
}
} else { } else {
fg = bg; fg = bg;
} }