Make foreground opacity configurable

kovidgoyal · Jun 16, 2021 · 4e55a8c · 4e55a8c
1 parent 258b268
commit 4e55a8c
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 6 deletions.
diff --git a/kittens/diff/options/types.py b/kittens/diff/options/types.py
diff --git a/kitty/cell_vertex.glsl b/kitty/cell_vertex.glsl
@@ -12,7 +12,7 @@
 
 // Inputs {{{
 layout(std140) uniform CellRenderData {
-    float xstart, ystart, dx, dy, sprite_dx, sprite_dy, background_opacity, cursor_text_uses_bg;
+    float xstart, ystart, dx, dy, sprite_dx, sprite_dy, background_opacity, foreground_opacity, cursor_text_uses_bg;
 
     uint default_fg, default_bg, highlight_fg, highlight_bg, cursor_color, cursor_text_color, url_color, url_style, inverted;
 
@@ -184,7 +184,7 @@ void main() {
     fg_as_uint = has_mark * color_table[NUM_COLORS + MARK_MASK + 1 + mark] + (ONE - has_mark) * fg_as_uint;
     foreground = color_to_vec(fg_as_uint);
     float has_dim = float((text_attrs >> DIM_SHIFT) & ONE);
-    effective_text_alpha = inactive_text_alpha * mix(1.0, dim_opacity, has_dim);
+    effective_text_alpha = foreground_opacity * inactive_text_alpha * mix(1.0, dim_opacity, has_dim);
     float in_url = float((is_selected & TWO) >> 1);
     decoration_fg = choose_color(in_url, color_to_vec(url_color), to_color(colors[2], fg_as_uint));
 #ifdef USE_SELECTION_FG

diff --git a/kitty/options/definition.py b/kitty/options/definition.py
@@ -1002,6 +1002,14 @@
 '''
     )
 
+opt('foreground_opacity', '1.0',
+    option_type='unit_float', ctype='float',
+    long_text='''
+The opacity of the foreground. A number between 0 and 1, where 1 is opaque and
+0 is fully transparent. This has similar constraints to :opt:`background_opacity`.
+'''
+    )
+
 opt('background_image', 'none',
     option_type='config_or_absolute_path', ctype='!background_image',
     long_text='Path to a background image. Must be in PNG format.'

diff --git a/kitty/options/parse.py b/kitty/options/parse.py
diff --git a/kitty/options/to-c-generated.h b/kitty/options/to-c-generated.h
diff --git a/kitty/options/types.py b/kitty/options/types.py
diff --git a/kitty/shaders.c b/kitty/shaders.c
@@ -252,7 +252,7 @@ send_graphics_data_to_gpu(size_t image_count, ssize_t gvao_idx, const ImageRende
 static inline void
 cell_update_uniform_block(ssize_t vao_idx, Screen *screen, int uniform_buffer, GLfloat xstart, GLfloat ystart, GLfloat dx, GLfloat dy, CursorRenderInfo *cursor, bool inverted, OSWindow *os_window) {
     struct CellRenderData {
-        GLfloat xstart, ystart, dx, dy, sprite_dx, sprite_dy, background_opacity, cursor_text_uses_bg;
+        GLfloat xstart, ystart, dx, dy, sprite_dx, sprite_dy, background_opacity, foreground_opacity, cursor_text_uses_bg;
 
         GLuint default_fg, default_bg, highlight_fg, highlight_bg, cursor_color, cursor_text_color, url_color, url_style, inverted;
 
@@ -295,6 +295,7 @@ cell_update_uniform_block(ssize_t vao_idx, Screen *screen, int uniform_buffer, G
     rd->sprite_dx = 1.0f / (float)x; rd->sprite_dy = 1.0f / (float)y;
     rd->inverted = inverted ? 1 : 0;
     rd->background_opacity = os_window->is_semi_transparent ? os_window->background_opacity : 1.0f;
+    rd->foreground_opacity = os_window->is_semi_transparent ? OPT(foreground_opacity) : 1.0f;
 
 #define COLOR(name) colorprofile_to_color(screen->color_profile, screen->color_profile->overridden.name, screen->color_profile->configured.name)
     rd->default_fg = COLOR(default_fg); rd->default_bg = COLOR(default_bg); rd->highlight_fg = COLOR(highlight_fg); rd->highlight_bg = COLOR(highlight_bg);

diff --git a/kitty/state.h b/kitty/state.h
@@ -42,7 +42,7 @@ typedef struct {
     WindowTitleIn macos_show_window_title_in;
     int adjust_line_height_px, adjust_column_width_px;
     float adjust_line_height_frac, adjust_column_width_frac;
-    float background_opacity, dim_opacity;
+    float background_opacity, foreground_opacity, dim_opacity;
 
     char* background_image;
     BackgroundImageLayout background_image_layout;