wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-23 23:21:08 +03:00
Code Issues Projects Releases Wiki Activity

thread palette through on each render call

Browse Source 
This is slightly inefficient in that it copies the palette
for each call, so may want to revisit this if things feel
sluggish.
This commit is contained in:
Wez Furlong 2019-06-01 16:07:08 -07:00
parent 2ec436a4b9
commit 71fd9c3ed7
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/glium/window.rs
View File

@ -241,7 +241,7 @@ impl GliumTerminalWindow {
let width = width as u16;
let height = height as u16;
let renderer = Renderer::new(&host.display, width, height, fonts, tab.palette())?;
let renderer = Renderer::new(&host.display, width, height, fonts)?;
let mux = Mux::get().unwrap();
let mux_window_id = mux.add_new_window_with_tab(tab)?;

3
src/frontend/guicommon/window.rs
View File

@ -127,7 +127,8 @@ pub trait TerminalWindow {
let res = {
let renderer = self.renderer();
renderer.paint(&mut target, &mut *tab.renderer())
let palette = tab.palette();
renderer.paint(&mut target, &mut *tab.renderer(), &palette)
};
// Ensure that we finish() the target before we let the

2
src/frontend/xwindows/xwin.rs
View File

@ -145,7 +145,7 @@ impl X11TerminalWindow {
fonts: Rc::clone(fonts),
});
let renderer = Renderer::new(&host.window, width, height, fonts, tab.palette())?;
let renderer = Renderer::new(&host.window, width, height, fonts)?;
let mux = Mux::get().unwrap();
let mux_window_id = mux.add_new_window_with_tab(tab)?;
host.window.show();

43
src/opengl/render.rs
View File

@ -15,7 +15,7 @@ use std::collections::HashMap;
use std::mem;
use std::ops::{Deref, Range};
use std::rc::Rc;
use term::color::RgbaTuple;
use term::color::{ColorPalette, RgbaTuple};
use term::{self, CursorPosition, Line, Underline};
type Transform3D = euclid::Transform3D<f32>;
@ -294,7 +294,6 @@ pub struct Renderer {
projection: Transform3D,
atlas: RefCell<Atlas>,
underline_tex: SrgbTexture2d,
palette: term::color::ColorPalette,
}
impl Renderer {
@ -303,7 +302,6 @@ impl Renderer {
width: u16,
height: u16,
fonts: &Rc<FontConfiguration>,
palette: term::color::ColorPalette,
) -> Result<Self, Error> {
let metrics = fonts.default_font_metrics()?;
let (cell_height, cell_width, descender) =
@ -340,7 +338,6 @@ impl Renderer {
Ok(Self {
atlas,
program,
palette,
glyph_vertex_buffer: RefCell::new(glyph_vertex_buffer),
glyph_index_buffer,
width,
@ -656,6 +653,7 @@ impl Renderer {
selection: Range<usize>,
cursor: &CursorPosition,
terminal: &Renderable,
palette: &ColorPalette,
) -> Result<(), Error> {
let (_num_rows, num_cols) = terminal.physical_dimensions();
let mut vb = self.glyph_vertex_buffer.borrow_mut();
@ -680,13 +678,13 @@ impl Renderer {
};
let style = self.fonts.match_style(attrs);
let bg_color = self.palette.resolve_bg(attrs.background);
let bg_color = palette.resolve_bg(attrs.background);
let fg_color = match attrs.foreground {
term::color::ColorAttribute::Default => {
if let Some(fg) = style.foreground {
fg
} else {
self.palette.resolve_fg(attrs.foreground)
palette.resolve_fg(attrs.foreground)
}
}
term::color::ColorAttribute::PaletteIndex(idx) if idx < 8 => {
@ -698,10 +696,9 @@ impl Renderer {
} else {
idx
};
self.palette
.resolve_fg(term::color::ColorAttribute::PaletteIndex(idx))
palette.resolve_fg(term::color::ColorAttribute::PaletteIndex(idx))
}
_ => self.palette.resolve_fg(attrs.foreground),
_ => palette.resolve_fg(attrs.foreground),
};
let (fg_color, bg_color) = {
@ -778,6 +775,7 @@ impl Renderer {
&selection,
glyph_color,
bg_color,
palette,
);
let vert_idx = cell_idx * VERTICES_PER_CELL;
@ -880,8 +878,9 @@ impl Renderer {
cell_idx,
cursor,
&selection,
self.palette.foreground.to_tuple_rgba(),
self.palette.background.to_tuple_rgba(),
palette.foreground.to_tuple_rgba(),
palette.background.to_tuple_rgba(),
palette,
);
for vert in vert_slice.iter_mut() {
@ -907,6 +906,7 @@ impl Renderer {
selection: &Range<usize>,
fg_color: RgbaTuple,
bg_color: RgbaTuple,
palette: &ColorPalette,
) -> (RgbaTuple, RgbaTuple) {
let selected = selection.contains(&cell_idx);
let is_cursor = line_idx as i64 == cursor.y && cursor.x == cell_idx;
@ -916,23 +916,26 @@ impl Renderer {
(false, false) => (fg_color, bg_color),
// Cursor cell overrides colors
(_, true) => (
self.palette.cursor_fg.to_tuple_rgba(),
self.palette.cursor_bg.to_tuple_rgba(),
palette.cursor_fg.to_tuple_rgba(),
palette.cursor_bg.to_tuple_rgba(),
),
// Selected text overrides colors
(true, false) => (
self.palette.selection_fg.to_tuple_rgba(),
self.palette.selection_bg.to_tuple_rgba(),
palette.selection_fg.to_tuple_rgba(),
palette.selection_bg.to_tuple_rgba(),
),
};
(fg_color, bg_color)
}
pub fn paint(&mut self, target: &mut glium::Frame, term: &mut Renderable) -> Result<(), Error> {
let background_color = self
.palette
.resolve_bg(term::color::ColorAttribute::Default);
pub fn paint(
&mut self,
target: &mut glium::Frame,
term: &mut Renderable,
palette: &ColorPalette,
) -> Result<(), Error> {
let background_color = palette.resolve_bg(term::color::ColorAttribute::Default);
let (r, g, b, a) = background_color.to_tuple_rgba();
target.clear_color(r, g, b, a);
@ -941,7 +944,7 @@ impl Renderer {
let dirty_lines = term.get_dirty_lines();
for (line_idx, line, selrange) in dirty_lines {
self.render_screen_line(line_idx, line, selrange, &cursor, term)?;
self.render_screen_line(line_idx, line, selrange, &cursor, term, palette)?;
}
}