|
|
|
|
@ -1,125 +1,189 @@
|
|
|
|
|
use std::borrow::Cow;
|
|
|
|
|
use std::sync::{Arc, Mutex};
|
|
|
|
|
use std::any::Any;
|
|
|
|
|
use std::time::{Duration, Instant};
|
|
|
|
|
|
|
|
|
|
use skulpin::{CoordinateSystem, CoordinateSystemHelper, RendererBuilder};
|
|
|
|
|
use skulpin::skia_safe::{Canvas, colors, Color4f, Font, FontStyle, Point, Paint, Rect, Shaper, Typeface};
|
|
|
|
|
use skulpin::skia_safe::paint::Style;
|
|
|
|
|
use skulpin::skia_safe::matrix::ScaleToFit;
|
|
|
|
|
use lru::LruCache;
|
|
|
|
|
|
|
|
|
|
use skulpin::{CoordinateSystem, RendererBuilder};
|
|
|
|
|
use skulpin::skia_safe::{Canvas, colors, Font, FontStyle, Paint, Point, Rect, Shaper, TextBlob, Typeface};
|
|
|
|
|
use skulpin::skia_safe::icu;
|
|
|
|
|
use skulpin::winit::dpi::{LogicalSize, LogicalPosition};
|
|
|
|
|
use skulpin::winit::event::{ElementState, Event, MouseScrollDelta, KeyboardInput, VirtualKeyCode, WindowEvent};
|
|
|
|
|
use skulpin::winit::dpi::LogicalSize;
|
|
|
|
|
use skulpin::winit::event::{ElementState, Event, MouseScrollDelta, WindowEvent};
|
|
|
|
|
use skulpin::winit::event_loop::{ControlFlow, EventLoop};
|
|
|
|
|
use skulpin::winit::window::WindowBuilder;
|
|
|
|
|
|
|
|
|
|
use neovim_lib::NeovimApi;
|
|
|
|
|
use neovim_lib::{Neovim, NeovimApi};
|
|
|
|
|
|
|
|
|
|
use crate::editor::{DrawCommand, Editor, Colors, CursorType};
|
|
|
|
|
use crate::editor::{Editor, CursorType, Style, Colors};
|
|
|
|
|
use crate::keybindings::construct_keybinding_string;
|
|
|
|
|
|
|
|
|
|
const FONT_NAME: &str = "Delugia Nerd Font";
|
|
|
|
|
const FONT_SIZE: f32 = 14.0;
|
|
|
|
|
|
|
|
|
|
fn draw(
|
|
|
|
|
editor: &Arc<Mutex<Editor>>,
|
|
|
|
|
canvas: &mut Canvas,
|
|
|
|
|
cursor_pos: &mut (f32, f32),
|
|
|
|
|
shaper: &Shaper,
|
|
|
|
|
paint: &mut Paint,
|
|
|
|
|
font: &Font,
|
|
|
|
|
struct CachingShaper {
|
|
|
|
|
shaper: Shaper,
|
|
|
|
|
cache: LruCache<String, TextBlob>
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl CachingShaper {
|
|
|
|
|
pub fn new() -> CachingShaper {
|
|
|
|
|
CachingShaper {
|
|
|
|
|
shaper: Shaper::new(None),
|
|
|
|
|
cache: LruCache::new(1000)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn shape(&self, text: &str, font: &Font) -> TextBlob {
|
|
|
|
|
let (blob, _) = self.shaper.shape_text_blob(text, font, true, 1000.0, Point::default()).unwrap();
|
|
|
|
|
blob
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn shape_cached(&mut self, text: String, font: &Font) -> &TextBlob {
|
|
|
|
|
if !self.cache.contains(&text) {
|
|
|
|
|
self.cache.put(text.clone(), self.shape(&text, &font));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
self.cache.get(&text).unwrap()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct Renderer {
|
|
|
|
|
editor: Arc<Mutex<Editor>>,
|
|
|
|
|
|
|
|
|
|
paint: Paint,
|
|
|
|
|
font: Font,
|
|
|
|
|
shaper: CachingShaper,
|
|
|
|
|
|
|
|
|
|
font_width: f32,
|
|
|
|
|
font_height: f32
|
|
|
|
|
) {
|
|
|
|
|
let (draw_commands, default_colors, cursor_grid_pos, cursor_type, cursor_foreground, cursor_background, cursor_enabled) = {
|
|
|
|
|
let editor = editor.lock().unwrap();
|
|
|
|
|
(
|
|
|
|
|
editor.build_draw_commands().clone(),
|
|
|
|
|
editor.default_colors.clone(),
|
|
|
|
|
editor.cursor_pos.clone(),
|
|
|
|
|
editor.cursor_type.clone(),
|
|
|
|
|
editor.cursor_foreground(),
|
|
|
|
|
editor.cursor_background(),
|
|
|
|
|
editor.cursor_enabled
|
|
|
|
|
)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
canvas.clear(default_colors.background.clone().unwrap().to_color());
|
|
|
|
|
|
|
|
|
|
for command in draw_commands {
|
|
|
|
|
let x = command.col_start as f32 * font_width;
|
|
|
|
|
let y = command.row as f32 * font_height + font_height - font_height * 0.2;
|
|
|
|
|
let top = y - font_height * 0.8;
|
|
|
|
|
let width = command.text.chars().count() as f32 * font_width;
|
|
|
|
|
let height = font_height;
|
|
|
|
|
font_height: f32,
|
|
|
|
|
cursor_pos: (f32, f32),
|
|
|
|
|
|
|
|
|
|
previous_frame_instant: Instant
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Renderer {
|
|
|
|
|
pub fn new(editor: Arc<Mutex<Editor>>) -> Renderer {
|
|
|
|
|
let paint = Paint::new(colors::WHITE, None);
|
|
|
|
|
let typeface = Typeface::new(FONT_NAME, FontStyle::default()).expect("Could not load font file.");
|
|
|
|
|
let font = Font::from_typeface(typeface, FONT_SIZE);
|
|
|
|
|
let shaper = CachingShaper::new();
|
|
|
|
|
|
|
|
|
|
let (_, bounds) = font.measure_str("0", Some(&paint));
|
|
|
|
|
let font_width = bounds.width();
|
|
|
|
|
|
|
|
|
|
let (_, metrics) = font.metrics();
|
|
|
|
|
let font_height = metrics.descent - metrics.ascent; // bounds.height() * 1.68;
|
|
|
|
|
let cursor_pos = (0.0, 0.0);
|
|
|
|
|
|
|
|
|
|
let previous_frame_instant = Instant::now();
|
|
|
|
|
|
|
|
|
|
Renderer { editor, paint, font, shaper, font_width, font_height, cursor_pos, previous_frame_instant }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn draw_text(&mut self, canvas: &mut Canvas, text: &str, grid_pos: (u64, u64), style: &Style, default_colors: &Colors, update_cache: bool) {
|
|
|
|
|
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 + self.font_height - self.font_height * 0.2;
|
|
|
|
|
let top = y - self.font_height * 0.8;
|
|
|
|
|
let width = text.chars().count() as f32 * self.font_width;
|
|
|
|
|
let height = self.font_height;
|
|
|
|
|
let region = Rect::new(x, top, x + width, top + height);
|
|
|
|
|
paint.set_color(command.style.background(&default_colors).to_color());
|
|
|
|
|
canvas.draw_rect(region, &paint);
|
|
|
|
|
self.paint.set_color(style.background(default_colors).to_color());
|
|
|
|
|
canvas.draw_rect(region, &self.paint);
|
|
|
|
|
|
|
|
|
|
if command.style.underline || command.style.undercurl {
|
|
|
|
|
let (_, metrics) = font.metrics();
|
|
|
|
|
let width = command.text.chars().count() as f32 * font_width;
|
|
|
|
|
if style.underline || style.undercurl {
|
|
|
|
|
let (_, metrics) = self.font.metrics();
|
|
|
|
|
let width = text.chars().count() as f32 * self.font_width;
|
|
|
|
|
let underline_position = metrics.underline_position().unwrap();
|
|
|
|
|
|
|
|
|
|
paint.set_color(command.style.special(&default_colors).to_color());
|
|
|
|
|
canvas.draw_line((x, y + underline_position), (x + width, y + underline_position), &paint);
|
|
|
|
|
self.paint.set_color(style.special(&default_colors).to_color());
|
|
|
|
|
canvas.draw_line((x, y + underline_position), (x + width, y + underline_position), &self.paint);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
paint.set_color(command.style.foreground(&default_colors).to_color());
|
|
|
|
|
let text = command.text.trim_end();
|
|
|
|
|
canvas.draw_str(text, (x, y), &font, &paint);
|
|
|
|
|
// if text.len() > 0 {
|
|
|
|
|
// if let Some((blob, _)) = shaper.shape_text_blob(&text, font, false, 10000.0, Point::default()) {
|
|
|
|
|
// canvas.draw_text_blob(&blob, (x, top), &paint);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
self.paint.set_color(style.foreground(&default_colors).to_color());
|
|
|
|
|
let text = text.trim_end();
|
|
|
|
|
|
|
|
|
|
//canvas.draw_str(text, (x, y), &font, &paint);
|
|
|
|
|
if text.len() > 0 {
|
|
|
|
|
let reference;
|
|
|
|
|
let blob = if update_cache {
|
|
|
|
|
self.shaper.shape_cached(text.to_string(), &self.font)
|
|
|
|
|
} else {
|
|
|
|
|
reference = self.shaper.shape(text, &self.font);
|
|
|
|
|
&reference
|
|
|
|
|
};
|
|
|
|
|
canvas.draw_text_blob(blob, (x, top), &self.paint);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let (cursor_grid_x, cursor_grid_y) = cursor_grid_pos;
|
|
|
|
|
let target_cursor_x = cursor_grid_x as f32 * font_width;
|
|
|
|
|
let target_cursor_y = cursor_grid_y as f32 * font_height;
|
|
|
|
|
let (previous_cursor_x, previous_cursor_y) = cursor_pos;
|
|
|
|
|
pub fn draw(&mut self, canvas: &mut Canvas) {
|
|
|
|
|
let (draw_commands, default_colors, cursor_grid_pos, cursor_type, cursor_foreground, cursor_background, cursor_enabled) = {
|
|
|
|
|
let editor = self.editor.lock().unwrap();
|
|
|
|
|
(
|
|
|
|
|
editor.build_draw_commands().clone(),
|
|
|
|
|
editor.default_colors.clone(),
|
|
|
|
|
editor.cursor_pos.clone(),
|
|
|
|
|
editor.cursor_type.clone(),
|
|
|
|
|
editor.cursor_foreground(),
|
|
|
|
|
editor.cursor_background(),
|
|
|
|
|
editor.cursor_enabled
|
|
|
|
|
)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let cursor_x = (target_cursor_x - *previous_cursor_x) * 0.5 + *previous_cursor_x;
|
|
|
|
|
let cursor_y = (target_cursor_y - *previous_cursor_y) * 0.5 + *previous_cursor_y;
|
|
|
|
|
canvas.clear(default_colors.background.clone().unwrap().to_color());
|
|
|
|
|
|
|
|
|
|
*cursor_pos = (cursor_x, cursor_y);
|
|
|
|
|
if cursor_enabled {
|
|
|
|
|
let cursor_width = match cursor_type {
|
|
|
|
|
CursorType::Vertical => font_width / 8.0,
|
|
|
|
|
CursorType::Horizontal | CursorType::Block => font_width
|
|
|
|
|
};
|
|
|
|
|
let cursor_height = match cursor_type {
|
|
|
|
|
CursorType::Horizontal => font_width / 8.0,
|
|
|
|
|
CursorType::Vertical | CursorType::Block => font_height
|
|
|
|
|
};
|
|
|
|
|
let cursor = Rect::new(cursor_x, cursor_y, cursor_x + cursor_width, cursor_y + cursor_height);
|
|
|
|
|
paint.set_color(cursor_background.to_color());
|
|
|
|
|
canvas.draw_rect(cursor, &paint);
|
|
|
|
|
|
|
|
|
|
if let CursorType::Block = cursor_type {
|
|
|
|
|
paint.set_color(cursor_foreground.to_color());
|
|
|
|
|
let editor = editor.lock().unwrap();
|
|
|
|
|
let character = editor.grid[cursor_grid_y as usize][cursor_grid_x as usize].clone()
|
|
|
|
|
.map(|(character, _)| character)
|
|
|
|
|
.unwrap_or(' ');
|
|
|
|
|
let text_y = cursor_y + font_height - font_height * 0.2;
|
|
|
|
|
canvas.draw_str(character.to_string(), (cursor_x, text_y), &font, &paint);
|
|
|
|
|
for command in draw_commands {
|
|
|
|
|
self.draw_text(canvas, &command.text, command.grid_position, &command.style, &default_colors, true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn ui_loop(editor: Arc<Mutex<Editor>>) {
|
|
|
|
|
let shaper = Shaper::new(None);
|
|
|
|
|
let typeface = Typeface::new(FONT_NAME, FontStyle::default()).expect("Could not load font file.");
|
|
|
|
|
let font = Font::from_typeface(typeface, FONT_SIZE);
|
|
|
|
|
let mut paint = Paint::new(colors::WHITE, None);
|
|
|
|
|
let (cursor_grid_x, cursor_grid_y) = cursor_grid_pos;
|
|
|
|
|
let target_cursor_x = cursor_grid_x as f32 * self.font_width;
|
|
|
|
|
let target_cursor_y = cursor_grid_y as f32 * self.font_height;
|
|
|
|
|
let (previous_cursor_x, previous_cursor_y) = self.cursor_pos;
|
|
|
|
|
|
|
|
|
|
let cursor_x = (target_cursor_x - previous_cursor_x) * 0.5 + previous_cursor_x;
|
|
|
|
|
let cursor_y = (target_cursor_y - previous_cursor_y) * 0.5 + previous_cursor_y;
|
|
|
|
|
|
|
|
|
|
let (width, bounds) = font.measure_str("0", Some(&paint));
|
|
|
|
|
let font_width = width;
|
|
|
|
|
let font_height = bounds.height() * 1.68;
|
|
|
|
|
self.cursor_pos = (cursor_x, cursor_y);
|
|
|
|
|
if cursor_enabled {
|
|
|
|
|
let cursor_width = match cursor_type {
|
|
|
|
|
CursorType::Vertical => self.font_width / 8.0,
|
|
|
|
|
CursorType::Horizontal | CursorType::Block => self.font_width
|
|
|
|
|
};
|
|
|
|
|
let cursor_height = match cursor_type {
|
|
|
|
|
CursorType::Horizontal => self.font_width / 8.0,
|
|
|
|
|
CursorType::Vertical | CursorType::Block => self.font_height
|
|
|
|
|
};
|
|
|
|
|
let cursor = Rect::new(cursor_x, cursor_y, cursor_x + cursor_width, cursor_y + cursor_height);
|
|
|
|
|
self.paint.set_color(cursor_background.to_color());
|
|
|
|
|
canvas.draw_rect(cursor, &self.paint);
|
|
|
|
|
|
|
|
|
|
if let CursorType::Block = cursor_type {
|
|
|
|
|
self.paint.set_color(cursor_foreground.to_color());
|
|
|
|
|
let editor = self.editor.lock().unwrap();
|
|
|
|
|
let character = editor.grid[cursor_grid_y as usize][cursor_grid_x as usize].clone()
|
|
|
|
|
.map(|(character, _)| character)
|
|
|
|
|
.unwrap_or(' ');
|
|
|
|
|
let text_y = cursor_y + self.font_height - self.font_height * 0.2;
|
|
|
|
|
canvas.draw_text_blob(
|
|
|
|
|
self.shaper.shape_cached(character.to_string(), &self.font),
|
|
|
|
|
(cursor_x, text_y), &self.paint);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn ui_loop(editor: Arc<Mutex<Editor>>, nvim: Neovim, initial_size: (u64, u64)) {
|
|
|
|
|
let mut nvim = nvim;
|
|
|
|
|
let mut renderer = Renderer::new(editor);
|
|
|
|
|
let event_loop = EventLoop::<()>::with_user_event();
|
|
|
|
|
let logical_size = LogicalSize::new((100.0 * font_width) as f64, (50.0 * font_height) as f64);
|
|
|
|
|
|
|
|
|
|
let (width, height) = initial_size;
|
|
|
|
|
let logical_size = LogicalSize::new(
|
|
|
|
|
(width as f32 * renderer.font_width) as f64,
|
|
|
|
|
// Add 1.0 here to make sure resizing horizontally doesn't change the grid height
|
|
|
|
|
(height as f32 * renderer.font_height + 1.0) as f64
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let window = WindowBuilder::new()
|
|
|
|
|
.with_title("Neovide")
|
|
|
|
|
@ -127,13 +191,11 @@ pub fn ui_loop(editor: Arc<Mutex<Editor>>) {
|
|
|
|
|
.build(&event_loop)
|
|
|
|
|
.expect("Failed to create window");
|
|
|
|
|
|
|
|
|
|
let mut renderer = RendererBuilder::new()
|
|
|
|
|
let mut skulpin_renderer = RendererBuilder::new()
|
|
|
|
|
.coordinate_system(CoordinateSystem::Logical)
|
|
|
|
|
.prefer_mailbox_present_mode()
|
|
|
|
|
.build(&window)
|
|
|
|
|
.expect("Failed to create renderer");
|
|
|
|
|
|
|
|
|
|
let mut cursor_pos = (0.0, 0.0);
|
|
|
|
|
let mut mouse_down = false;
|
|
|
|
|
let mut mouse_pos = (0, 0);
|
|
|
|
|
|
|
|
|
|
@ -151,10 +213,9 @@ pub fn ui_loop(editor: Arc<Mutex<Editor>>) {
|
|
|
|
|
..
|
|
|
|
|
} => {
|
|
|
|
|
if new_size.width > 0.0 && new_size.height > 0.0 {
|
|
|
|
|
editor.lock().unwrap().resize(
|
|
|
|
|
(new_size.width as f32 / font_width) as u64,
|
|
|
|
|
(new_size.height as f32 / font_height) as u64
|
|
|
|
|
)
|
|
|
|
|
let new_width = (new_size.width as f32 / renderer.font_width) as u64;
|
|
|
|
|
let new_height = (new_size.height as f32 / renderer.font_height) as u64;
|
|
|
|
|
nvim.ui_try_resize(new_width as i64, new_height as i64).expect("Resize failed");
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
@ -166,7 +227,7 @@ pub fn ui_loop(editor: Arc<Mutex<Editor>>) {
|
|
|
|
|
..
|
|
|
|
|
} => {
|
|
|
|
|
if let Some(string) = construct_keybinding_string(input) {
|
|
|
|
|
editor.lock().unwrap().nvim.input(&string).expect("Input call failed...");
|
|
|
|
|
nvim.input(&string).expect("Input call failed...");
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
@ -177,11 +238,11 @@ pub fn ui_loop(editor: Arc<Mutex<Editor>>) {
|
|
|
|
|
},
|
|
|
|
|
..
|
|
|
|
|
} => {
|
|
|
|
|
let grid_x = (position.x as f32 / font_width) as i64;
|
|
|
|
|
let grid_y = (position.y as f32 / font_height) as i64;
|
|
|
|
|
let grid_x = (position.x as f32 / renderer.font_width) as i64;
|
|
|
|
|
let grid_y = (position.y as f32 / renderer.font_height) as i64;
|
|
|
|
|
mouse_pos = (grid_x, grid_y);
|
|
|
|
|
if mouse_down {
|
|
|
|
|
editor.lock().unwrap().nvim.input_mouse("left", "drag", "", 0, grid_y, grid_x);
|
|
|
|
|
nvim.input_mouse("left", "drag", "", 0, grid_y, grid_x).expect("Could not send mouse input");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -203,7 +264,7 @@ pub fn ui_loop(editor: Arc<Mutex<Editor>>) {
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
let (grid_x, grid_y) = mouse_pos;
|
|
|
|
|
editor.lock().unwrap().nvim.input_mouse("left", input_type, "", 0, grid_y, grid_x);
|
|
|
|
|
nvim.input_mouse("left", input_type, "", 0, grid_y, grid_x).expect("Could not send mouse input");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Event::WindowEvent {
|
|
|
|
|
@ -219,7 +280,7 @@ pub fn ui_loop(editor: Arc<Mutex<Editor>>) {
|
|
|
|
|
"down"
|
|
|
|
|
};
|
|
|
|
|
let (grid_x, grid_y) = mouse_pos;
|
|
|
|
|
editor.lock().unwrap().nvim.input_mouse("wheel", input_type, "", 0, grid_y, grid_x);
|
|
|
|
|
nvim.input_mouse("wheel", input_type, "", 0, grid_y, grid_x).expect("Could not send mouse input");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Event::EventsCleared => {
|
|
|
|
|
@ -230,8 +291,8 @@ pub fn ui_loop(editor: Arc<Mutex<Editor>>) {
|
|
|
|
|
event: WindowEvent::RedrawRequested,
|
|
|
|
|
..
|
|
|
|
|
} => {
|
|
|
|
|
if let Err(e) = renderer.draw(&window, |canvas, _coordinate_system_helper| {
|
|
|
|
|
draw(&editor, canvas, &mut cursor_pos, &shaper, &mut paint, &font, font_width, font_height);
|
|
|
|
|
if let Err(e) = skulpin_renderer.draw(&window, |canvas, _coordinate_system_helper| {
|
|
|
|
|
renderer.draw(canvas);
|
|
|
|
|
}) {
|
|
|
|
|
println!("Error during draw: {:?}", e);
|
|
|
|
|
*control_flow = ControlFlow::Exit
|
|
|
|
|
|
keith
5 years ago