mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-27 02:31:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

move trail color decision logic to shader.c

Browse Source
This commit is contained in:
Rick Choi
2024-10-19 17:25:30 +09:00
parent f64d2d27fb
commit 85bc56b813
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kitty/cursor_trail.c
View File

@@ -45,6 +45,7 @@ update_cursor_trail_target(CursorTrail *ct, Window *w) {
EDGE(x, 1) = right; EDGE(x, 1) = right;
EDGE(y, 0) = top; EDGE(y, 0) = top;
EDGE(y, 1) = bottom; EDGE(y, 1) = bottom;
ct->screen = WD.screen;
} }
} }
@@ -119,13 +120,9 @@ update_cursor_trail(CursorTrail *ct, Window *w, monotonic_t now, OSWindow *os_wi
ct->needs_render = true; ct->needs_render = true;
} }
if (ct->needs_render) {
ColorProfile *cp = WD.screen->color_profile;
ct->color = colorprofile_to_color(cp, cp->overridden.cursor_color, cp->configured.cursor_color).rgb;
}
#undef WD
#undef EDGE
// returning true here will cause the cells to be drawn // returning true here will cause the cells to be drawn
return ct->needs_render || needs_render_prev; return ct->needs_render || needs_render_prev;
} }
#undef WD
#undef EDGE

4
kitty/shaders.c
View File

@@ -1154,7 +1154,9 @@ draw_cursor_trail(CursorTrail *trail) {
glUniform2fv(trail_program_layout.uniforms.cursor_edge_x, 1, trail->cursor_edge_x); glUniform2fv(trail_program_layout.uniforms.cursor_edge_x, 1, trail->cursor_edge_x);
glUniform2fv(trail_program_layout.uniforms.cursor_edge_y, 1, trail->cursor_edge_y); glUniform2fv(trail_program_layout.uniforms.cursor_edge_y, 1, trail->cursor_edge_y);
color_vec3(trail_program_layout.uniforms.trail_color, trail->color); ColorProfile *cp = trail->screen->color_profile;
color_type color = colorprofile_to_color(cp, cp->overridden.cursor_color, cp->configured.cursor_color).rgb;
color_vec3(trail_program_layout.uniforms.trail_color, color);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);

2
kitty/state.h
View File

@@ -218,7 +218,7 @@ typedef struct {
typedef struct { typedef struct {
bool needs_render; bool needs_render;
monotonic_t updated_at; monotonic_t updated_at;
color_type color; Screen* screen;
float corner_x[4]; float corner_x[4];
float corner_y[4]; float corner_y[4];
float cursor_edge_x[2]; float cursor_edge_x[2];