KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix underline not being set to background color when cursor is over it

Browse Source
This commit is contained in:
Kovid Goyal 2017-09-17 19:28:01 +05:30
parent 826a64c8dc
commit 19b065b6a4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kitty/cell_vertex.glsl
View File

@ -91,7 +91,7 @@ vec3 apply_selection(vec3 color, uint which) {
return is_selected * color_to_vec(which) + (1.0 - is_selected) * color; return is_selected * color_to_vec(which) + (1.0 - is_selected) * color;
} }
vec3 mix_vecs(float q, vec3 a, vec3 b) { vec3 choose_color(float q, vec3 a, vec3 b) {
return q * a + (1.0 - q) * b; return q * a + (1.0 - q) * b;
} }
@ -129,13 +129,16 @@ void main() {
uint resolved_fg = as_color(colors[fg_index], default_colors[fg_index]); uint resolved_fg = as_color(colors[fg_index], default_colors[fg_index]);
foreground = apply_selection(color_to_vec(resolved_fg), highlight_fg); foreground = apply_selection(color_to_vec(resolved_fg), highlight_fg);
background = apply_selection(to_color(colors[bg_index], default_colors[bg_index]), highlight_bg); background = apply_selection(to_color(colors[bg_index], default_colors[bg_index]), highlight_bg);
float cursor = is_cursor(c, r);
foreground = cursor * background + (1.0 - cursor) * foreground;
background = cursor * color_to_vec(cursor_color) + (1.0 - cursor) * background;
// Underline and strike through (rendered via sprites) // Underline and strike through (rendered via sprites)
float in_url = in_range(c, r); float in_url = in_range(c, r);
decoration_fg = mix_vecs(in_url, color_to_vec(url_color), to_color(colors[2], resolved_fg)); decoration_fg = choose_color(in_url, color_to_vec(url_color), to_color(colors[2], resolved_fg));
underline_pos = mix_vecs(in_url, to_sprite_pos(pos, TWO, ZERO, ZERO), to_sprite_pos(pos, (text_attrs >> 2) & DECORATION_MASK, ZERO, ZERO)); underline_pos = choose_color(in_url, to_sprite_pos(pos, TWO, ZERO, ZERO), to_sprite_pos(pos, (text_attrs >> 2) & DECORATION_MASK, ZERO, ZERO));
strike_pos = to_sprite_pos(pos, ((text_attrs >> 7) & STRIKE_MASK) * THREE, ZERO, ZERO); strike_pos = to_sprite_pos(pos, ((text_attrs >> 7) & STRIKE_MASK) * THREE, ZERO, ZERO);
// Block cursor rendering
float cursor = is_cursor(c, r);
foreground = choose_color(cursor, background, foreground);
decoration_fg = choose_color(cursor, background, decoration_fg);
background = choose_color(cursor, color_to_vec(cursor_color), background);
} }