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

Show selection

Browse source
This commit is contained in:
Jeremy Soller 2023-12-21 21:37:39 -07:00
parent 6cad69b414
commit c2fb3573d5
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/terminal.rs
View file

@ -271,8 +271,8 @@ impl Terminal {
let mut text = String::new(); let mut text = String::new();
let mut attrs_list = AttrsList::new(self.default_attrs); let mut attrs_list = AttrsList::new(self.default_attrs);
{ {
let term_guard = self.term.lock(); let term = self.term.lock();
let grid = term_guard.grid(); let grid = term.grid();
for indexed in grid.display_iter() { for indexed in grid.display_iter() {
if indexed.point.line != last_point.unwrap_or(indexed.point).line { if indexed.point.line != last_point.unwrap_or(indexed.point).line {
while line_i >= buffer.lines.len() { while line_i >= buffer.lines.len() {
@ -312,10 +312,23 @@ impl Terminal {
let mut attrs = self.default_attrs; let mut attrs = self.default_attrs;
let mut fg = convert_color(&self.colors, indexed.cell.fg); let mut fg = convert_color(&self.colors, indexed.cell.fg);
let mut bg = convert_color(&self.colors, indexed.cell.bg); let mut bg = convert_color(&self.colors, indexed.cell.bg);
//TODO: better handling of cursor
// Change color if cursor
if indexed.point == grid.cursor.point { if indexed.point == grid.cursor.point {
//TODO: better handling of cursor
mem::swap(&mut fg, &mut bg); mem::swap(&mut fg, &mut bg);
} }
// Change color if selected
if let Some(selection) = &term.selection {
if let Some(range) = selection.to_range(&term) {
if range.contains(indexed.point) {
//TODO: better handling of selection
mem::swap(&mut fg, &mut bg);
}
}
}
attrs = attrs.color(fg); attrs = attrs.color(fg);
// Use metadata as background color // Use metadata as background color
attrs = attrs.metadata(bg.0 as usize); attrs = attrs.metadata(bg.0 as usize);

4
src/terminal_box.rs
View file

@ -308,7 +308,7 @@ where
) -> Status { ) -> Status {
let state = tree.state.downcast_mut::<State>(); let state = tree.state.downcast_mut::<State>();
let scrollbar_rect = state.scrollbar_rect.get(); let scrollbar_rect = state.scrollbar_rect.get();
let terminal = self.terminal.lock().unwrap(); let mut terminal = self.terminal.lock().unwrap();
let buffer_size = terminal.with_buffer(|buffer| buffer.size()); let buffer_size = terminal.with_buffer(|buffer| buffer.size());
let mut status = Status::Ignored; let mut status = Status::Ignored;
@ -483,6 +483,7 @@ where
let mut term = terminal.term.lock(); let mut term = terminal.term.lock();
term.selection = Some(selection); term.selection = Some(selection);
} }
terminal.update();
state.click = Some((click_kind, Instant::now())); state.click = Some((click_kind, Instant::now()));
state.dragging = Some(Dragging::Buffer); state.dragging = Some(Dragging::Buffer);
} else if scrollbar_rect.contains(Point::new(x, y)) { } else if scrollbar_rect.contains(Point::new(x, y)) {
@ -549,6 +550,7 @@ where
selection.update(location, side); selection.update(location, side);
} }
} }
terminal.update();
} }
Dragging::Scrollbar { Dragging::Scrollbar {
start_y, start_y,