Mikayla created
crates/editor2/src/items.rs | 2
crates/editor2/src/selections_collection.rs | 3
crates/terminal2/src/terminal_settings.rs | 9
crates/terminal_view2/src/terminal_element.rs | 1946 ++++++++++----------
crates/theme2/src/default_colors.rs | 4
crates/theme2/src/one_themes.rs | 3
crates/theme2/src/styles/colors.rs | 1
7 files changed, 990 insertions(+), 978 deletions(-)
@@ -913,7 +913,7 @@ impl SearchableItem for Editor {
fn update_matches(&mut self, matches: Vec<Range<Anchor>>, cx: &mut ViewContext<Self>) {
self.highlight_background::<BufferSearchHighlights>(
matches,
- |theme| theme.title_bar_background, // todo: update theme
+ |theme| theme.search_match_background,
cx,
);
}
@@ -315,14 +315,11 @@ impl SelectionsCollection {
let line = display_map.layout_row(row, &text_layout_details);
- dbg!("****START COL****");
let start_col = line.closest_index_for_x(positions.start) as u32;
if start_col < line_len || (is_empty && positions.start == line.width) {
let start = DisplayPoint::new(row, start_col);
- dbg!("****END COL****");
let end_col = line.closest_index_for_x(positions.end) as u32;
let end = DisplayPoint::new(row, end_col);
- dbg!(start_col, end_col);
Some(Selection {
id: post_inc(&mut self.next_selection_id),
@@ -1,4 +1,4 @@
-use gpui::{AppContext, FontFeatures, Pixels};
+use gpui::{px, AbsoluteLength, AppContext, FontFeatures, Pixels};
use schemars::JsonSchema;
use serde_derive::{Deserialize, Serialize};
use std::{collections::HashMap, path::PathBuf};
@@ -114,12 +114,13 @@ pub enum TerminalLineHeight {
}
impl TerminalLineHeight {
- pub fn value(&self) -> f32 {
- match self {
+ pub fn value(&self) -> AbsoluteLength {
+ let value = match self {
TerminalLineHeight::Comfortable => 1.618,
TerminalLineHeight::Standard => 1.3,
TerminalLineHeight::Custom(line_height) => f32::max(*line_height, 1.),
- }
+ };
+ px(value).into()
}
}
@@ -1,970 +1,976 @@
-// #![allow(unused)] // todo!()
-
-// use editor::{Cursor, HighlightedRange, HighlightedRangeLine};
-// use gpui::{
-// point, transparent_black, AnyElement, AppContext, Bounds, Component, CursorStyle, Element,
-// ElementId, FontStyle, FontWeight, HighlightStyle, Hsla, IntoElement, IsZero, LayoutId,
-// ModelContext, Overlay, Pixels, Point, Quad, TextRun, TextStyle, TextSystem, Underline,
-// ViewContext, WeakModel, WindowContext,
-// };
-// use itertools::Itertools;
-// use language::CursorShape;
-// use ordered_float::OrderedFloat;
-// use settings::Settings;
-// use terminal::{
-// alacritty_terminal::{
-// ansi::{Color as AnsiColor, Color::Named, CursorShape as AlacCursorShape, NamedColor},
-// grid::Dimensions,
-// index::Point as AlacPoint,
-// term::{cell::Flags, TermMode},
-// },
-// terminal_settings::TerminalSettings,
-// IndexedCell, Terminal, TerminalContent, TerminalSize,
-// };
-// use theme::ThemeSettings;
-
-// use std::mem;
-// use std::{fmt::Debug, ops::RangeInclusive};
-
-// use crate::TerminalView;
-
-// ///The information generated during layout that is necessary for painting
-// pub struct LayoutState {
-// cells: Vec<LayoutCell>,
-// rects: Vec<LayoutRect>,
-// relative_highlighted_ranges: Vec<(RangeInclusive<AlacPoint>, Hsla)>,
-// cursor: Option<Cursor>,
-// background_color: Hsla,
-// size: TerminalSize,
-// mode: TermMode,
-// display_offset: usize,
-// hyperlink_tooltip: Option<AnyElement>,
-// gutter: f32,
-// }
-
-// ///Helper struct for converting data between alacritty's cursor points, and displayed cursor points
-// struct DisplayCursor {
-// line: i32,
-// col: usize,
-// }
-
-// impl DisplayCursor {
-// fn from(cursor_point: AlacPoint, display_offset: usize) -> Self {
-// Self {
-// line: cursor_point.line.0 + display_offset as i32,
-// col: cursor_point.column.0,
-// }
-// }
-
-// pub fn line(&self) -> i32 {
-// self.line
-// }
-
-// pub fn col(&self) -> usize {
-// self.col
-// }
-// }
-
-// #[derive(Clone, Debug, Default)]
-// struct LayoutCell {
-// point: AlacPoint<i32, i32>,
-// text: Line,
-// }
-
-// impl LayoutCell {
-// fn new(point: AlacPoint<i32, i32>, text: Line) -> LayoutCell {
-// LayoutCell { point, text }
-// }
-
-// fn paint(
-// &self,
-// origin: Point<Pixels>,
-// layout: &LayoutState,
-// _visible_bounds: Bounds<Pixels>,
-// _view: &mut TerminalView,
-// cx: &mut WindowContext,
-// ) {
-// let pos = {
-// let point = self.point;
-
-// Point::new(
-// (origin.x + point.column as f32 * layout.size.cell_width).floor(),
-// origin.y + point.line as f32 * layout.size.line_height,
-// )
-// };
-
-// self.text.paint(pos, layout.size.line_height, cx);
-// }
-// }
-
-// #[derive(Clone, Debug, Default)]
-// struct LayoutRect {
-// point: AlacPoint<i32, i32>,
-// num_of_cells: usize,
-// color: Hsla,
-// }
-
-// impl LayoutRect {
-// fn new(point: AlacPoint<i32, i32>, num_of_cells: usize, color: Hsla) -> LayoutRect {
-// LayoutRect {
-// point,
-// num_of_cells,
-// color,
-// }
-// }
-
-// fn extend(&self) -> Self {
-// LayoutRect {
-// point: self.point,
-// num_of_cells: self.num_of_cells + 1,
-// color: self.color,
-// }
-// }
-
-// fn paint(
-// &self,
-// origin: Point<Pixels>,
-// layout: &LayoutState,
-// _view: &mut TerminalView,
-// cx: &mut ViewContext<TerminalView>,
-// ) {
-// let position = {
-// let alac_point = self.point;
-// point(
-// (origin.x + alac_point.column as f32 * layout.size.cell_width).floor(),
-// origin.y + alac_point.line as f32 * layout.size.line_height,
-// )
-// };
-// let size = point(
-// (layout.size.cell_width * self.num_of_cells as f32).ceil(),
-// layout.size.line_height,
-// )
-// .into();
-
-// cx.paint_quad(
-// Bounds::new(position, size),
-// Default::default(),
-// self.color,
-// Default::default(),
-// transparent_black(),
-// );
-// }
-// }
-
-// ///The GPUI element that paints the terminal.
-// ///We need to keep a reference to the view for mouse events, do we need it for any other terminal stuff, or can we move that to connection?
-// pub struct TerminalElement {
-// terminal: WeakModel<Terminal>,
-// focused: bool,
-// cursor_visible: bool,
-// can_navigate_to_selected_word: bool,
-// }
-
-// impl TerminalElement {
-// pub fn new(
-// terminal: WeakModel<Terminal>,
-// focused: bool,
-// cursor_visible: bool,
-// can_navigate_to_selected_word: bool,
-// ) -> TerminalElement {
-// TerminalElement {
-// terminal,
-// focused,
-// cursor_visible,
-// can_navigate_to_selected_word,
-// }
-// }
-
-// //Vec<Range<AlacPoint>> -> Clip out the parts of the ranges
-
-// fn layout_grid(
-// grid: &Vec<IndexedCell>,
-// text_style: &TextStyle,
-// terminal_theme: &TerminalStyle,
-// text_system: &TextSystem,
-// hyperlink: Option<(HighlightStyle, &RangeInclusive<AlacPoint>)>,
-// cx: &mut WindowContext<'_>,
-// ) -> (Vec<LayoutCell>, Vec<LayoutRect>) {
-// let mut cells = vec![];
-// let mut rects = vec![];
-
-// let mut cur_rect: Option<LayoutRect> = None;
-// let mut cur_alac_color = None;
-
-// let linegroups = grid.into_iter().group_by(|i| i.point.line);
-// for (line_index, (_, line)) in linegroups.into_iter().enumerate() {
-// for cell in line {
-// let mut fg = cell.fg;
-// let mut bg = cell.bg;
-// if cell.flags.contains(Flags::INVERSE) {
-// mem::swap(&mut fg, &mut bg);
-// }
-
-// //Expand background rect range
-// {
-// if matches!(bg, Named(NamedColor::Background)) {
-// //Continue to next cell, resetting variables if necessary
-// cur_alac_color = None;
-// if let Some(rect) = cur_rect {
-// rects.push(rect);
-// cur_rect = None
-// }
-// } else {
-// match cur_alac_color {
-// Some(cur_color) => {
-// if bg == cur_color {
-// cur_rect = cur_rect.take().map(|rect| rect.extend());
-// } else {
-// cur_alac_color = Some(bg);
-// if cur_rect.is_some() {
-// rects.push(cur_rect.take().unwrap());
-// }
-// cur_rect = Some(LayoutRect::new(
-// AlacPoint::new(
-// line_index as i32,
-// cell.point.column.0 as i32,
-// ),
-// 1,
-// convert_color(&bg, &terminal_theme),
-// ));
-// }
-// }
-// None => {
-// cur_alac_color = Some(bg);
-// cur_rect = Some(LayoutRect::new(
-// AlacPoint::new(line_index as i32, cell.point.column.0 as i32),
-// 1,
-// convert_color(&bg, &terminal_theme),
-// ));
-// }
-// }
-// }
-// }
-
-// //Layout current cell text
-// {
-// let cell_text = &cell.c.to_string();
-// if !is_blank(&cell) {
-// let cell_style = TerminalElement::cell_style(
-// &cell,
-// fg,
-// terminal_theme,
-// text_style,
-// text_system,
-// hyperlink,
-// );
-
-// let layout_cell = text_system.layout_line(
-// cell_text,
-// text_style.font_size.to_pixels(cx.rem_size()),
-// &[(cell_text.len(), cell_style)],
-// )?;
-
-// cells.push(LayoutCell::new(
-// AlacPoint::new(line_index as i32, cell.point.column.0 as i32),
-// layout_cell,
-// ))
-// };
-// }
-// }
-
-// if cur_rect.is_some() {
-// rects.push(cur_rect.take().unwrap());
-// }
-// }
-// (cells, rects)
-// }
-
-// // Compute the cursor position and expected block width, may return a zero width if x_for_index returns
-// // the same position for sequential indexes. Use em_width instead
-// fn shape_cursor(
-// cursor_point: DisplayCursor,
-// size: TerminalSize,
-// text_fragment: &Line,
-// ) -> Option<(Point<Pixels>, Pixels)> {
-// if cursor_point.line() < size.total_lines() as i32 {
-// let cursor_width = if text_fragment.width == Pixels::ZERO {
-// size.cell_width()
-// } else {
-// text_fragment.width
-// };
-
-// //Cursor should always surround as much of the text as possible,
-// //hence when on pixel boundaries round the origin down and the width up
-// Some((
-// point(
-// (cursor_point.col() as f32 * size.cell_width()).floor(),
-// (cursor_point.line() as f32 * size.line_height()).floor(),
-// ),
-// cursor_width.ceil(),
-// ))
-// } else {
-// None
-// }
-// }
-
-// ///Convert the Alacritty cell styles to GPUI text styles and background color
-// fn cell_style(
-// indexed: &IndexedCell,
-// fg: terminal::alacritty_terminal::ansi::Color,
-// style: &TerminalStyle,
-// text_style: &TextStyle,
-// text_system: &TextSystem,
-// hyperlink: Option<(HighlightStyle, &RangeInclusive<AlacPoint>)>,
-// ) -> TextRun {
-// let flags = indexed.cell.flags;
-// let fg = convert_color(&fg, &style);
-
-// let mut underline = flags
-// .intersects(Flags::ALL_UNDERLINES)
-// .then(|| Underline {
-// color: fg,
-// thickness: Pixels::from(1.0).scale(1.0),
-// order: todo!(),
-// bounds: todo!(),
-// content_mask: todo!(),
-// wavy: flags.contains(Flags::UNDERCURL),
-// })
-// .unwrap_or_default();
-
-// if indexed.cell.hyperlink().is_some() {
-// if underline.thickness.is_zero() {
-// underline.thickness = Pixels::from(1.0).scale(1.0);
-// }
-// }
-
-// let mut properties = Properties::new();
-// if indexed.flags.intersects(Flags::BOLD | Flags::DIM_BOLD) {
-// properties = *properties.weight(FontWeight::BOLD);
-// }
-// if indexed.flags.intersects(Flags::ITALIC) {
-// properties = *properties.style(FontStyle::Italic);
-// }
-
-// let font_id = text_system
-// .select_font(text_style.font_family, &properties)
-// .unwrap_or(text_style.font_id);
-
-// let mut result = TextRun {
-// color: fg,
-// font_id,
-// underline,
-// };
-
-// if let Some((style, range)) = hyperlink {
-// if range.contains(&indexed.point) {
-// if let Some(underline) = style.underline {
-// result.underline = Some(underline);
-// }
-
-// if let Some(color) = style.color {
-// result.color = color;
-// }
-// }
-// }
-
-// result
-// }
-
-// // todo!()
-// // fn generic_button_handler<E>(
-// // connection: WeakModel<Terminal>,
-// // origin: Point<Pixels>,
-// // f: impl Fn(&mut Terminal, Point<Pixels>, E, &mut ModelContext<Terminal>),
-// // ) -> impl Fn(E, &mut TerminalView, &mut EventContext<TerminalView>) {
-// // move |event, _: &mut TerminalView, cx| {
-// // cx.focus_parent();
-// // if let Some(conn_handle) = connection.upgrade() {
-// // conn_handle.update(cx, |terminal, cx| {
-// // f(terminal, origin, event, cx);
-
-// // cx.notify();
-// // })
-// // }
-// // }
-// // }
-
-// fn attach_mouse_handlers(
-// &self,
-// origin: Point<Pixels>,
-// visible_bounds: Bounds<Pixels>,
-// mode: TermMode,
-// cx: &mut ViewContext<TerminalView>,
-// ) {
-// // todo!()
-// // let connection = self.terminal;
-
-// // let mut region = MouseRegion::new::<Self>(cx.view_id(), 0, visible_bounds);
-
-// // // Terminal Emulator controlled behavior:
-// // region = region
-// // // Start selections
-// // .on_down(MouseButton::Left, move |event, v: &mut TerminalView, cx| {
-// // let terminal_view = cx.handle();
-// // cx.focus(&terminal_view);
-// // v.context_menu.update(cx, |menu, _cx| menu.delay_cancel());
-// // if let Some(conn_handle) = connection.upgrade() {
-// // conn_handle.update(cx, |terminal, cx| {
-// // terminal.mouse_down(&event, origin);
-
-// // cx.notify();
-// // })
-// // }
-// // })
-// // // Update drag selections
-// // .on_drag(MouseButton::Left, move |event, _: &mut TerminalView, cx| {
-// // if event.end {
-// // return;
-// // }
-
-// // if cx.is_self_focused() {
-// // if let Some(conn_handle) = connection.upgrade() {
-// // conn_handle.update(cx, |terminal, cx| {
-// // terminal.mouse_drag(event, origin);
-// // cx.notify();
-// // })
-// // }
-// // }
-// // })
-// // // Copy on up behavior
-// // .on_up(
-// // MouseButton::Left,
-// // TerminalElement::generic_button_handler(
-// // connection,
-// // origin,
-// // move |terminal, origin, e, cx| {
-// // terminal.mouse_up(&e, origin, cx);
-// // },
-// // ),
-// // )
-// // // Context menu
-// // .on_click(
-// // MouseButton::Right,
-// // move |event, view: &mut TerminalView, cx| {
-// // let mouse_mode = if let Some(conn_handle) = connection.upgrade() {
-// // conn_handle.update(cx, |terminal, _cx| terminal.mouse_mode(event.shift))
-// // } else {
-// // // If we can't get the model handle, probably can't deploy the context menu
-// // true
-// // };
-// // if !mouse_mode {
-// // view.deploy_context_menu(event.position, cx);
-// // }
-// // },
-// // )
-// // .on_move(move |event, _: &mut TerminalView, cx| {
-// // if cx.is_self_focused() {
-// // if let Some(conn_handle) = connection.upgrade() {
-// // conn_handle.update(cx, |terminal, cx| {
-// // terminal.mouse_move(&event, origin);
-// // cx.notify();
-// // })
-// // }
-// // }
-// // })
-// // .on_scroll(move |event, _: &mut TerminalView, cx| {
-// // if let Some(conn_handle) = connection.upgrade() {
-// // conn_handle.update(cx, |terminal, cx| {
-// // terminal.scroll_wheel(event, origin);
-// // cx.notify();
-// // })
-// // }
-// // });
-
-// // // Mouse mode handlers:
-// // // All mouse modes need the extra click handlers
-// // if mode.intersects(TermMode::MOUSE_MODE) {
-// // region = region
-// // .on_down(
-// // MouseButton::Right,
-// // TerminalElement::generic_button_handler(
-// // connection,
-// // origin,
-// // move |terminal, origin, e, _cx| {
-// // terminal.mouse_down(&e, origin);
-// // },
-// // ),
-// // )
-// // .on_down(
-// // MouseButton::Middle,
-// // TerminalElement::generic_button_handler(
-// // connection,
-// // origin,
-// // move |terminal, origin, e, _cx| {
-// // terminal.mouse_down(&e, origin);
-// // },
-// // ),
-// // )
-// // .on_up(
-// // MouseButton::Right,
-// // TerminalElement::generic_button_handler(
-// // connection,
-// // origin,
-// // move |terminal, origin, e, cx| {
-// // terminal.mouse_up(&e, origin, cx);
-// // },
-// // ),
-// // )
-// // .on_up(
-// // MouseButton::Middle,
-// // TerminalElement::generic_button_handler(
-// // connection,
-// // origin,
-// // move |terminal, origin, e, cx| {
-// // terminal.mouse_up(&e, origin, cx);
-// // },
-// // ),
-// // )
-// // }
-
-// // cx.scene().push_mouse_region(region);
-// }
-// }
-
-// impl Element for TerminalElement {
-// type State = LayoutState;
-
-// fn layout(
-// &mut self,
-// element_state: Option<Self::State>,
-// cx: &mut WindowContext<'_>,
-// ) -> (LayoutId, Self::State) {
-// let settings = ThemeSettings::get_global(cx);
-// let terminal_settings = TerminalSettings::get_global(cx);
-
-// //Setup layout information
-// let terminal_theme = settings.theme.terminal.clone(); //TODO: Try to minimize this clone.
-// let link_style = settings.theme.editor.link_definition;
-// let tooltip_style = settings.theme.tooltip.clone();
-
-// let text_system = cx.text_system();
-// let font_size = font_size(&terminal_settings, cx).unwrap_or(settings.buffer_font_size(cx));
-// let font_family_name = terminal_settings
-// .font_family
-// .as_ref()
-// .unwrap_or(&settings.buffer_font_family_name);
-// let font_features = terminal_settings
-// .font_features
-// .as_ref()
-// .unwrap_or(&settings.buffer_font_features);
-// let family_id = text_system
-// .load_family(&[font_family_name], &font_features)
-// .log_err()
-// .unwrap_or(settings.buffer_font_family);
-// let font_id = text_system
-// .select_font(family_id, &Default::default())
-// .unwrap();
-
-// let text_style = TextStyle {
-// color: settings.theme.editor.text_color,
-// font_family_id: family_id,
-// font_family_name: text_system.family_name(family_id).unwrap(),
-// font_id,
-// font_size,
-// font_properties: Default::default(),
-// underline: Default::default(),
-// soft_wrap: false,
-// font_family: todo!(),
-// font_features: todo!(),
-// line_height: todo!(),
-// font_weight: todo!(),
-// font_style: todo!(),
-// background_color: todo!(),
-// white_space: todo!(),
-// };
-// let selection_color = settings.theme.editor.selection.selection;
-// let match_color = settings.theme.search.match_background;
-// let gutter;
-// let dimensions = {
-// let line_height = text_style.font_size * terminal_settings.line_height.value();
-// let cell_width = text_system.em_advance(text_style.font_id, text_style.font_size);
-// gutter = cell_width;
-
-// let size = constraint.max - point(gutter, 0.);
-// TerminalSize::new(line_height, cell_width, size)
-// };
-
-// let search_matches = if let Some(terminal_model) = self.terminal.upgrade() {
-// terminal_model.read(cx).matches.clone()
-// } else {
-// Default::default()
-// };
-
-// let background_color = terminal_theme.background;
-// let terminal_handle = self.terminal.upgrade().unwrap();
-
-// let last_hovered_word = terminal_handle.update(cx, |terminal, cx| {
-// terminal.set_size(dimensions);
-// terminal.try_sync(cx);
-// if self.can_navigate_to_selected_word && terminal.can_navigate_to_selected_word() {
-// terminal.last_content.last_hovered_word.clone()
-// } else {
-// None
-// }
-// });
-
-// let hyperlink_tooltip = last_hovered_word.clone().map(|hovered_word| {
-// let mut tooltip = Overlay::new(
-// Empty::new()
-// .contained()
-// .constrained()
-// .with_width(dimensions.width())
-// .with_height(dimensions.height())
-// .with_tooltip::<TerminalElement>(
-// hovered_word.id,
-// hovered_word.word,
-// None,
-// tooltip_style,
-// cx,
-// ),
-// )
-// .with_position_mode(gpui::OverlayPositionMode::Local)
-// .into_any();
-
-// tooltip.layout(
-// SizeConstraint::new(Point::zero(), cx.window_size()),
-// view_state,
-// cx,
-// );
-// tooltip
-// });
-
-// let TerminalContent {
-// cells,
-// mode,
-// display_offset,
-// cursor_char,
-// selection,
-// cursor,
-// ..
-// } = { &terminal_handle.read(cx).last_content };
-
-// // searches, highlights to a single range representations
-// let mut relative_highlighted_ranges = Vec::new();
-// for search_match in search_matches {
-// relative_highlighted_ranges.push((search_match, match_color))
-// }
-// if let Some(selection) = selection {
-// relative_highlighted_ranges.push((selection.start..=selection.end, selection_color));
-// }
-
-// // then have that representation be converted to the appropriate highlight data structure
-
-// let (cells, rects) = TerminalElement::layout_grid(
-// cells,
-// &text_style,
-// &terminal_theme,
-// &cx.text_system(),
-// last_hovered_word
-// .as_ref()
-// .map(|last_hovered_word| (link_style, &last_hovered_word.word_match)),
-// cx,
-// );
-
-// //Layout cursor. Rectangle is used for IME, so we should lay it out even
-// //if we don't end up showing it.
-// let cursor = if let AlacCursorShape::Hidden = cursor.shape {
-// None
-// } else {
-// let cursor_point = DisplayCursor::from(cursor.point, *display_offset);
-// let cursor_text = {
-// let str_trxt = cursor_char.to_string();
-
-// let color = if self.focused {
-// terminal_theme.background
-// } else {
-// terminal_theme.foreground
-// };
-
-// cx.text_system().layout_line(
-// &str_trxt,
-// text_style.font_size,
-// &[(
-// str_trxt.len(),
-// TextRun {
-// font_id: text_style.font_id,
-// color,
-// underline: Default::default(),
-// },
-// )],
-// )?
-// };
-
-// let focused = self.focused;
-// TerminalElement::shape_cursor(cursor_point, dimensions, &cursor_text).map(
-// move |(cursor_position, block_width)| {
-// let (shape, text) = match cursor.shape {
-// AlacCursorShape::Block if !focused => (CursorShape::Hollow, None),
-// AlacCursorShape::Block => (CursorShape::Block, Some(cursor_text)),
-// AlacCursorShape::Underline => (CursorShape::Underscore, None),
-// AlacCursorShape::Beam => (CursorShape::Bar, None),
-// AlacCursorShape::HollowBlock => (CursorShape::Hollow, None),
-// //This case is handled in the if wrapping the whole cursor layout
-// AlacCursorShape::Hidden => unreachable!(),
-// };
-
-// Cursor::new(
-// cursor_position,
-// block_width,
-// dimensions.line_height,
-// terminal_theme.cursor,
-// shape,
-// text,
-// )
-// },
-// )
-// };
-
-// //Done!
-// (
-// constraint.max,
-// Self::State {
-// cells,
-// cursor,
-// background_color,
-// size: dimensions,
-// rects,
-// relative_highlighted_ranges,
-// mode: *mode,
-// display_offset: *display_offset,
-// hyperlink_tooltip,
-// gutter,
-// },
-// )
-// }
-
-// fn paint(
-// self,
-// bounds: Bounds<Pixels>,
-// element_state: &mut Self::State,
-// cx: &mut WindowContext<'_>,
-// ) {
-// // todo!()
-// // let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
-
-// // //Setup element stuff
-// // let clip_bounds = Some(visible_bounds);
-
-// // cx.paint_layer(clip_bounds, |cx| {
-// // let origin = bounds.origin + point(element_state.gutter, 0.);
-
-// // // Elements are ephemeral, only at paint time do we know what could be clicked by a mouse
-// // self.attach_mouse_handlers(origin, visible_bounds, element_state.mode, cx);
-
-// // cx.scene().push_cursor_region(gpui::CursorRegion {
-// // bounds,
-// // style: if element_state.hyperlink_tooltip.is_some() {
-// // CursorStyle::AlacPointingHand
-// // } else {
-// // CursorStyle::IBeam
-// // },
-// // });
-
-// // cx.paint_layer(clip_bounds, |cx| {
-// // //Start with a background color
-// // cx.scene().push_quad(Quad {
-// // bounds,
-// // background: Some(element_state.background_color),
-// // border: Default::default(),
-// // corner_radii: Default::default(),
-// // });
-
-// // for rect in &element_state.rects {
-// // rect.paint(origin, element_state, view_state, cx);
-// // }
-// // });
-
-// // //Draw Highlighted Backgrounds
-// // cx.paint_layer(clip_bounds, |cx| {
-// // for (relative_highlighted_range, color) in
-// // element_state.relative_highlighted_ranges.iter()
-// // {
-// // if let Some((start_y, highlighted_range_lines)) = to_highlighted_range_lines(
-// // relative_highlighted_range,
-// // element_state,
-// // origin,
-// // ) {
-// // let hr = HighlightedRange {
-// // start_y, //Need to change this
-// // line_height: element_state.size.line_height,
-// // lines: highlighted_range_lines,
-// // color: color.clone(),
-// // //Copied from editor. TODO: move to theme or something
-// // corner_radius: 0.15 * element_state.size.line_height,
-// // };
-// // hr.paint(bounds, cx);
-// // }
-// // }
-// // });
-
-// // //Draw the text cells
-// // cx.paint_layer(clip_bounds, |cx| {
-// // for cell in &element_state.cells {
-// // cell.paint(origin, element_state, visible_bounds, view_state, cx);
-// // }
-// // });
-
-// // //Draw cursor
-// // if self.cursor_visible {
-// // if let Some(cursor) = &element_state.cursor {
-// // cx.paint_layer(clip_bounds, |cx| {
-// // cursor.paint(origin, cx);
-// // })
-// // }
-// // }
-
-// // if let Some(element) = &mut element_state.hyperlink_tooltip {
-// // element.paint(origin, visible_bounds, view_state, cx)
-// // }
-// // });
-// }
-
-// // todo!() remove?
-// // fn metadata(&self) -> Option<&dyn std::any::Any> {
-// // None
-// // }
-
-// // fn debug(
-// // &self,
-// // _: Bounds<Pixels>,
-// // _: &Self::State,
-// // _: &Self::PaintState,
-// // _: &TerminalView,
-// // _: &gpui::ViewContext<TerminalView>,
-// // ) -> gpui::serde_json::Value {
-// // json!({
-// // "type": "TerminalElement",
-// // })
-// // }
-
-// // fn rect_for_text_range(
-// // &self,
-// // _: Range<usize>,
-// // bounds: Bounds<Pixels>,
-// // _: Bounds<Pixels>,
-// // layout: &Self::State,
-// // _: &Self::PaintState,
-// // _: &TerminalView,
-// // _: &gpui::ViewContext<TerminalView>,
-// // ) -> Option<Bounds<Pixels>> {
-// // // Use the same origin that's passed to `Cursor::paint` in the paint
-// // // method bove.
-// // let mut origin = bounds.origin() + point(layout.size.cell_width, 0.);
-
-// // // TODO - Why is it necessary to move downward one line to get correct
-// // // positioning? I would think that we'd want the same rect that is
-// // // painted for the cursor.
-// // origin += point(0., layout.size.line_height);
-
-// // Some(layout.cursor.as_ref()?.bounding_rect(origin))
-// // }
-// }
-
-// impl IntoElement for TerminalElement {
-// type Element = Self;
-
-// fn element_id(&self) -> Option<ElementId> {
-// todo!()
-// }
-
-// fn into_element(self) -> Self::Element {
-// self
-// }
-// }
-
-// fn is_blank(cell: &IndexedCell) -> bool {
-// if cell.c != ' ' {
-// return false;
-// }
-
-// if cell.bg != AnsiColor::Named(NamedColor::Background) {
-// return false;
-// }
-
-// if cell.hyperlink().is_some() {
-// return false;
-// }
-
-// if cell
-// .flags
-// .intersects(Flags::ALL_UNDERLINES | Flags::INVERSE | Flags::STRIKEOUT)
-// {
-// return false;
-// }
-
-// return true;
-// }
-
-// fn to_highlighted_range_lines(
-// range: &RangeInclusive<AlacPoint>,
-// layout: &LayoutState,
-// origin: Point<Pixels>,
-// ) -> Option<(Pixels, Vec<HighlightedRangeLine>)> {
-// // Step 1. Normalize the points to be viewport relative.
-// // When display_offset = 1, here's how the grid is arranged:
-// //-2,0 -2,1...
-// //--- Viewport top
-// //-1,0 -1,1...
-// //--------- Terminal Top
-// // 0,0 0,1...
-// // 1,0 1,1...
-// //--- Viewport Bottom
-// // 2,0 2,1...
-// //--------- Terminal Bottom
-
-// // Normalize to viewport relative, from terminal relative.
-// // lines are i32s, which are negative above the top left corner of the terminal
-// // If the user has scrolled, we use the display_offset to tell us which offset
-// // of the grid data we should be looking at. But for the rendering step, we don't
-// // want negatives. We want things relative to the 'viewport' (the area of the grid
-// // which is currently shown according to the display offset)
-// let unclamped_start = AlacPoint::new(
-// range.start().line + layout.display_offset,
-// range.start().column,
-// );
-// let unclamped_end =
-// AlacPoint::new(range.end().line + layout.display_offset, range.end().column);
-
-// // Step 2. Clamp range to viewport, and return None if it doesn't overlap
-// if unclamped_end.line.0 < 0 || unclamped_start.line.0 > layout.size.num_lines() as i32 {
-// return None;
-// }
-
-// let clamped_start_line = unclamped_start.line.0.max(0) as usize;
-// let clamped_end_line = unclamped_end.line.0.min(layout.size.num_lines() as i32) as usize;
-// //Convert the start of the range to pixels
-// let start_y = origin.y + clamped_start_line as f32 * layout.size.line_height;
-
-// // Step 3. Expand ranges that cross lines into a collection of single-line ranges.
-// // (also convert to pixels)
-// let mut highlighted_range_lines = Vec::new();
-// for line in clamped_start_line..=clamped_end_line {
-// let mut line_start = 0;
-// let mut line_end = layout.size.columns();
-
-// if line == clamped_start_line {
-// line_start = unclamped_start.column.0 as usize;
-// }
-// if line == clamped_end_line {
-// line_end = unclamped_end.column.0 as usize + 1; //+1 for inclusive
-// }
-
-// highlighted_range_lines.push(HighlightedRangeLine {
-// start_x: origin.x + line_start as f32 * layout.size.cell_width,
-// end_x: origin.x + line_end as f32 * layout.size.cell_width,
-// });
-// }
-
-// Some((start_y, highlighted_range_lines))
-// }
-
-// fn font_size(terminal_settings: &TerminalSettings, cx: &mut AppContext) -> Option<Pixels> {
-// terminal_settings
-// .font_size
-// .map(|size| theme::adjusted_font_size(size, cx))
-// }
-
-// // mappings::colors::convert_color
-// fn convert_color(fg: &terminal::alacritty_terminal::ansi::Color, style: &TerminalStyle) -> Hsla {
-// todo!()
-// }
+use editor::{Cursor, HighlightedRange, HighlightedRangeLine};
+use gpui::{
+ point, px, relative, rems, transparent_black, AnyElement, AppContext, Bounds, Component,
+ CursorStyle, Element, ElementId, FontStyle, FontWeight, HighlightStyle, Hsla, IntoElement,
+ IsZero, LayoutId, ModelContext, Overlay, Pixels, Point, Quad, ShapedLine, SharedString, Style,
+ Styled, TextRun, TextStyle, TextSystem, Underline, UnderlineStyle, ViewContext, WeakModel,
+ WhiteSpace, WindowContext,
+};
+use itertools::Itertools;
+use language::CursorShape;
+use ordered_float::OrderedFloat;
+use settings::Settings;
+use terminal::{
+ alacritty_terminal::{
+ ansi::{Color as AnsiColor, Color::Named, CursorShape as AlacCursorShape, NamedColor},
+ grid::Dimensions,
+ index::Point as AlacPoint,
+ term::{cell::Flags, TermMode},
+ },
+ terminal_settings::TerminalSettings,
+ IndexedCell, Terminal, TerminalContent, TerminalSize,
+};
+use theme::{ActiveTheme, ThemeColors, ThemeSettings};
+
+use std::mem;
+use std::{fmt::Debug, ops::RangeInclusive};
+
+use crate::TerminalView;
+
+///The information generated during layout that is necessary for painting
+pub struct LayoutState {
+ cells: Vec<LayoutCell>,
+ rects: Vec<LayoutRect>,
+ relative_highlighted_ranges: Vec<(RangeInclusive<AlacPoint>, Hsla)>,
+ cursor: Option<Cursor>,
+ background_color: Hsla,
+ size: TerminalSize,
+ mode: TermMode,
+ display_offset: usize,
+ hyperlink_tooltip: Option<AnyElement>,
+ gutter: Pixels,
+}
+
+///Helper struct for converting data between alacritty's cursor points, and displayed cursor points
+struct DisplayCursor {
+ line: i32,
+ col: usize,
+}
+
+impl DisplayCursor {
+ fn from(cursor_point: AlacPoint, display_offset: usize) -> Self {
+ Self {
+ line: cursor_point.line.0 + display_offset as i32,
+ col: cursor_point.column.0,
+ }
+ }
+
+ pub fn line(&self) -> i32 {
+ self.line
+ }
+
+ pub fn col(&self) -> usize {
+ self.col
+ }
+}
+
+#[derive(Debug, Default)]
+struct LayoutCell {
+ point: AlacPoint<i32, i32>,
+ text: gpui::ShapedLine,
+}
+
+impl LayoutCell {
+ fn new(point: AlacPoint<i32, i32>, text: gpui::ShapedLine) -> LayoutCell {
+ LayoutCell { point, text }
+ }
+
+ fn paint(
+ &self,
+ origin: Point<Pixels>,
+ layout: &LayoutState,
+ _visible_bounds: Bounds<Pixels>,
+ _view: &mut TerminalView,
+ cx: &mut WindowContext,
+ ) {
+ let pos = {
+ let point = self.point;
+
+ Point::new(
+ (origin.x + point.column as f32 * layout.size.cell_width).floor(),
+ origin.y + point.line as f32 * layout.size.line_height,
+ )
+ };
+
+ self.text.paint(pos, layout.size.line_height, cx);
+ }
+}
+
+#[derive(Clone, Debug, Default)]
+struct LayoutRect {
+ point: AlacPoint<i32, i32>,
+ num_of_cells: usize,
+ color: Hsla,
+}
+
+impl LayoutRect {
+ fn new(point: AlacPoint<i32, i32>, num_of_cells: usize, color: Hsla) -> LayoutRect {
+ LayoutRect {
+ point,
+ num_of_cells,
+ color,
+ }
+ }
+
+ fn extend(&self) -> Self {
+ LayoutRect {
+ point: self.point,
+ num_of_cells: self.num_of_cells + 1,
+ color: self.color,
+ }
+ }
+
+ fn paint(
+ &self,
+ origin: Point<Pixels>,
+ layout: &LayoutState,
+ _view: &mut TerminalView,
+ cx: &mut ViewContext<TerminalView>,
+ ) {
+ let position = {
+ let alac_point = self.point;
+ point(
+ (origin.x + alac_point.column as f32 * layout.size.cell_width).floor(),
+ origin.y + alac_point.line as f32 * layout.size.line_height,
+ )
+ };
+ let size = point(
+ (layout.size.cell_width * self.num_of_cells as f32).ceil(),
+ layout.size.line_height,
+ )
+ .into();
+
+ cx.paint_quad(
+ Bounds::new(position, size),
+ Default::default(),
+ self.color,
+ Default::default(),
+ transparent_black(),
+ );
+ }
+}
+
+///The GPUI element that paints the terminal.
+///We need to keep a reference to the view for mouse events, do we need it for any other terminal stuff, or can we move that to connection?
+pub struct TerminalElement {
+ terminal: WeakModel<Terminal>,
+ focused: bool,
+ cursor_visible: bool,
+ can_navigate_to_selected_word: bool,
+}
+
+impl TerminalElement {
+ pub fn new(
+ terminal: WeakModel<Terminal>,
+ focused: bool,
+ cursor_visible: bool,
+ can_navigate_to_selected_word: bool,
+ ) -> TerminalElement {
+ TerminalElement {
+ terminal,
+ focused,
+ cursor_visible,
+ can_navigate_to_selected_word,
+ }
+ }
+
+ //Vec<Range<AlacPoint>> -> Clip out the parts of the ranges
+
+ fn layout_grid(
+ grid: &Vec<IndexedCell>,
+ text_style: &TextStyle,
+ // terminal_theme: &TerminalStyle,
+ text_system: &TextSystem,
+ hyperlink: Option<(HighlightStyle, &RangeInclusive<AlacPoint>)>,
+ cx: &mut WindowContext<'_>,
+ ) -> (Vec<LayoutCell>, Vec<LayoutRect>) {
+ let theme_colors = cx.theme().colors();
+ let mut cells = vec![];
+ let mut rects = vec![];
+
+ let mut cur_rect: Option<LayoutRect> = None;
+ let mut cur_alac_color = None;
+
+ let linegroups = grid.into_iter().group_by(|i| i.point.line);
+ for (line_index, (_, line)) in linegroups.into_iter().enumerate() {
+ for cell in line {
+ let mut fg = cell.fg;
+ let mut bg = cell.bg;
+ if cell.flags.contains(Flags::INVERSE) {
+ mem::swap(&mut fg, &mut bg);
+ }
+
+ //Expand background rect range
+ {
+ if matches!(bg, Named(NamedColor::Background)) {
+ //Continue to next cell, resetting variables if necessary
+ cur_alac_color = None;
+ if let Some(rect) = cur_rect {
+ rects.push(rect);
+ cur_rect = None
+ }
+ } else {
+ match cur_alac_color {
+ Some(cur_color) => {
+ if bg == cur_color {
+ cur_rect = cur_rect.take().map(|rect| rect.extend());
+ } else {
+ cur_alac_color = Some(bg);
+ if cur_rect.is_some() {
+ rects.push(cur_rect.take().unwrap());
+ }
+ cur_rect = Some(LayoutRect::new(
+ AlacPoint::new(
+ line_index as i32,
+ cell.point.column.0 as i32,
+ ),
+ 1,
+ convert_color(&bg, theme_colors),
+ ));
+ }
+ }
+ None => {
+ cur_alac_color = Some(bg);
+ cur_rect = Some(LayoutRect::new(
+ AlacPoint::new(line_index as i32, cell.point.column.0 as i32),
+ 1,
+ convert_color(&bg, &theme_colors),
+ ));
+ }
+ }
+ }
+ }
+
+ //Layout current cell text
+ {
+ let cell_text = cell.c.to_string();
+ if !is_blank(&cell) {
+ let cell_style = TerminalElement::cell_style(
+ &cell,
+ fg,
+ bg,
+ theme_colors,
+ text_style,
+ text_system,
+ hyperlink,
+ );
+
+ let layout_cell = text_system
+ .shape_line(
+ cell_text.into(),
+ text_style.font_size.to_pixels(cx.rem_size()),
+ &[cell_style],
+ )
+ //todo!() Can we remove this unwrap?
+ .unwrap();
+
+ cells.push(LayoutCell::new(
+ AlacPoint::new(line_index as i32, cell.point.column.0 as i32),
+ layout_cell,
+ ))
+ };
+ }
+ }
+
+ if cur_rect.is_some() {
+ rects.push(cur_rect.take().unwrap());
+ }
+ }
+ (cells, rects)
+ }
+
+ // Compute the cursor position and expected block width, may return a zero width if x_for_index returns
+ // the same position for sequential indexes. Use em_width instead
+ fn shape_cursor(
+ cursor_point: DisplayCursor,
+ size: TerminalSize,
+ text_fragment: &ShapedLine,
+ ) -> Option<(Point<Pixels>, Pixels)> {
+ if cursor_point.line() < size.total_lines() as i32 {
+ let cursor_width = if text_fragment.width == Pixels::ZERO {
+ size.cell_width()
+ } else {
+ text_fragment.width
+ };
+
+ //Cursor should always surround as much of the text as possible,
+ //hence when on pixel boundaries round the origin down and the width up
+ Some((
+ point(
+ (cursor_point.col() as f32 * size.cell_width()).floor(),
+ (cursor_point.line() as f32 * size.line_height()).floor(),
+ ),
+ cursor_width.ceil(),
+ ))
+ } else {
+ None
+ }
+ }
+
+ ///Convert the Alacritty cell styles to GPUI text styles and background color
+ fn cell_style(
+ indexed: &IndexedCell,
+ fg: terminal::alacritty_terminal::ansi::Color,
+ bg: terminal::alacritty_terminal::ansi::Color,
+ colors: &ThemeColors,
+ text_style: &TextStyle,
+ text_system: &TextSystem,
+ hyperlink: Option<(HighlightStyle, &RangeInclusive<AlacPoint>)>,
+ ) -> TextRun {
+ let flags = indexed.cell.flags;
+ let fg = convert_color(&fg, &colors);
+ let bg = convert_color(&bg, &colors);
+
+ let mut underline = (flags.intersects(Flags::ALL_UNDERLINES)
+ || indexed.cell.hyperlink().is_some())
+ .then(|| UnderlineStyle {
+ color: Some(fg),
+ thickness: Pixels::from(1.0),
+ wavy: flags.contains(Flags::UNDERCURL),
+ });
+
+ //todo!(support bold and italic)
+ // let mut properties = Properties::new();
+ // if indexed.flags.intersects(Flags::BOLD | Flags::DIM_BOLD) {
+ // properties = *properties.weight(FontWeight::BOLD);
+ // }
+ // if indexed.flags.intersects(Flags::ITALIC) {
+ // properties = *properties.style(FontStyle::Italic);
+ // }
+
+ let mut result = TextRun {
+ len: indexed.c.len_utf8() as usize,
+ color: fg,
+ background_color: Some(bg),
+ font: text_style.font(),
+ underline,
+ };
+
+ if let Some((style, range)) = hyperlink {
+ if range.contains(&indexed.point) {
+ if let Some(underline) = style.underline {
+ result.underline = Some(underline);
+ }
+
+ if let Some(color) = style.color {
+ result.color = color;
+ }
+ }
+ }
+
+ result
+ }
+
+ fn compute_layout(&self, bounds: Bounds<gpui::Pixels>, cx: &mut WindowContext) -> LayoutState {
+ let settings = ThemeSettings::get_global(cx);
+ let terminal_settings = TerminalSettings::get_global(cx);
+
+ //Setup layout information
+ // todo!(Terminal tooltips)
+ // let link_style = settings.theme.editor.link_definition;
+ // let tooltip_style = settings.theme.tooltip.clone();
+
+ let text_system = cx.text_system();
+ let font_size = font_size(&terminal_settings, cx).unwrap_or(settings.buffer_font_size(cx));
+ let font_family: SharedString = terminal_settings
+ .font_family
+ .as_ref()
+ .map(|string| SharedString::from(*string))
+ .unwrap_or(settings.buffer_font.family);
+
+ let font_features = terminal_settings
+ .font_features
+ .as_ref()
+ .unwrap_or(&settings.buffer_font.features);
+
+ let settings = ThemeSettings::get_global(cx);
+ let theme = cx.theme();
+ let text_style = TextStyle {
+ font_family,
+ font_features: *font_features,
+ font_size: font_size.into(),
+ font_style: FontStyle::Normal,
+ line_height: terminal_settings.line_height.value().into(),
+ background_color: None,
+ white_space: WhiteSpace::Normal,
+ // These are going to be overridden per-cell
+ underline: None,
+ color: theme.colors().text,
+ font_weight: FontWeight::NORMAL,
+ };
+
+ let selection_color = theme.players().local();
+ let match_color = theme.colors().search_match_background;
+ let gutter;
+ let dimensions = {
+ let rem_size = cx.rem_size();
+ let font_pixels = text_style.font_size.to_pixels(rem_size);
+ let line_height =
+ font_pixels * terminal_settings.line_height.value().to_pixels(rem_size);
+ let font_id = cx.text_system().font_id(&text_style.font()).unwrap();
+
+ // todo!(do we need to keep this unwrap?)
+ let cell_width = text_system
+ .advance(font_id, font_pixels, 'm')
+ .unwrap()
+ .width;
+ gutter = cell_width;
+
+ let mut size = bounds.size.clone();
+ size.width -= gutter;
+
+ TerminalSize::new(line_height, cell_width, size)
+ };
+
+ let search_matches = if let Some(terminal_model) = self.terminal.upgrade() {
+ terminal_model.read(cx).matches.clone()
+ } else {
+ Default::default()
+ };
+
+ let background_color = theme.colors().background;
+ let terminal_handle = self.terminal.upgrade().unwrap();
+
+ let last_hovered_word = terminal_handle.update(cx, |terminal, cx| {
+ terminal.set_size(dimensions);
+ terminal.try_sync(cx);
+ // if self.can_navigate_to_selected_word && terminal.can_navigate_to_selected_word() {
+ // terminal.last_content.last_hovered_word.clone()
+ // } else {
+ None
+ // }
+ });
+
+ // let hyperlink_tooltip = last_hovered_word.clone().map(|hovered_word| {
+ // let mut tooltip = Overlay::new(
+ // Empty::new()
+ // .contained()
+ // .constrained()
+ // .with_width(dimensions.width())
+ // .with_height(dimensions.height())
+ // .with_tooltip::<TerminalElement>(
+ // hovered_word.id,
+ // hovered_word.word,
+ // None,
+ // tooltip_style,
+ // cx,
+ // ),
+ // )
+ // .with_position_mode(gpui::OverlayPositionMode::Local)
+ // .into_any();
+
+ // tooltip.layout(
+ // SizeConstraint::new(Point::zero(), cx.window_size()),
+ // view_state,
+ // cx,
+ // );
+ // tooltip
+ // });
+
+ let TerminalContent {
+ cells,
+ mode,
+ display_offset,
+ cursor_char,
+ selection,
+ cursor,
+ ..
+ } = { &terminal_handle.read(cx).last_content };
+
+ // searches, highlights to a single range representations
+ let mut relative_highlighted_ranges = Vec::new();
+ for search_match in search_matches {
+ relative_highlighted_ranges.push((search_match, match_color))
+ }
+ if let Some(selection) = selection {
+ relative_highlighted_ranges
+ .push((selection.start..=selection.end, selection_color.cursor));
+ }
+
+ // then have that representation be converted to the appropriate highlight data structure
+
+ let (cells, rects) = TerminalElement::layout_grid(
+ cells,
+ &text_style,
+ // &terminal_theme,
+ &cx.text_system(),
+ // todo!(Terminal tooltips)
+ last_hovered_word,
+ // .as_ref()
+ // .map(|last_hovered_word| (link_style, &last_hovered_word.word_match)),
+ cx,
+ );
+
+ //Layout cursor. Rectangle is used for IME, so we should lay it out even
+ //if we don't end up showing it.
+ let cursor = if let AlacCursorShape::Hidden = cursor.shape {
+ None
+ } else {
+ let cursor_point = DisplayCursor::from(cursor.point, *display_offset);
+ let cursor_text = {
+ let str_trxt = cursor_char.to_string();
+
+ let color = if self.focused {
+ theme.players().local().background
+ } else {
+ theme.players().local().cursor
+ };
+
+ cx.text_system()
+ .layout_line(
+ &str_trxt,
+ text_style.font_size.to_pixels(cx.rem_size()),
+ &[TextRun {
+ len: str_trxt.len(),
+ font: text_style.font(),
+ color,
+ background_color: None,
+ underline: Default::default(),
+ }],
+ )
+ //todo!(do we need to keep this unwrap?)
+ .unwrap()
+ };
+
+ let focused = self.focused;
+ TerminalElement::shape_cursor(cursor_point, dimensions, &cursor_text).map(
+ move |(cursor_position, block_width)| {
+ let (shape, text) = match cursor.shape {
+ AlacCursorShape::Block if !focused => (CursorShape::Hollow, None),
+ AlacCursorShape::Block => (CursorShape::Block, Some(cursor_text)),
+ AlacCursorShape::Underline => (CursorShape::Underscore, None),
+ AlacCursorShape::Beam => (CursorShape::Bar, None),
+ AlacCursorShape::HollowBlock => (CursorShape::Hollow, None),
+ //This case is handled in the if wrapping the whole cursor layout
+ AlacCursorShape::Hidden => unreachable!(),
+ };
+
+ Cursor::new(
+ cursor_position,
+ block_width,
+ dimensions.line_height,
+ terminal_theme.cursor,
+ shape,
+ text,
+ )
+ },
+ )
+ };
+
+ //Done!
+ LayoutState {
+ cells,
+ cursor,
+ background_color,
+ size: dimensions,
+ rects,
+ relative_highlighted_ranges,
+ mode: *mode,
+ display_offset: *display_offset,
+ hyperlink_tooltip: None, // todo!(tooltips)
+ gutter,
+ }
+ }
+
+ // todo!()
+ // fn generic_button_handler<E>(
+ // connection: WeakModel<Terminal>,
+ // origin: Point<Pixels>,
+ // f: impl Fn(&mut Terminal, Point<Pixels>, E, &mut ModelContext<Terminal>),
+ // ) -> impl Fn(E, &mut TerminalView, &mut EventContext<TerminalView>) {
+ // move |event, _: &mut TerminalView, cx| {
+ // cx.focus_parent();
+ // if let Some(conn_handle) = connection.upgrade() {
+ // conn_handle.update(cx, |terminal, cx| {
+ // f(terminal, origin, event, cx);
+
+ // cx.notify();
+ // })
+ // }
+ // }
+ // }
+
+ fn attach_mouse_handlers(
+ &self,
+ origin: Point<Pixels>,
+ visible_bounds: Bounds<Pixels>,
+ mode: TermMode,
+ cx: &mut ViewContext<TerminalView>,
+ ) {
+ // todo!()
+ // let connection = self.terminal;
+
+ // let mut region = MouseRegion::new::<Self>(cx.view_id(), 0, visible_bounds);
+
+ // // Terminal Emulator controlled behavior:
+ // region = region
+ // // Start selections
+ // .on_down(MouseButton::Left, move |event, v: &mut TerminalView, cx| {
+ // let terminal_view = cx.handle();
+ // cx.focus(&terminal_view);
+ // v.context_menu.update(cx, |menu, _cx| menu.delay_cancel());
+ // if let Some(conn_handle) = connection.upgrade() {
+ // conn_handle.update(cx, |terminal, cx| {
+ // terminal.mouse_down(&event, origin);
+
+ // cx.notify();
+ // })
+ // }
+ // })
+ // // Update drag selections
+ // .on_drag(MouseButton::Left, move |event, _: &mut TerminalView, cx| {
+ // if event.end {
+ // return;
+ // }
+
+ // if cx.is_self_focused() {
+ // if let Some(conn_handle) = connection.upgrade() {
+ // conn_handle.update(cx, |terminal, cx| {
+ // terminal.mouse_drag(event, origin);
+ // cx.notify();
+ // })
+ // }
+ // }
+ // })
+ // // Copy on up behavior
+ // .on_up(
+ // MouseButton::Left,
+ // TerminalElement::generic_button_handler(
+ // connection,
+ // origin,
+ // move |terminal, origin, e, cx| {
+ // terminal.mouse_up(&e, origin, cx);
+ // },
+ // ),
+ // )
+ // // Context menu
+ // .on_click(
+ // MouseButton::Right,
+ // move |event, view: &mut TerminalView, cx| {
+ // let mouse_mode = if let Some(conn_handle) = connection.upgrade() {
+ // conn_handle.update(cx, |terminal, _cx| terminal.mouse_mode(event.shift))
+ // } else {
+ // // If we can't get the model handle, probably can't deploy the context menu
+ // true
+ // };
+ // if !mouse_mode {
+ // view.deploy_context_menu(event.position, cx);
+ // }
+ // },
+ // )
+ // .on_move(move |event, _: &mut TerminalView, cx| {
+ // if cx.is_self_focused() {
+ // if let Some(conn_handle) = connection.upgrade() {
+ // conn_handle.update(cx, |terminal, cx| {
+ // terminal.mouse_move(&event, origin);
+ // cx.notify();
+ // })
+ // }
+ // }
+ // })
+ // .on_scroll(move |event, _: &mut TerminalView, cx| {
+ // if let Some(conn_handle) = connection.upgrade() {
+ // conn_handle.update(cx, |terminal, cx| {
+ // terminal.scroll_wheel(event, origin);
+ // cx.notify();
+ // })
+ // }
+ // });
+
+ // // Mouse mode handlers:
+ // // All mouse modes need the extra click handlers
+ // if mode.intersects(TermMode::MOUSE_MODE) {
+ // region = region
+ // .on_down(
+ // MouseButton::Right,
+ // TerminalElement::generic_button_handler(
+ // connection,
+ // origin,
+ // move |terminal, origin, e, _cx| {
+ // terminal.mouse_down(&e, origin);
+ // },
+ // ),
+ // )
+ // .on_down(
+ // MouseButton::Middle,
+ // TerminalElement::generic_button_handler(
+ // connection,
+ // origin,
+ // move |terminal, origin, e, _cx| {
+ // terminal.mouse_down(&e, origin);
+ // },
+ // ),
+ // )
+ // .on_up(
+ // MouseButton::Right,
+ // TerminalElement::generic_button_handler(
+ // connection,
+ // origin,
+ // move |terminal, origin, e, cx| {
+ // terminal.mouse_up(&e, origin, cx);
+ // },
+ // ),
+ // )
+ // .on_up(
+ // MouseButton::Middle,
+ // TerminalElement::generic_button_handler(
+ // connection,
+ // origin,
+ // move |terminal, origin, e, cx| {
+ // terminal.mouse_up(&e, origin, cx);
+ // },
+ // ),
+ // )
+ // }
+
+ // cx.scene().push_mouse_region(region);
+ }
+}
+
+impl Element for TerminalElement {
+ type State = ();
+
+ fn layout(
+ &mut self,
+ element_state: Option<Self::State>,
+ cx: &mut WindowContext<'_>,
+ ) -> (LayoutId, Self::State) {
+ let mut style = Style::default();
+ style.size.width = relative(1.).into();
+ style.size.height = relative(1.).into();
+ let layout_id = cx.request_layout(&style, None);
+
+ (layout_id, ())
+ }
+
+ fn paint(self, bounds: Bounds<Pixels>, _: &mut Self::State, cx: &mut WindowContext<'_>) {
+ let layout = self.compute_layout(bounds, cx);
+ // todo!()
+ // let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
+
+ // //Setup element stuff
+ // let clip_bounds = Some(visible_bounds);
+
+ // cx.paint_layer(clip_bounds, |cx| {
+ // let origin = bounds.origin + point(element_state.gutter, 0.);
+
+ // // Elements are ephemeral, only at paint time do we know what could be clicked by a mouse
+ // self.attach_mouse_handlers(origin, visible_bounds, element_state.mode, cx);
+
+ // cx.scene().push_cursor_region(gpui::CursorRegion {
+ // bounds,
+ // style: if element_state.hyperlink_tooltip.is_some() {
+ // CursorStyle::AlacPointingHand
+ // } else {
+ // CursorStyle::IBeam
+ // },
+ // });
+
+ // cx.paint_layer(clip_bounds, |cx| {
+ // //Start with a background color
+ // cx.scene().push_quad(Quad {
+ // bounds,
+ // background: Some(element_state.background_color),
+ // border: Default::default(),
+ // corner_radii: Default::default(),
+ // });
+
+ // for rect in &element_state.rects {
+ // rect.paint(origin, element_state, view_state, cx);
+ // }
+ // });
+
+ // //Draw Highlighted Backgrounds
+ // cx.paint_layer(clip_bounds, |cx| {
+ // for (relative_highlighted_range, color) in
+ // element_state.relative_highlighted_ranges.iter()
+ // {
+ // if let Some((start_y, highlighted_range_lines)) = to_highlighted_range_lines(
+ // relative_highlighted_range,
+ // element_state,
+ // origin,
+ // ) {
+ // let hr = HighlightedRange {
+ // start_y, //Need to change this
+ // line_height: element_state.size.line_height,
+ // lines: highlighted_range_lines,
+ // color: color.clone(),
+ // //Copied from editor. TODO: move to theme or something
+ // corner_radius: 0.15 * element_state.size.line_height,
+ // };
+ // hr.paint(bounds, cx);
+ // }
+ // }
+ // });
+
+ // //Draw the text cells
+ // cx.paint_layer(clip_bounds, |cx| {
+ // for cell in &element_state.cells {
+ // cell.paint(origin, element_state, visible_bounds, view_state, cx);
+ // }
+ // });
+
+ // //Draw cursor
+ // if self.cursor_visible {
+ // if let Some(cursor) = &element_state.cursor {
+ // cx.paint_layer(clip_bounds, |cx| {
+ // cursor.paint(origin, cx);
+ // })
+ // }
+ // }
+
+ // if let Some(element) = &mut element_state.hyperlink_tooltip {
+ // element.paint(origin, visible_bounds, view_state, cx)
+ // }
+ // });
+ }
+
+ // todo!() remove?
+ // fn metadata(&self) -> Option<&dyn std::any::Any> {
+ // None
+ // }
+
+ // fn debug(
+ // &self,
+ // _: Bounds<Pixels>,
+ // _: &Self::State,
+ // _: &Self::PaintState,
+ // _: &TerminalView,
+ // _: &gpui::ViewContext<TerminalView>,
+ // ) -> gpui::serde_json::Value {
+ // json!({
+ // "type": "TerminalElement",
+ // })
+ // }
+
+ // fn rect_for_text_range(
+ // &self,
+ // _: Range<usize>,
+ // bounds: Bounds<Pixels>,
+ // _: Bounds<Pixels>,
+ // layout: &Self::State,
+ // _: &Self::PaintState,
+ // _: &TerminalView,
+ // _: &gpui::ViewContext<TerminalView>,
+ // ) -> Option<Bounds<Pixels>> {
+ // // Use the same origin that's passed to `Cursor::paint` in the paint
+ // // method bove.
+ // let mut origin = bounds.origin() + point(layout.size.cell_width, 0.);
+
+ // // TODO - Why is it necessary to move downward one line to get correct
+ // // positioning? I would think that we'd want the same rect that is
+ // // painted for the cursor.
+ // origin += point(0., layout.size.line_height);
+
+ // Some(layout.cursor.as_ref()?.bounding_rect(origin))
+ // }
+}
+
+impl IntoElement for TerminalElement {
+ type Element = Self;
+
+ fn element_id(&self) -> Option<ElementId> {
+ todo!()
+ }
+
+ fn into_element(self) -> Self::Element {
+ self
+ }
+}
+
+fn is_blank(cell: &IndexedCell) -> bool {
+ if cell.c != ' ' {
+ return false;
+ }
+
+ if cell.bg != AnsiColor::Named(NamedColor::Background) {
+ return false;
+ }
+
+ if cell.hyperlink().is_some() {
+ return false;
+ }
+
+ if cell
+ .flags
+ .intersects(Flags::ALL_UNDERLINES | Flags::INVERSE | Flags::STRIKEOUT)
+ {
+ return false;
+ }
+
+ return true;
+}
+
+fn to_highlighted_range_lines(
+ range: &RangeInclusive<AlacPoint>,
+ layout: &LayoutState,
+ origin: Point<Pixels>,
+) -> Option<(Pixels, Vec<HighlightedRangeLine>)> {
+ // Step 1. Normalize the points to be viewport relative.
+ // When display_offset = 1, here's how the grid is arranged:
+ //-2,0 -2,1...
+ //--- Viewport top
+ //-1,0 -1,1...
+ //--------- Terminal Top
+ // 0,0 0,1...
+ // 1,0 1,1...
+ //--- Viewport Bottom
+ // 2,0 2,1...
+ //--------- Terminal Bottom
+
+ // Normalize to viewport relative, from terminal relative.
+ // lines are i32s, which are negative above the top left corner of the terminal
+ // If the user has scrolled, we use the display_offset to tell us which offset
+ // of the grid data we should be looking at. But for the rendering step, we don't
+ // want negatives. We want things relative to the 'viewport' (the area of the grid
+ // which is currently shown according to the display offset)
+ let unclamped_start = AlacPoint::new(
+ range.start().line + layout.display_offset,
+ range.start().column,
+ );
+ let unclamped_end =
+ AlacPoint::new(range.end().line + layout.display_offset, range.end().column);
+
+ // Step 2. Clamp range to viewport, and return None if it doesn't overlap
+ if unclamped_end.line.0 < 0 || unclamped_start.line.0 > layout.size.num_lines() as i32 {
+ return None;
+ }
+
+ let clamped_start_line = unclamped_start.line.0.max(0) as usize;
+ let clamped_end_line = unclamped_end.line.0.min(layout.size.num_lines() as i32) as usize;
+ //Convert the start of the range to pixels
+ let start_y = origin.y + clamped_start_line as f32 * layout.size.line_height;
+
+ // Step 3. Expand ranges that cross lines into a collection of single-line ranges.
+ // (also convert to pixels)
+ let mut highlighted_range_lines = Vec::new();
+ for line in clamped_start_line..=clamped_end_line {
+ let mut line_start = 0;
+ let mut line_end = layout.size.columns();
+
+ if line == clamped_start_line {
+ line_start = unclamped_start.column.0 as usize;
+ }
+ if line == clamped_end_line {
+ line_end = unclamped_end.column.0 as usize + 1; //+1 for inclusive
+ }
+
+ highlighted_range_lines.push(HighlightedRangeLine {
+ start_x: origin.x + line_start as f32 * layout.size.cell_width,
+ end_x: origin.x + line_end as f32 * layout.size.cell_width,
+ });
+ }
+
+ Some((start_y, highlighted_range_lines))
+}
+
+fn font_size(terminal_settings: &TerminalSettings, cx: &mut AppContext) -> Option<Pixels> {
+ terminal_settings
+ .font_size
+ .map(|size| theme::adjusted_font_size(size, cx))
+}
+
+// mappings::colors::convert_color
+fn convert_color(fg: &terminal::alacritty_terminal::ansi::Color, colors: &ThemeColors) -> Hsla {
+ todo!()
+}
@@ -49,6 +49,8 @@ impl ThemeColors {
tab_bar_background: neutral().light().step_2(),
tab_active_background: neutral().light().step_1(),
tab_inactive_background: neutral().light().step_2(),
+ search_match_background: neutral().light().step_2(), // todo!(this was inserted by Mikayla)
+
editor_background: neutral().light().step_1(),
editor_gutter_background: neutral().light().step_1(), // todo!("pick the right colors")
editor_subheader_background: neutral().light().step_2(),
@@ -121,6 +123,8 @@ impl ThemeColors {
tab_bar_background: neutral().dark().step_2(),
tab_active_background: neutral().dark().step_1(),
tab_inactive_background: neutral().dark().step_2(),
+ search_match_background: neutral().dark().step_2(), // todo!(this was inserted by Mikayla)
+
editor_background: neutral().dark().step_1(),
editor_gutter_background: neutral().dark().step_1(),
editor_subheader_background: neutral().dark().step_3(),
@@ -75,6 +75,8 @@ pub(crate) fn one_dark() -> Theme {
tab_bar_background: bg,
tab_inactive_background: bg,
tab_active_background: editor,
+ search_match_background: bg, // todo!(this was inserted by Mikayla)
+
editor_background: editor,
editor_gutter_background: editor,
editor_subheader_background: bg,
@@ -92,6 +94,7 @@ pub(crate) fn one_dark() -> Theme {
0.2,
),
editor_document_highlight_write_background: gpui::red(),
+
terminal_background: bg,
// todo!("Use one colors for terminal")
terminal_ansi_black: crate::black().dark().step_12(),
@@ -114,6 +114,7 @@ pub struct ThemeColors {
pub tab_bar_background: Hsla,
pub tab_inactive_background: Hsla,
pub tab_active_background: Hsla,
+ pub search_match_background: Hsla,
// pub panel_background: Hsla,
// pub pane_focused_border: Hsla,
// /// The color of the scrollbar thumb.