leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update cosmic-text

Browse source
This commit is contained in:
Jeremy Soller 2023-12-19 12:07:45 -07:00
parent e706e44e0c
commit 83bf38f899
4 changed files with 158 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/main.rs
View file

@ -483,7 +483,7 @@ impl App {
Some(tab) => {
if let Tab::Editor(inner) = tab {
// Force redraw on tab switches
inner.editor.lock().unwrap().buffer_mut().set_redraw(true);
inner.editor.lock().unwrap().set_redraw(true);
}
tab.title()
}
@ -503,18 +503,18 @@ impl App {
match self.active_tab() {
Some(Tab::Editor(tab)) => {
let editor = tab.editor.lock().unwrap();
let buffer = editor.buffer();
line_count = buffer.lines.len();
for line in buffer.lines.iter() {
//TODO: do graphemes?
for c in line.text().chars() {
character_count += 1;
if !c.is_whitespace() {
character_count_no_spaces += 1;
editor.with_buffer(|buffer| {
line_count = buffer.lines.len();
for line in buffer.lines.iter() {
//TODO: do graphemes?
for c in line.text().chars() {
character_count += 1;
if !c.is_whitespace() {
character_count_no_spaces += 1;
}
}
}
}
});
}
_ => {}
}
@ -1134,9 +1134,11 @@ impl Application for App {
self.tab_model.data_mut::<Tab>(entity)
{
let mut editor = tab.editor.lock().unwrap();
for line in editor.buffer_mut().lines.iter_mut() {
line.reset();
}
editor.with_buffer_mut(|buffer| {
for line in buffer.lines.iter_mut() {
line.reset();
}
});
}
}
@ -1465,10 +1467,12 @@ impl Application for App {
editor.set_cursor(Cursor::new(0, 0));
// Set selection end to highest possible value
let buffer = editor.buffer();
let last_line = buffer.lines.len().saturating_sub(1);
let last_index = buffer.lines[last_line].text().len();
editor.set_selection(Selection::Normal(Cursor::new(last_line, last_index)));
let selection = editor.with_buffer(|buffer| {
let last_line = buffer.lines.len().saturating_sub(1);
let last_index = buffer.lines[last_line].text().len();
Selection::Normal(Cursor::new(last_line, last_index))
});
editor.set_selection(selection);
}
_ => {}
}
@ -1629,7 +1633,7 @@ impl Application for App {
for entity in entities {
if let Some(Tab::Editor(tab)) = self.tab_model.data_mut::<Tab>(entity) {
let mut editor = tab.editor.lock().unwrap();
editor.buffer_mut().set_redraw(true);
editor.set_redraw(true);
}
}

35
src/tab.rs
View file

@ -6,7 +6,11 @@ use cosmic::{
};
use cosmic_text::{Attrs, Buffer, Edit, Shaping, SyntaxEditor, ViEditor, Wrap};
use notify::Watcher;
use std::{fs, path::PathBuf, sync::Mutex};
use std::{
fs,
path::PathBuf,
sync::{Arc, Mutex},
};
use crate::{fl, git::GitDiff, mime_icon, Config, FALLBACK_MIME_ICON, FONT_SYSTEM, SYNTAX_SYSTEM};
@ -32,7 +36,7 @@ pub struct GitDiffTab {
pub struct EditorTab {
pub path_opt: Option<PathBuf>,
attrs: Attrs<'static>,
pub editor: Mutex<ViEditor<'static>>,
pub editor: Mutex<ViEditor<'static, 'static>>,
pub context_menu: Option<Point>,
}
@ -49,7 +53,8 @@ impl EditorTab {
Shaping::Advanced,
);
let editor = SyntaxEditor::new(buffer, &SYNTAX_SYSTEM, config.syntax_theme()).unwrap();
let editor =
SyntaxEditor::new(Arc::new(buffer), &SYNTAX_SYSTEM, config.syntax_theme()).unwrap();
let mut tab = Self {
path_opt: None,
@ -71,10 +76,12 @@ impl EditorTab {
editor.set_auto_indent(config.auto_indent);
editor.set_passthrough(!config.vim_bindings);
editor.set_tab_width(config.tab_width);
editor.buffer_mut().set_wrap(if config.word_wrap {
Wrap::Word
} else {
Wrap::None
editor.with_buffer_mut(|buffer| {
buffer.set_wrap(if config.word_wrap {
Wrap::Word
} else {
Wrap::None
})
});
//TODO: dynamically discover light/dark changes
editor.update_theme(config.syntax_theme());
@ -108,7 +115,7 @@ impl EditorTab {
let mut editor = editor.borrow_with(&mut font_system);
if let Some(path) = &self.path_opt {
// Save scroll
let scroll = editor.buffer().scroll();
let scroll = editor.with_buffer(|buffer| buffer.scroll());
//TODO: save/restore more?
match editor.load_text(path, self.attrs) {
@ -121,7 +128,7 @@ impl EditorTab {
}
// Restore scroll
editor.buffer_mut().set_scroll(scroll);
editor.with_buffer_mut(|buffer| buffer.set_scroll(scroll));
} else {
log::warn!("tried to reload with no path");
}
@ -131,10 +138,12 @@ impl EditorTab {
if let Some(path) = &self.path_opt {
let mut editor = self.editor.lock().unwrap();
let mut text = String::new();
for line in editor.buffer().lines.iter() {
text.push_str(line.text());
text.push('\n');
}
editor.with_buffer(|buffer| {
for line in buffer.lines.iter() {
text.push_str(line.text());
text.push('\n');
}
});
match fs::write(path, text) {
Ok(()) => {
editor.set_changed(false);

128
src/text_box.rs
View file

@ -27,7 +27,7 @@ use std::{
use crate::{line_number::LineNumberKey, FONT_SYSTEM, LINE_NUMBER_CACHE, SWASH_CACHE};
pub struct TextBox<'a, Message> {
editor: &'a Mutex<ViEditor<'static>>,
editor: &'a Mutex<ViEditor<'static, 'static>>,
metrics: Metrics,
padding: Padding,
on_changed: Option<Message>,
@ -41,7 +41,7 @@ impl<'a, Message> TextBox<'a, Message>
where
Message: Clone,
{
pub fn new(editor: &'a Mutex<ViEditor<'static>>, metrics: Metrics) -> Self {
pub fn new(editor: &'a Mutex<ViEditor<'static, 'static>>, metrics: Metrics) -> Self {
Self {
editor,
metrics,
@ -89,7 +89,7 @@ where
}
pub fn text_box<'a, Message>(
editor: &'a Mutex<ViEditor<'static>>,
editor: &'a Mutex<ViEditor<'static, 'static>>,
metrics: Metrics,
) -> TextBox<'a, Message>
where
@ -207,18 +207,20 @@ where
.borrow_with(&mut FONT_SYSTEM.lock().unwrap())
.shape_as_needed(true);
let mut layout_lines = 0;
for line in editor.buffer().lines.iter() {
match line.layout_opt() {
Some(layout) => layout_lines += layout.len(),
None => (),
editor.with_buffer(|buffer| {
let mut layout_lines = 0;
for line in buffer.lines.iter() {
match line.layout_opt() {
Some(layout) => layout_lines += layout.len(),
None => (),
}
}
}
let height = layout_lines as f32 * editor.buffer().metrics().line_height;
let size = Size::new(limits.max().width, height);
let height = layout_lines as f32 * buffer.metrics().line_height;
let size = Size::new(limits.max().width, height);
layout::Node::new(limits.resolve(size))
layout::Node::new(limits.resolve(size))
})
}
fn mouse_interaction(
@ -240,7 +242,7 @@ where
let editor_offset_x = state.editor_offset_x.get();
let scale_factor = state.scale_factor.get();
let editor = self.editor.lock().unwrap();
let buffer_size = editor.buffer().size();
let buffer_size = editor.with_buffer(|buffer| buffer.size());
let x_logical = p.x - self.padding.left;
let y_logical = p.y - self.padding.top;
@ -299,7 +301,7 @@ where
let (line_number_chars, editor_offset_x) = if self.line_numbers {
// Calculate number of characters needed in line number
let mut line_number_chars = 1;
let mut line_count = editor.buffer().lines.len();
let mut line_count = editor.with_buffer(|buffer| buffer.lines.len());
while line_count >= 10 {
line_count /= 10;
line_number_chars += 1;
@ -334,31 +336,33 @@ where
// Save editor offset in state
if state.editor_offset_x.replace(editor_offset_x) != editor_offset_x {
// Mark buffer as needing redraw if editor offset has changed
editor.buffer_mut().set_redraw(true);
editor.set_redraw(true);
}
// Set metrics and size
editor.buffer_mut().set_metrics_and_size(
&mut font_system,
metrics,
(image_w - editor_offset_x) as f32,
image_h as f32,
);
editor.with_buffer_mut(|buffer| {
buffer.set_metrics_and_size(
&mut font_system,
metrics,
(image_w - editor_offset_x) as f32,
image_h as f32,
)
});
// Shape and layout as needed
editor.shape_as_needed(&mut font_system, true);
let mut handle_opt = state.handle_opt.lock().unwrap();
if editor.buffer().redraw() || handle_opt.is_none() {
if editor.redraw() || handle_opt.is_none() {
// Draw to pixel buffer
let mut pixels = vec![0; image_w as usize * image_h as usize * 4];
let mut pixels_u8 = vec![0; image_w as usize * image_h as usize * 4];
{
let mut swash_cache = SWASH_CACHE.lock().unwrap();
let buffer = unsafe {
let pixels = unsafe {
std::slice::from_raw_parts_mut(
pixels.as_mut_ptr() as *mut u32,
pixels.len() / 4,
pixels_u8.as_mut_ptr() as *mut u32,
pixels_u8.len() / 4,
)
};
@ -381,7 +385,7 @@ where
// Ensure fill with gutter color
draw_rect(
buffer,
pixels,
image_w,
image_h,
0,
@ -393,10 +397,10 @@ where
// Draw line numbers
//TODO: move to cosmic-text?
{
editor.with_buffer(|buffer| {
let mut line_number_cache = LINE_NUMBER_CACHE.lock().unwrap();
let mut last_line_number = 0;
for run in editor.buffer().layout_runs() {
for run in buffer.layout_runs() {
let line_number = run.line_i.saturating_add(1);
if line_number == last_line_number {
// Skip duplicate lines
@ -434,7 +438,7 @@ where
gutter_foreground,
|x, y, color| {
draw_rect(
buffer,
pixels,
image_w,
image_h,
physical_glyph.x + x,
@ -448,13 +452,13 @@ where
}
}
}
}
});
}
// Draw editor
editor.draw(&mut font_system, &mut swash_cache, |x, y, w, h, color| {
draw_rect(
buffer,
pixels,
image_w,
image_h,
editor_offset_x + x,
@ -466,10 +470,10 @@ where
});
// Calculate scrollbar
{
editor.with_buffer(|buffer| {
let mut start_line_opt = None;
let mut end_line = 0;
for run in editor.buffer().layout_runs() {
for run in buffer.layout_runs() {
end_line = run.line_i;
if start_line_opt.is_none() {
start_line_opt = Some(end_line);
@ -477,7 +481,7 @@ where
}
let start_line = start_line_opt.unwrap_or(end_line);
let lines = editor.buffer().lines.len();
let lines = buffer.lines.len();
let start_y = (start_line * image_h as usize) / lines;
let end_y = ((end_line + 1) * image_h as usize) / lines;
@ -489,17 +493,17 @@ where
),
);
state.scrollbar_rect.set(rect);
}
});
}
// Clear redraw flag
editor.buffer_mut().set_redraw(false);
editor.set_redraw(false);
state.scale_factor.set(scale_factor);
*handle_opt = Some(image::Handle::from_pixels(
image_w as u32,
image_h as u32,
pixels,
pixels_u8,
));
}
@ -558,7 +562,7 @@ where
let scale_factor = state.scale_factor.get();
let scrollbar_rect = state.scrollbar_rect.get();
let mut editor = self.editor.lock().unwrap();
let buffer_size = editor.buffer().size();
let buffer_size = editor.with_buffer(|buffer| buffer.size());
let last_changed = editor.changed();
let mut font_system = FONT_SYSTEM.lock().unwrap();
let mut editor = editor.borrow_with(&mut font_system);
@ -681,21 +685,22 @@ where
} else if scrollbar_rect.contains(Point::new(x_logical, y_logical)) {
state.dragging = Some(Dragging::Scrollbar {
start_y: y,
start_scroll: editor.buffer().scroll(),
start_scroll: editor.with_buffer(|buffer| buffer.scroll()),
});
} else if x_logical >= scrollbar_rect.x
&& x_logical < (scrollbar_rect.x + scrollbar_rect.width)
{
let mut buffer = editor.buffer_mut();
let scroll_line =
((y / buffer.size().1) * buffer.lines.len() as f32) as i32;
buffer.set_scroll(Scroll::new(
scroll_line.try_into().unwrap_or_default(),
0,
));
state.dragging = Some(Dragging::Scrollbar {
start_y: y,
start_scroll: editor.buffer().scroll(),
editor.with_buffer_mut(|buffer| {
let scroll_line =
((y / buffer.size().1) * buffer.lines.len() as f32) as i32;
buffer.set_scroll(Scroll::new(
scroll_line.try_into().unwrap_or_default(),
0,
));
state.dragging = Some(Dragging::Scrollbar {
start_y: y,
start_scroll: buffer.scroll(),
});
});
}
}
@ -736,16 +741,17 @@ where
start_y,
start_scroll,
} => {
let mut buffer = editor.buffer_mut();
let scroll_offset = (((y - start_y) / buffer.size().1)
* buffer.lines.len() as f32)
as i32;
buffer.set_scroll(Scroll::new(
(start_scroll.line as i32 + scroll_offset)
.try_into()
.unwrap_or_default(),
0,
));
editor.with_buffer_mut(|buffer| {
let scroll_offset = (((y - start_y) / buffer.size().1)
* buffer.lines.len() as f32)
as i32;
buffer.set_scroll(Scroll::new(
(start_scroll.line as i32 + scroll_offset)
.try_into()
.unwrap_or_default(),
0,
));
});
}
}
}
@ -768,7 +774,7 @@ where
//TODO: this adjustment is just a guess!
state.scroll_pixels -= y * 6.0;
let mut lines = 0;
let metrics = editor.buffer().metrics();
let metrics = editor.with_buffer(|buffer| buffer.metrics());
while state.scroll_pixels <= -metrics.line_height {
lines -= 1;
state.scroll_pixels += metrics.line_height;