wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-20 11:17:15 +03:00
Code Issues Projects Releases Wiki Activity

gui: maybe fix weird bg color issue on Intel macs

Browse Source 
This commit changes the full surface fill to be fully transparent,
and adds a separate quad to fill with the configured window background
color.

The thesis is that this should avoid the apparent weird rgb/srgb
mismatch that seems to occur with the window background on Intel macs
(those have a different OpenGL implementation than M1 based macs which
don't appear to have this issue).

refs: https://github.com/wez/wezterm/issues/1000
refs: https://github.com/wez/wezterm/issues/653
This commit is contained in:
Wez Furlong 2021-08-06 09:51:57 -07:00
parent b883627ba1
commit 40bb5ddb97
1 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
wezterm-gui/src/termwindow/render.rs
View File

@ -92,16 +92,7 @@ impl super::TermWindow {
let start = Instant::now(); let start = Instant::now();
{ frame.clear_color(0., 0., 0., 0.);
let palette = self.palette();
let background = rgbcolor_alpha_to_window_color(
palette.background,
self.config.window_background_opacity,
);
let (r, g, b, a) = background.tuple();
frame.clear_color(r, g, b, a);
}
for pass in 0.. { for pass in 0.. {
match self.paint_opengl_pass() { match self.paint_opengl_pass() {
@ -216,6 +207,7 @@ impl super::TermWindow {
pub fn paint_pane_opengl(&mut self, pos: &PositionedPane) -> anyhow::Result<()> { pub fn paint_pane_opengl(&mut self, pos: &PositionedPane) -> anyhow::Result<()> {
self.check_for_dirty_lines_and_invalidate_selection(&pos.pane); self.check_for_dirty_lines_and_invalidate_selection(&pos.pane);
let global_bg_color = self.palette().background;
let config = &self.config; let config = &self.config;
let palette = pos.pane.palette(); let palette = pos.pane.palette();
@ -280,30 +272,45 @@ impl super::TermWindow {
}, },
); );
if pos.index == 0 && self.allow_images { // Render the full window background
// Render the window background image if pos.index == 0 {
if let Some(im) = self.window_background.as_ref() { let mut quad = quads.allocate()?;
let mut quad = quads.allocate()?; quad.set_position(
quad.set_position( self.dimensions.pixel_width as f32 / -2.,
self.dimensions.pixel_width as f32 / -2., self.dimensions.pixel_height as f32 / -2.,
self.dimensions.pixel_height as f32 / -2., self.dimensions.pixel_width as f32 / 2.,
self.dimensions.pixel_width as f32 / 2., self.dimensions.pixel_height as f32 / 2.,
self.dimensions.pixel_height as f32 / 2., );
); quad.set_texture_adjust(0., 0., 0., 0.);
let color = rgbcolor_alpha_to_window_color( match (self.window_background.as_ref(), self.allow_images) {
palette.background, (Some(im), true) => {
config.window_background_opacity, // Render the window background image
); let color = rgbcolor_alpha_to_window_color(
palette.background,
config.window_background_opacity,
);
let (sprite, next_due) = let (sprite, next_due) =
gl_state.glyph_cache.borrow_mut().cached_image(im, None)?; gl_state.glyph_cache.borrow_mut().cached_image(im, None)?;
self.update_next_frame_time(next_due); self.update_next_frame_time(next_due);
quad.set_texture(sprite.texture_coords()); quad.set_texture(sprite.texture_coords());
quad.set_texture_adjust(0., 0., 0., 0.); quad.set_is_background_image();
quad.set_is_background_image(); quad.set_hsv(config.window_background_image_hsb);
quad.set_hsv(config.window_background_image_hsb); quad.set_fg_color(color);
quad.set_fg_color(color); }
_ => {
// Regular window background color
let background = rgbcolor_alpha_to_window_color(
global_bg_color,
self.config.window_background_opacity,
);
quad.set_texture(filled_box);
quad.set_fg_color(background);
quad.set_bg_color(background);
quad.set_has_color(false);
quad.set_hsv(None);
}
} }
} }
@ -637,13 +644,6 @@ impl super::TermWindow {
let panes = self.get_panes_to_render(); let panes = self.get_panes_to_render();
if let Some(pane) = self.get_active_pane_or_overlay() {
let splits = self.get_splits();
for split in &splits {
self.paint_split_opengl(split, &pane)?;
}
}
for pos in panes { for pos in panes {
if pos.is_active { if pos.is_active {
self.update_text_cursor(&pos.pane); self.update_text_cursor(&pos.pane);
@ -651,6 +651,13 @@ impl super::TermWindow {
self.paint_pane_opengl(&pos)?; self.paint_pane_opengl(&pos)?;
} }
if let Some(pane) = self.get_active_pane_or_overlay() {
let splits = self.get_splits();
for split in &splits {
self.paint_split_opengl(split, &pane)?;
}
}
Ok(()) Ok(())
} }