mirror of https://github.com/sgoudham/neovide.git
Smooth scrolling (#423)
* parse viewport events * progress toward pixel scrolling * ITS WORKING * fix basic scrolling gaps * add limit to number of old surfaces to store * set cursor destination based on rendered location not global gridmacos-click-through
Keith Simmons
4 years ago
committed by
GitHub
parent
38c5538186
commit
1d981f3c2c
@ -1,240 +1,238 @@
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
use skulpin::skia_safe::Color4f;
|
||||
|
||||
use super::style::{Colors, Style};
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub enum CursorShape {
|
||||
Block,
|
||||
Horizontal,
|
||||
Vertical,
|
||||
}
|
||||
|
||||
impl CursorShape {
|
||||
pub fn from_type_name(name: &str) -> Option<CursorShape> {
|
||||
match name {
|
||||
"block" => Some(CursorShape::Block),
|
||||
"horizontal" => Some(CursorShape::Horizontal),
|
||||
"vertical" => Some(CursorShape::Vertical),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default, Debug, Clone, PartialEq)]
|
||||
pub struct CursorMode {
|
||||
pub shape: Option<CursorShape>,
|
||||
pub style_id: Option<u64>,
|
||||
pub cell_percentage: Option<f32>,
|
||||
pub blinkwait: Option<u64>,
|
||||
pub blinkon: Option<u64>,
|
||||
pub blinkoff: Option<u64>,
|
||||
}
|
||||
|
||||
#[derive(Clone, PartialEq)]
|
||||
pub struct Cursor {
|
||||
pub position: (f64, f64),
|
||||
pub grid_position: (u64, u64),
|
||||
pub parent_window_id: u64,
|
||||
pub shape: CursorShape,
|
||||
pub cell_percentage: Option<f32>,
|
||||
pub blinkwait: Option<u64>,
|
||||
pub blinkon: Option<u64>,
|
||||
pub blinkoff: Option<u64>,
|
||||
pub style: Option<Arc<Style>>,
|
||||
pub enabled: bool,
|
||||
pub double_width: bool,
|
||||
pub character: String,
|
||||
}
|
||||
|
||||
impl Cursor {
|
||||
pub fn new() -> Cursor {
|
||||
Cursor {
|
||||
position: (0.0, 0.0),
|
||||
grid_position: (0, 0),
|
||||
parent_window_id: 0,
|
||||
shape: CursorShape::Block,
|
||||
style: None,
|
||||
cell_percentage: None,
|
||||
blinkwait: None,
|
||||
blinkon: None,
|
||||
blinkoff: None,
|
||||
enabled: true,
|
||||
double_width: false,
|
||||
character: " ".to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn foreground(&self, default_colors: &Colors) -> Color4f {
|
||||
if let Some(style) = &self.style {
|
||||
style
|
||||
.colors
|
||||
.foreground
|
||||
.clone()
|
||||
.unwrap_or_else(|| default_colors.background.clone().unwrap())
|
||||
} else {
|
||||
default_colors.background.clone().unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn background(&self, default_colors: &Colors) -> Color4f {
|
||||
if let Some(style) = &self.style {
|
||||
style
|
||||
.colors
|
||||
.background
|
||||
.clone()
|
||||
.unwrap_or_else(|| default_colors.foreground.clone().unwrap())
|
||||
} else {
|
||||
default_colors.foreground.clone().unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn change_mode(&mut self, cursor_mode: &CursorMode, styles: &HashMap<u64, Arc<Style>>) {
|
||||
let CursorMode {
|
||||
shape,
|
||||
style_id,
|
||||
cell_percentage,
|
||||
blinkwait,
|
||||
blinkon,
|
||||
blinkoff,
|
||||
} = cursor_mode;
|
||||
|
||||
if let Some(shape) = shape {
|
||||
self.shape = shape.clone();
|
||||
}
|
||||
|
||||
if let Some(style_id) = style_id {
|
||||
self.style = styles.get(style_id).cloned();
|
||||
}
|
||||
|
||||
self.cell_percentage = *cell_percentage;
|
||||
self.blinkwait = *blinkwait;
|
||||
self.blinkon = *blinkon;
|
||||
self.blinkoff = *blinkoff;
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
const COLORS: Colors = Colors {
|
||||
foreground: Some(Color4f::new(0.1, 0.1, 0.1, 0.1)),
|
||||
background: Some(Color4f::new(0.2, 0.1, 0.1, 0.1)),
|
||||
special: Some(Color4f::new(0.3, 0.1, 0.1, 0.1)),
|
||||
};
|
||||
|
||||
const DEFAULT_COLORS: Colors = Colors {
|
||||
foreground: Some(Color4f::new(0.1, 0.2, 0.1, 0.1)),
|
||||
background: Some(Color4f::new(0.2, 0.2, 0.1, 0.1)),
|
||||
special: Some(Color4f::new(0.3, 0.2, 0.1, 0.1)),
|
||||
};
|
||||
|
||||
const NONE_COLORS: Colors = Colors {
|
||||
foreground: None,
|
||||
background: None,
|
||||
special: None,
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn test_from_type_name() {
|
||||
assert_eq!(
|
||||
CursorShape::from_type_name("block"),
|
||||
Some(CursorShape::Block)
|
||||
);
|
||||
assert_eq!(
|
||||
CursorShape::from_type_name("horizontal"),
|
||||
Some(CursorShape::Horizontal)
|
||||
);
|
||||
assert_eq!(
|
||||
CursorShape::from_type_name("vertical"),
|
||||
Some(CursorShape::Vertical)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_foreground() {
|
||||
let mut cursor = Cursor::new();
|
||||
let style = Some(Arc::new(Style::new(COLORS)));
|
||||
|
||||
assert_eq!(
|
||||
cursor.foreground(&DEFAULT_COLORS),
|
||||
DEFAULT_COLORS.background.clone().unwrap()
|
||||
);
|
||||
cursor.style = style.clone();
|
||||
assert_eq!(
|
||||
cursor.foreground(&DEFAULT_COLORS),
|
||||
COLORS.foreground.clone().unwrap()
|
||||
);
|
||||
|
||||
cursor.style = Some(Arc::new(Style::new(NONE_COLORS)));
|
||||
assert_eq!(
|
||||
cursor.foreground(&DEFAULT_COLORS),
|
||||
DEFAULT_COLORS.background.clone().unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_background() {
|
||||
let mut cursor = Cursor::new();
|
||||
let style = Some(Arc::new(Style::new(COLORS)));
|
||||
|
||||
assert_eq!(
|
||||
cursor.background(&DEFAULT_COLORS),
|
||||
DEFAULT_COLORS.foreground.clone().unwrap()
|
||||
);
|
||||
cursor.style = style.clone();
|
||||
assert_eq!(
|
||||
cursor.background(&DEFAULT_COLORS),
|
||||
COLORS.background.clone().unwrap()
|
||||
);
|
||||
|
||||
cursor.style = Some(Arc::new(Style::new(NONE_COLORS)));
|
||||
assert_eq!(
|
||||
cursor.background(&DEFAULT_COLORS),
|
||||
DEFAULT_COLORS.foreground.clone().unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_change_mode() {
|
||||
let cursor_mode = CursorMode {
|
||||
shape: Some(CursorShape::Horizontal),
|
||||
style_id: Some(1),
|
||||
cell_percentage: Some(100.0),
|
||||
blinkwait: Some(1),
|
||||
blinkon: Some(1),
|
||||
blinkoff: Some(1),
|
||||
};
|
||||
let mut styles = HashMap::new();
|
||||
styles.insert(1, Arc::new(Style::new(COLORS)));
|
||||
|
||||
let mut cursor = Cursor::new();
|
||||
|
||||
cursor.change_mode(&cursor_mode, &styles);
|
||||
assert_eq!(cursor.shape, CursorShape::Horizontal);
|
||||
assert_eq!(cursor.style, styles.get(&1).cloned());
|
||||
assert_eq!(cursor.cell_percentage, Some(100.0));
|
||||
assert_eq!(cursor.blinkwait, Some(1));
|
||||
assert_eq!(cursor.blinkon, Some(1));
|
||||
assert_eq!(cursor.blinkoff, Some(1));
|
||||
|
||||
let cursor_mode_with_none = CursorMode {
|
||||
shape: None,
|
||||
style_id: None,
|
||||
cell_percentage: None,
|
||||
blinkwait: None,
|
||||
blinkon: None,
|
||||
blinkoff: None,
|
||||
};
|
||||
cursor.change_mode(&cursor_mode_with_none, &styles);
|
||||
assert_eq!(cursor.shape, CursorShape::Horizontal);
|
||||
assert_eq!(cursor.style, styles.get(&1).cloned());
|
||||
assert_eq!(cursor.cell_percentage, None);
|
||||
assert_eq!(cursor.blinkwait, None);
|
||||
assert_eq!(cursor.blinkon, None);
|
||||
assert_eq!(cursor.blinkoff, None);
|
||||
}
|
||||
}
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
use skulpin::skia_safe::Color4f;
|
||||
|
||||
use super::style::{Colors, Style};
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub enum CursorShape {
|
||||
Block,
|
||||
Horizontal,
|
||||
Vertical,
|
||||
}
|
||||
|
||||
impl CursorShape {
|
||||
pub fn from_type_name(name: &str) -> Option<CursorShape> {
|
||||
match name {
|
||||
"block" => Some(CursorShape::Block),
|
||||
"horizontal" => Some(CursorShape::Horizontal),
|
||||
"vertical" => Some(CursorShape::Vertical),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default, Debug, Clone, PartialEq)]
|
||||
pub struct CursorMode {
|
||||
pub shape: Option<CursorShape>,
|
||||
pub style_id: Option<u64>,
|
||||
pub cell_percentage: Option<f32>,
|
||||
pub blinkwait: Option<u64>,
|
||||
pub blinkon: Option<u64>,
|
||||
pub blinkoff: Option<u64>,
|
||||
}
|
||||
|
||||
#[derive(Clone, PartialEq)]
|
||||
pub struct Cursor {
|
||||
pub grid_position: (u64, u64),
|
||||
pub parent_window_id: u64,
|
||||
pub shape: CursorShape,
|
||||
pub cell_percentage: Option<f32>,
|
||||
pub blinkwait: Option<u64>,
|
||||
pub blinkon: Option<u64>,
|
||||
pub blinkoff: Option<u64>,
|
||||
pub style: Option<Arc<Style>>,
|
||||
pub enabled: bool,
|
||||
pub double_width: bool,
|
||||
pub character: String,
|
||||
}
|
||||
|
||||
impl Cursor {
|
||||
pub fn new() -> Cursor {
|
||||
Cursor {
|
||||
grid_position: (0, 0),
|
||||
parent_window_id: 0,
|
||||
shape: CursorShape::Block,
|
||||
style: None,
|
||||
cell_percentage: None,
|
||||
blinkwait: None,
|
||||
blinkon: None,
|
||||
blinkoff: None,
|
||||
enabled: true,
|
||||
double_width: false,
|
||||
character: " ".to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn foreground(&self, default_colors: &Colors) -> Color4f {
|
||||
if let Some(style) = &self.style {
|
||||
style
|
||||
.colors
|
||||
.foreground
|
||||
.clone()
|
||||
.unwrap_or_else(|| default_colors.background.clone().unwrap())
|
||||
} else {
|
||||
default_colors.background.clone().unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn background(&self, default_colors: &Colors) -> Color4f {
|
||||
if let Some(style) = &self.style {
|
||||
style
|
||||
.colors
|
||||
.background
|
||||
.clone()
|
||||
.unwrap_or_else(|| default_colors.foreground.clone().unwrap())
|
||||
} else {
|
||||
default_colors.foreground.clone().unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn change_mode(&mut self, cursor_mode: &CursorMode, styles: &HashMap<u64, Arc<Style>>) {
|
||||
let CursorMode {
|
||||
shape,
|
||||
style_id,
|
||||
cell_percentage,
|
||||
blinkwait,
|
||||
blinkon,
|
||||
blinkoff,
|
||||
} = cursor_mode;
|
||||
|
||||
if let Some(shape) = shape {
|
||||
self.shape = shape.clone();
|
||||
}
|
||||
|
||||
if let Some(style_id) = style_id {
|
||||
self.style = styles.get(style_id).cloned();
|
||||
}
|
||||
|
||||
self.cell_percentage = *cell_percentage;
|
||||
self.blinkwait = *blinkwait;
|
||||
self.blinkon = *blinkon;
|
||||
self.blinkoff = *blinkoff;
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
const COLORS: Colors = Colors {
|
||||
foreground: Some(Color4f::new(0.1, 0.1, 0.1, 0.1)),
|
||||
background: Some(Color4f::new(0.2, 0.1, 0.1, 0.1)),
|
||||
special: Some(Color4f::new(0.3, 0.1, 0.1, 0.1)),
|
||||
};
|
||||
|
||||
const DEFAULT_COLORS: Colors = Colors {
|
||||
foreground: Some(Color4f::new(0.1, 0.2, 0.1, 0.1)),
|
||||
background: Some(Color4f::new(0.2, 0.2, 0.1, 0.1)),
|
||||
special: Some(Color4f::new(0.3, 0.2, 0.1, 0.1)),
|
||||
};
|
||||
|
||||
const NONE_COLORS: Colors = Colors {
|
||||
foreground: None,
|
||||
background: None,
|
||||
special: None,
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn test_from_type_name() {
|
||||
assert_eq!(
|
||||
CursorShape::from_type_name("block"),
|
||||
Some(CursorShape::Block)
|
||||
);
|
||||
assert_eq!(
|
||||
CursorShape::from_type_name("horizontal"),
|
||||
Some(CursorShape::Horizontal)
|
||||
);
|
||||
assert_eq!(
|
||||
CursorShape::from_type_name("vertical"),
|
||||
Some(CursorShape::Vertical)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_foreground() {
|
||||
let mut cursor = Cursor::new();
|
||||
let style = Some(Arc::new(Style::new(COLORS)));
|
||||
|
||||
assert_eq!(
|
||||
cursor.foreground(&DEFAULT_COLORS),
|
||||
DEFAULT_COLORS.background.clone().unwrap()
|
||||
);
|
||||
cursor.style = style.clone();
|
||||
assert_eq!(
|
||||
cursor.foreground(&DEFAULT_COLORS),
|
||||
COLORS.foreground.clone().unwrap()
|
||||
);
|
||||
|
||||
cursor.style = Some(Arc::new(Style::new(NONE_COLORS)));
|
||||
assert_eq!(
|
||||
cursor.foreground(&DEFAULT_COLORS),
|
||||
DEFAULT_COLORS.background.clone().unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_background() {
|
||||
let mut cursor = Cursor::new();
|
||||
let style = Some(Arc::new(Style::new(COLORS)));
|
||||
|
||||
assert_eq!(
|
||||
cursor.background(&DEFAULT_COLORS),
|
||||
DEFAULT_COLORS.foreground.clone().unwrap()
|
||||
);
|
||||
cursor.style = style.clone();
|
||||
assert_eq!(
|
||||
cursor.background(&DEFAULT_COLORS),
|
||||
COLORS.background.clone().unwrap()
|
||||
);
|
||||
|
||||
cursor.style = Some(Arc::new(Style::new(NONE_COLORS)));
|
||||
assert_eq!(
|
||||
cursor.background(&DEFAULT_COLORS),
|
||||
DEFAULT_COLORS.foreground.clone().unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_change_mode() {
|
||||
let cursor_mode = CursorMode {
|
||||
shape: Some(CursorShape::Horizontal),
|
||||
style_id: Some(1),
|
||||
cell_percentage: Some(100.0),
|
||||
blinkwait: Some(1),
|
||||
blinkon: Some(1),
|
||||
blinkoff: Some(1),
|
||||
};
|
||||
let mut styles = HashMap::new();
|
||||
styles.insert(1, Arc::new(Style::new(COLORS)));
|
||||
|
||||
let mut cursor = Cursor::new();
|
||||
|
||||
cursor.change_mode(&cursor_mode, &styles);
|
||||
assert_eq!(cursor.shape, CursorShape::Horizontal);
|
||||
assert_eq!(cursor.style, styles.get(&1).cloned());
|
||||
assert_eq!(cursor.cell_percentage, Some(100.0));
|
||||
assert_eq!(cursor.blinkwait, Some(1));
|
||||
assert_eq!(cursor.blinkon, Some(1));
|
||||
assert_eq!(cursor.blinkoff, Some(1));
|
||||
|
||||
let cursor_mode_with_none = CursorMode {
|
||||
shape: None,
|
||||
style_id: None,
|
||||
cell_percentage: None,
|
||||
blinkwait: None,
|
||||
blinkon: None,
|
||||
blinkoff: None,
|
||||
};
|
||||
cursor.change_mode(&cursor_mode_with_none, &styles);
|
||||
assert_eq!(cursor.shape, CursorShape::Horizontal);
|
||||
assert_eq!(cursor.style, styles.get(&1).cloned());
|
||||
assert_eq!(cursor.cell_percentage, None);
|
||||
assert_eq!(cursor.blinkwait, None);
|
||||
assert_eq!(cursor.blinkon, None);
|
||||
assert_eq!(cursor.blinkoff, None);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,335 +1,368 @@
|
||||
use std::collections::HashMap;
|
||||
use std::sync::mpsc::Receiver;
|
||||
use std::sync::Arc;
|
||||
|
||||
use log::{error, trace, warn};
|
||||
use skulpin::skia_safe::{colors, dash_path_effect, BlendMode, Canvas, Color, Paint, Rect};
|
||||
use skulpin::CoordinateSystemHelper;
|
||||
|
||||
pub mod animation_utils;
|
||||
mod caching_shaper;
|
||||
pub mod cursor_renderer;
|
||||
pub mod font_options;
|
||||
mod rendered_window;
|
||||
|
||||
pub use caching_shaper::CachingShaper;
|
||||
pub use font_options::*;
|
||||
pub use rendered_window::{RenderedWindow, WindowDrawDetails};
|
||||
|
||||
use crate::editor::{Colors, DrawCommand, Style, WindowDrawCommand};
|
||||
use crate::settings::*;
|
||||
use cursor_renderer::CursorRenderer;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct RendererSettings {
|
||||
animation_length: f32,
|
||||
floating_opacity: f32,
|
||||
floating_blur: bool,
|
||||
}
|
||||
|
||||
pub fn initialize_settings() {
|
||||
SETTINGS.set(&RendererSettings {
|
||||
animation_length: 0.15,
|
||||
floating_opacity: 0.7,
|
||||
floating_blur: true,
|
||||
});
|
||||
|
||||
register_nvim_setting!(
|
||||
"window_animation_length",
|
||||
RendererSettings::animation_length
|
||||
);
|
||||
register_nvim_setting!(
|
||||
"floating_window_opacity",
|
||||
RendererSettings::floating_opacity
|
||||
);
|
||||
register_nvim_setting!("floating_window_blur", RendererSettings::floating_blur);
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
pub struct Renderer {
|
||||
rendered_windows: HashMap<u64, RenderedWindow>,
|
||||
cursor_renderer: CursorRenderer,
|
||||
|
||||
pub paint: Paint,
|
||||
pub shaper: CachingShaper,
|
||||
pub default_style: Arc<Style>,
|
||||
pub font_width: f32,
|
||||
pub font_height: f32,
|
||||
pub window_regions: Vec<WindowDrawDetails>,
|
||||
pub batched_draw_command_receiver: Receiver<Vec<DrawCommand>>,
|
||||
}
|
||||
|
||||
impl Renderer {
|
||||
pub fn new(batched_draw_command_receiver: Receiver<Vec<DrawCommand>>) -> Renderer {
|
||||
let rendered_windows = HashMap::new();
|
||||
let cursor_renderer = CursorRenderer::new();
|
||||
|
||||
let mut paint = Paint::new(colors::WHITE, None);
|
||||
paint.set_anti_alias(false);
|
||||
let mut shaper = CachingShaper::new();
|
||||
let (font_width, font_height) = shaper.font_base_dimensions();
|
||||
let default_style = Arc::new(Style::new(Colors::new(
|
||||
Some(colors::WHITE),
|
||||
Some(colors::BLACK),
|
||||
Some(colors::GREY),
|
||||
)));
|
||||
let window_regions = Vec::new();
|
||||
|
||||
Renderer {
|
||||
rendered_windows,
|
||||
cursor_renderer,
|
||||
|
||||
paint,
|
||||
shaper,
|
||||
default_style,
|
||||
font_width,
|
||||
font_height,
|
||||
window_regions,
|
||||
batched_draw_command_receiver,
|
||||
}
|
||||
}
|
||||
|
||||
fn update_font(&mut self, guifont_setting: &str) -> bool {
|
||||
let updated = self.shaper.update_font(guifont_setting);
|
||||
if updated {
|
||||
let (font_width, font_height) = self.shaper.font_base_dimensions();
|
||||
self.font_width = font_width;
|
||||
self.font_height = font_height.ceil();
|
||||
}
|
||||
updated
|
||||
}
|
||||
|
||||
fn compute_text_region(&self, grid_pos: (u64, u64), cell_width: u64) -> Rect {
|
||||
let (grid_x, grid_y) = grid_pos;
|
||||
let x = grid_x as f32 * self.font_width;
|
||||
let y = grid_y as f32 * self.font_height;
|
||||
let width = cell_width as f32 * self.font_width as f32;
|
||||
let height = self.font_height as f32;
|
||||
Rect::new(x, y, x + width, y + height)
|
||||
}
|
||||
|
||||
fn draw_background(
|
||||
&mut self,
|
||||
canvas: &mut Canvas,
|
||||
grid_pos: (u64, u64),
|
||||
cell_width: u64,
|
||||
style: &Option<Arc<Style>>,
|
||||
) {
|
||||
self.paint.set_blend_mode(BlendMode::Src);
|
||||
|
||||
let region = self.compute_text_region(grid_pos, cell_width);
|
||||
let style = style.as_ref().unwrap_or(&self.default_style);
|
||||
|
||||
self.paint
|
||||
.set_color(style.background(&self.default_style.colors).to_color());
|
||||
canvas.draw_rect(region, &self.paint);
|
||||
}
|
||||
|
||||
fn draw_foreground(
|
||||
&mut self,
|
||||
canvas: &mut Canvas,
|
||||
text: &str,
|
||||
grid_pos: (u64, u64),
|
||||
cell_width: u64,
|
||||
style: &Option<Arc<Style>>,
|
||||
) {
|
||||
let (grid_x, grid_y) = grid_pos;
|
||||
let x = grid_x as f32 * self.font_width;
|
||||
let y = grid_y as f32 * self.font_height;
|
||||
let width = cell_width as f32 * self.font_width;
|
||||
|
||||
let style = style.as_ref().unwrap_or(&self.default_style);
|
||||
|
||||
canvas.save();
|
||||
|
||||
let region = self.compute_text_region(grid_pos, cell_width);
|
||||
|
||||
canvas.clip_rect(region, None, Some(false));
|
||||
|
||||
self.paint.set_blend_mode(BlendMode::Src);
|
||||
let transparent = Color::from_argb(0, 0, 0, 0);
|
||||
self.paint.set_color(transparent);
|
||||
canvas.draw_rect(region, &self.paint);
|
||||
|
||||
if style.underline || style.undercurl {
|
||||
let line_position = self.shaper.underline_position();
|
||||
let stroke_width = self.shaper.options.size / 10.0;
|
||||
self.paint
|
||||
.set_color(style.special(&self.default_style.colors).to_color());
|
||||
self.paint.set_stroke_width(stroke_width);
|
||||
|
||||
if style.undercurl {
|
||||
self.paint.set_path_effect(dash_path_effect::new(
|
||||
&[stroke_width * 2.0, stroke_width * 2.0],
|
||||
0.0,
|
||||
));
|
||||
} else {
|
||||
self.paint.set_path_effect(None);
|
||||
}
|
||||
|
||||
canvas.draw_line(
|
||||
(x, y - line_position + self.font_height),
|
||||
(x + width, y - line_position + self.font_height),
|
||||
&self.paint,
|
||||
);
|
||||
}
|
||||
|
||||
self.paint
|
||||
.set_color(style.foreground(&self.default_style.colors).to_color());
|
||||
let text = text.trim_end();
|
||||
if !text.is_empty() {
|
||||
for blob in self
|
||||
.shaper
|
||||
.shape_cached(text, style.bold, style.italic)
|
||||
.iter()
|
||||
{
|
||||
canvas.draw_text_blob(blob, (x, y), &self.paint);
|
||||
}
|
||||
}
|
||||
|
||||
if style.strikethrough {
|
||||
let line_position = region.center_y();
|
||||
self.paint
|
||||
.set_color(style.special(&self.default_style.colors).to_color());
|
||||
canvas.draw_line((x, line_position), (x + width, line_position), &self.paint);
|
||||
}
|
||||
|
||||
canvas.restore();
|
||||
}
|
||||
|
||||
pub fn handle_draw_command(&mut self, root_canvas: &mut Canvas, draw_command: DrawCommand) {
|
||||
warn!("{:?}", &draw_command);
|
||||
match draw_command {
|
||||
DrawCommand::Window {
|
||||
grid_id,
|
||||
command: WindowDrawCommand::Close,
|
||||
} => {
|
||||
self.rendered_windows.remove(&grid_id);
|
||||
}
|
||||
DrawCommand::Window { grid_id, command } => {
|
||||
if let Some(rendered_window) = self.rendered_windows.remove(&grid_id) {
|
||||
warn!("Window positioned {}", grid_id);
|
||||
let rendered_window = rendered_window.handle_window_draw_command(self, command);
|
||||
self.rendered_windows.insert(grid_id, rendered_window);
|
||||
} else if let WindowDrawCommand::Position {
|
||||
grid_left,
|
||||
grid_top,
|
||||
width,
|
||||
height,
|
||||
..
|
||||
} = command
|
||||
{
|
||||
warn!("Created window {}", grid_id);
|
||||
let new_window = RenderedWindow::new(
|
||||
root_canvas,
|
||||
&self,
|
||||
grid_id,
|
||||
(grid_left as f32, grid_top as f32).into(),
|
||||
width,
|
||||
height,
|
||||
);
|
||||
self.rendered_windows.insert(grid_id, new_window);
|
||||
} else {
|
||||
error!("WindowDrawCommand sent for uninitialized grid {}", grid_id);
|
||||
}
|
||||
}
|
||||
DrawCommand::UpdateCursor(new_cursor) => {
|
||||
self.cursor_renderer.update_cursor(new_cursor);
|
||||
}
|
||||
DrawCommand::FontChanged(new_font) => {
|
||||
if self.update_font(&new_font) {
|
||||
// Resize all the grids
|
||||
}
|
||||
}
|
||||
DrawCommand::DefaultStyleChanged(new_style) => {
|
||||
self.default_style = Arc::new(new_style);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn draw_frame(
|
||||
&mut self,
|
||||
root_canvas: &mut Canvas,
|
||||
coordinate_system_helper: &CoordinateSystemHelper,
|
||||
dt: f32,
|
||||
) -> bool {
|
||||
trace!("Rendering");
|
||||
let mut font_changed = false;
|
||||
|
||||
let draw_commands: Vec<DrawCommand> = self
|
||||
.batched_draw_command_receiver
|
||||
.try_iter() // Iterator of Vec of DrawCommand
|
||||
.map(|batch| batch.into_iter()) // Iterator of Iterator of DrawCommand
|
||||
.flatten() // Iterator of DrawCommand
|
||||
.collect(); // Vec of DrawCommand
|
||||
for draw_command in draw_commands.into_iter() {
|
||||
if let DrawCommand::FontChanged(_) = draw_command {
|
||||
font_changed = true;
|
||||
}
|
||||
self.handle_draw_command(root_canvas, draw_command);
|
||||
}
|
||||
|
||||
root_canvas.clear(
|
||||
self.default_style
|
||||
.colors
|
||||
.background
|
||||
.clone()
|
||||
.unwrap()
|
||||
.to_color(),
|
||||
);
|
||||
|
||||
root_canvas.save();
|
||||
|
||||
if let Some(root_window) = self.rendered_windows.get(&1) {
|
||||
let clip_rect = root_window.pixel_region(self.font_width, self.font_height);
|
||||
root_canvas.clip_rect(&clip_rect, None, Some(false));
|
||||
}
|
||||
|
||||
coordinate_system_helper.use_logical_coordinates(root_canvas);
|
||||
|
||||
let windows: Vec<&mut RenderedWindow> = {
|
||||
let (mut root_windows, mut floating_windows): (
|
||||
Vec<&mut RenderedWindow>,
|
||||
Vec<&mut RenderedWindow>,
|
||||
) = self
|
||||
.rendered_windows
|
||||
.values_mut()
|
||||
.filter(|window| !window.hidden)
|
||||
.partition(|window| !window.floating);
|
||||
|
||||
root_windows
|
||||
.sort_by(|window_a, window_b| window_a.id.partial_cmp(&window_b.id).unwrap());
|
||||
floating_windows
|
||||
.sort_by(|window_a, window_b| window_a.id.partial_cmp(&window_b.id).unwrap());
|
||||
|
||||
root_windows
|
||||
.into_iter()
|
||||
.chain(floating_windows.into_iter())
|
||||
.collect()
|
||||
};
|
||||
|
||||
let settings = SETTINGS.get::<RendererSettings>();
|
||||
let font_width = self.font_width;
|
||||
let font_height = self.font_height;
|
||||
self.window_regions = windows
|
||||
.into_iter()
|
||||
.map(|window| window.draw(root_canvas, &settings, font_width, font_height, dt))
|
||||
.collect();
|
||||
|
||||
self.cursor_renderer.draw(
|
||||
&self.default_style.colors,
|
||||
(self.font_width, self.font_height),
|
||||
&mut self.shaper,
|
||||
root_canvas,
|
||||
dt,
|
||||
);
|
||||
|
||||
root_canvas.restore();
|
||||
|
||||
font_changed
|
||||
}
|
||||
}
|
||||
use std::collections::HashMap;
|
||||
use std::sync::mpsc::Receiver;
|
||||
use std::sync::Arc;
|
||||
|
||||
use log::{error, trace, warn};
|
||||
use skulpin::skia_safe::{colors, dash_path_effect, BlendMode, Canvas, Color, Paint, Rect};
|
||||
use skulpin::CoordinateSystemHelper;
|
||||
|
||||
pub mod animation_utils;
|
||||
mod caching_shaper;
|
||||
pub mod cursor_renderer;
|
||||
pub mod font_options;
|
||||
mod rendered_window;
|
||||
|
||||
pub use caching_shaper::CachingShaper;
|
||||
pub use font_options::*;
|
||||
pub use rendered_window::{RenderedWindow, WindowDrawDetails};
|
||||
|
||||
use crate::bridge::EditorMode;
|
||||
use crate::editor::{Colors, DrawCommand, Style, WindowDrawCommand};
|
||||
use crate::settings::*;
|
||||
use cursor_renderer::CursorRenderer;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct RendererSettings {
|
||||
position_animation_length: f32,
|
||||
scroll_animation_length: f32,
|
||||
floating_opacity: f32,
|
||||
floating_blur: bool,
|
||||
}
|
||||
|
||||
pub fn initialize_settings() {
|
||||
SETTINGS.set(&RendererSettings {
|
||||
position_animation_length: 0.15,
|
||||
scroll_animation_length: 0.3,
|
||||
floating_opacity: 0.7,
|
||||
floating_blur: true,
|
||||
});
|
||||
|
||||
register_nvim_setting!(
|
||||
"window_position_animation_length",
|
||||
RendererSettings::position_animation_length
|
||||
);
|
||||
register_nvim_setting!(
|
||||
"window_scroll_animation_length",
|
||||
RendererSettings::scroll_animation_length
|
||||
);
|
||||
register_nvim_setting!(
|
||||
"floating_window_opacity",
|
||||
RendererSettings::floating_opacity
|
||||
);
|
||||
register_nvim_setting!("floating_window_blur", RendererSettings::floating_blur);
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
pub struct Renderer {
|
||||
rendered_windows: HashMap<u64, RenderedWindow>,
|
||||
cursor_renderer: CursorRenderer,
|
||||
|
||||
pub current_mode: EditorMode,
|
||||
pub paint: Paint,
|
||||
pub shaper: CachingShaper,
|
||||
pub default_style: Arc<Style>,
|
||||
pub font_width: f32,
|
||||
pub font_height: f32,
|
||||
pub window_regions: Vec<WindowDrawDetails>,
|
||||
pub batched_draw_command_receiver: Receiver<Vec<DrawCommand>>,
|
||||
}
|
||||
|
||||
impl Renderer {
|
||||
pub fn new(batched_draw_command_receiver: Receiver<Vec<DrawCommand>>) -> Renderer {
|
||||
let rendered_windows = HashMap::new();
|
||||
let cursor_renderer = CursorRenderer::new();
|
||||
|
||||
let current_mode = EditorMode::Unknown(String::from(""));
|
||||
let mut paint = Paint::new(colors::WHITE, None);
|
||||
paint.set_anti_alias(false);
|
||||
let mut shaper = CachingShaper::new();
|
||||
let (font_width, font_height) = shaper.font_base_dimensions();
|
||||
let default_style = Arc::new(Style::new(Colors::new(
|
||||
Some(colors::WHITE),
|
||||
Some(colors::BLACK),
|
||||
Some(colors::GREY),
|
||||
)));
|
||||
let window_regions = Vec::new();
|
||||
|
||||
Renderer {
|
||||
rendered_windows,
|
||||
cursor_renderer,
|
||||
|
||||
current_mode,
|
||||
paint,
|
||||
shaper,
|
||||
default_style,
|
||||
font_width,
|
||||
font_height,
|
||||
window_regions,
|
||||
batched_draw_command_receiver,
|
||||
}
|
||||
}
|
||||
|
||||
fn update_font(&mut self, guifont_setting: &str) {
|
||||
if self.shaper.update_font(guifont_setting) {
|
||||
let (font_width, font_height) = self.shaper.font_base_dimensions();
|
||||
self.font_width = font_width;
|
||||
self.font_height = font_height.ceil();
|
||||
}
|
||||
}
|
||||
|
||||
fn compute_text_region(&self, grid_pos: (u64, u64), cell_width: u64) -> Rect {
|
||||
let (grid_x, grid_y) = grid_pos;
|
||||
let x = grid_x as f32 * self.font_width;
|
||||
let y = grid_y as f32 * self.font_height;
|
||||
let width = cell_width as f32 * self.font_width as f32;
|
||||
let height = self.font_height as f32;
|
||||
Rect::new(x, y, x + width, y + height)
|
||||
}
|
||||
|
||||
fn get_default_background(&self) -> Color {
|
||||
self.default_style
|
||||
.colors
|
||||
.background
|
||||
.clone()
|
||||
.unwrap()
|
||||
.to_color()
|
||||
}
|
||||
|
||||
fn draw_background(
|
||||
&mut self,
|
||||
canvas: &mut Canvas,
|
||||
grid_pos: (u64, u64),
|
||||
cell_width: u64,
|
||||
style: &Option<Arc<Style>>,
|
||||
) {
|
||||
self.paint.set_blend_mode(BlendMode::Src);
|
||||
|
||||
let region = self.compute_text_region(grid_pos, cell_width);
|
||||
let style = style.as_ref().unwrap_or(&self.default_style);
|
||||
|
||||
self.paint
|
||||
.set_color(style.background(&self.default_style.colors).to_color());
|
||||
canvas.draw_rect(region, &self.paint);
|
||||
}
|
||||
|
||||
fn draw_foreground(
|
||||
&mut self,
|
||||
canvas: &mut Canvas,
|
||||
text: &str,
|
||||
grid_pos: (u64, u64),
|
||||
cell_width: u64,
|
||||
style: &Option<Arc<Style>>,
|
||||
) {
|
||||
let (grid_x, grid_y) = grid_pos;
|
||||
let x = grid_x as f32 * self.font_width;
|
||||
let y = grid_y as f32 * self.font_height;
|
||||
let width = cell_width as f32 * self.font_width;
|
||||
|
||||
let style = style.as_ref().unwrap_or(&self.default_style);
|
||||
|
||||
canvas.save();
|
||||
|
||||
let region = self.compute_text_region(grid_pos, cell_width);
|
||||
|
||||
canvas.clip_rect(region, None, Some(false));
|
||||
|
||||
self.paint.set_blend_mode(BlendMode::Src);
|
||||
let transparent = Color::from_argb(0, 0, 0, 0);
|
||||
self.paint.set_color(transparent);
|
||||
canvas.draw_rect(region, &self.paint);
|
||||
|
||||
if style.underline || style.undercurl {
|
||||
let line_position = self.shaper.underline_position();
|
||||
let stroke_width = self.shaper.options.size / 10.0;
|
||||
self.paint
|
||||
.set_color(style.special(&self.default_style.colors).to_color());
|
||||
self.paint.set_stroke_width(stroke_width);
|
||||
|
||||
if style.undercurl {
|
||||
self.paint.set_path_effect(dash_path_effect::new(
|
||||
&[stroke_width * 2.0, stroke_width * 2.0],
|
||||
0.0,
|
||||
));
|
||||
} else {
|
||||
self.paint.set_path_effect(None);
|
||||
}
|
||||
|
||||
canvas.draw_line(
|
||||
(x, y - line_position + self.font_height),
|
||||
(x + width, y - line_position + self.font_height),
|
||||
&self.paint,
|
||||
);
|
||||
}
|
||||
|
||||
self.paint
|
||||
.set_color(style.foreground(&self.default_style.colors).to_color());
|
||||
let text = text.trim_end();
|
||||
if !text.is_empty() {
|
||||
for blob in self
|
||||
.shaper
|
||||
.shape_cached(text, style.bold, style.italic)
|
||||
.iter()
|
||||
{
|
||||
canvas.draw_text_blob(blob, (x, y), &self.paint);
|
||||
}
|
||||
}
|
||||
|
||||
if style.strikethrough {
|
||||
let line_position = region.center_y();
|
||||
self.paint
|
||||
.set_color(style.special(&self.default_style.colors).to_color());
|
||||
canvas.draw_line((x, line_position), (x + width, line_position), &self.paint);
|
||||
}
|
||||
|
||||
canvas.restore();
|
||||
}
|
||||
|
||||
pub fn handle_draw_command(&mut self, root_canvas: &mut Canvas, draw_command: DrawCommand) {
|
||||
warn!("{:?}", &draw_command);
|
||||
match draw_command {
|
||||
DrawCommand::Window {
|
||||
grid_id,
|
||||
command: WindowDrawCommand::Close,
|
||||
} => {
|
||||
self.rendered_windows.remove(&grid_id);
|
||||
}
|
||||
DrawCommand::Window { grid_id, command } => {
|
||||
if let Some(rendered_window) = self.rendered_windows.remove(&grid_id) {
|
||||
let rendered_window = rendered_window.handle_window_draw_command(self, command);
|
||||
self.rendered_windows.insert(grid_id, rendered_window);
|
||||
} else if let WindowDrawCommand::Position {
|
||||
grid_left,
|
||||
grid_top,
|
||||
width,
|
||||
height,
|
||||
..
|
||||
} = command
|
||||
{
|
||||
warn!("Created window {}", grid_id);
|
||||
let new_window = RenderedWindow::new(
|
||||
root_canvas,
|
||||
&self,
|
||||
grid_id,
|
||||
(grid_left as f32, grid_top as f32).into(),
|
||||
width,
|
||||
height,
|
||||
);
|
||||
self.rendered_windows.insert(grid_id, new_window);
|
||||
} else {
|
||||
error!("WindowDrawCommand sent for uninitialized grid {}", grid_id);
|
||||
}
|
||||
}
|
||||
DrawCommand::UpdateCursor(new_cursor) => {
|
||||
self.cursor_renderer.update_cursor(new_cursor);
|
||||
}
|
||||
DrawCommand::FontChanged(new_font) => {
|
||||
self.update_font(&new_font);
|
||||
}
|
||||
DrawCommand::DefaultStyleChanged(new_style) => {
|
||||
self.default_style = Arc::new(new_style);
|
||||
}
|
||||
DrawCommand::ModeChanged(new_mode) => {
|
||||
self.current_mode = new_mode;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn draw_frame(
|
||||
&mut self,
|
||||
root_canvas: &mut Canvas,
|
||||
coordinate_system_helper: &CoordinateSystemHelper,
|
||||
dt: f32,
|
||||
) -> bool {
|
||||
trace!("Rendering");
|
||||
let mut font_changed = false;
|
||||
|
||||
let draw_commands: Vec<DrawCommand> = self
|
||||
.batched_draw_command_receiver
|
||||
.try_iter() // Iterator of Vec of DrawCommand
|
||||
.map(|batch| batch.into_iter()) // Iterator of Iterator of DrawCommand
|
||||
.flatten() // Iterator of DrawCommand
|
||||
.collect(); // Vec of DrawCommand
|
||||
for draw_command in draw_commands.into_iter() {
|
||||
if let DrawCommand::FontChanged(_) = draw_command {
|
||||
font_changed = true;
|
||||
}
|
||||
self.handle_draw_command(root_canvas, draw_command);
|
||||
}
|
||||
|
||||
root_canvas.clear(
|
||||
self.default_style
|
||||
.colors
|
||||
.background
|
||||
.clone()
|
||||
.unwrap()
|
||||
.to_color(),
|
||||
);
|
||||
|
||||
root_canvas.save();
|
||||
|
||||
if let Some(root_window) = self.rendered_windows.get(&1) {
|
||||
let clip_rect = root_window.pixel_region(self.font_width, self.font_height);
|
||||
root_canvas.clip_rect(&clip_rect, None, Some(false));
|
||||
}
|
||||
|
||||
coordinate_system_helper.use_logical_coordinates(root_canvas);
|
||||
|
||||
let default_background = self.get_default_background();
|
||||
let font_width = self.font_width;
|
||||
let font_height = self.font_height;
|
||||
|
||||
let windows: Vec<&mut RenderedWindow> = {
|
||||
let (mut root_windows, mut floating_windows): (
|
||||
Vec<&mut RenderedWindow>,
|
||||
Vec<&mut RenderedWindow>,
|
||||
) = self
|
||||
.rendered_windows
|
||||
.values_mut()
|
||||
.filter(|window| !window.hidden)
|
||||
.partition(|window| !window.floating);
|
||||
|
||||
root_windows
|
||||
.sort_by(|window_a, window_b| window_a.id.partial_cmp(&window_b.id).unwrap());
|
||||
floating_windows
|
||||
.sort_by(|window_a, window_b| window_a.id.partial_cmp(&window_b.id).unwrap());
|
||||
|
||||
root_windows
|
||||
.into_iter()
|
||||
.chain(floating_windows.into_iter())
|
||||
.collect()
|
||||
};
|
||||
|
||||
let settings = SETTINGS.get::<RendererSettings>();
|
||||
self.window_regions = windows
|
||||
.into_iter()
|
||||
.map(|window| {
|
||||
window.draw(
|
||||
root_canvas,
|
||||
&settings,
|
||||
default_background,
|
||||
font_width,
|
||||
font_height,
|
||||
dt,
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
|
||||
let windows = &self.rendered_windows;
|
||||
self.cursor_renderer
|
||||
.update_cursor_destination(font_width, font_height, windows);
|
||||
|
||||
self.cursor_renderer.draw(
|
||||
&self.default_style.colors,
|
||||
(self.font_width, self.font_height),
|
||||
&self.current_mode,
|
||||
&mut self.shaper,
|
||||
root_canvas,
|
||||
dt,
|
||||
);
|
||||
|
||||
root_canvas.restore();
|
||||
|
||||
font_changed
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue