mirror of
https://github.com/alacritty/alacritty.git
synced 2024-11-25 14:05:41 -05:00
55ba60441f
The current `span_simple` selection is everything but simple. This version should have the same functionality as the current `span_simple` with the difference that a lot of complexity has been removed. Not only is this code shorter, it should also be significantly easier to understand with no "magic" to it. This will hopefully prevent us from having an unmaintainable blob of off-by-one guessing in the repo. Also removed the `out` file which I used in the original PR because scrollback is not implemented yet. :)
519 lines
17 KiB
Rust
519 lines
17 KiB
Rust
// Copyright 2016 Joe Wilm, The Alacritty Project Contributors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! State management for a selection in the grid
|
|
//!
|
|
//! A selection should start when the mouse is clicked, and it should be
|
|
//! finalized when the button is released. The selection should be cleared
|
|
//! when text is added/removed/scrolled on the screen. The selection should
|
|
//! also be cleared if the user clicks off of the selection.
|
|
use std::cmp::{min, max};
|
|
use std::ops::Range;
|
|
|
|
use index::{Point, Column, Side};
|
|
|
|
/// Describes a region of a 2-dimensional area
|
|
///
|
|
/// Used to track a text selection. There are three supported modes, each with its own constructor:
|
|
/// [`simple`], [`semantic`], and [`lines`]. The [`simple`] mode precisely tracks which cells are
|
|
/// selected without any expansion. [`semantic`] mode expands the initial selection to the nearest
|
|
/// semantic escape char in either direction. [`lines`] will always select entire lines.
|
|
///
|
|
/// Calls to [`update`] operate different based on the selection kind. The [`simple`] mode does
|
|
/// nothing special, simply tracks points and sides. [`semantic`] will continue to expand out to
|
|
/// semantic boundaries as the selection point changes. Similarly, [`lines`] will always expand the
|
|
/// new point to encompass entire lines.
|
|
///
|
|
/// [`simple`]: enum.Selection.html#method.simple
|
|
/// [`semantic`]: enum.Selection.html#method.semantic
|
|
/// [`lines`]: enum.Selection.html#method.lines
|
|
#[derive(Debug, Clone)]
|
|
pub enum Selection {
|
|
Simple {
|
|
/// The region representing start and end of cursor movement
|
|
region: Range<Anchor>,
|
|
},
|
|
Semantic {
|
|
/// The region representing start and end of cursor movement
|
|
region: Range<Point<usize>>,
|
|
|
|
/// When beginning a semantic selection, the grid is searched around the
|
|
/// initial point to find semantic escapes, and this initial expansion
|
|
/// marks those points.
|
|
initial_expansion: Range<Point<usize>>
|
|
},
|
|
Lines {
|
|
/// The region representing start and end of cursor movement
|
|
region: Range<Point<usize>>,
|
|
|
|
/// The line under the initial point. This is always selected regardless
|
|
/// of which way the cursor is moved.
|
|
initial_line: usize
|
|
}
|
|
}
|
|
|
|
/// A Point and side within that point.
|
|
#[derive(Debug, Clone)]
|
|
pub struct Anchor {
|
|
point: Point<usize>,
|
|
side: Side,
|
|
}
|
|
|
|
impl Anchor {
|
|
fn new(point: Point<usize>, side: Side) -> Anchor {
|
|
Anchor { point, side }
|
|
}
|
|
}
|
|
|
|
/// A type that can expand a given point to a region
|
|
///
|
|
/// Usually this is implemented for some 2-D array type since
|
|
/// points are two dimensional indices.
|
|
pub trait SemanticSearch {
|
|
/// Find the nearest semantic boundary _to the left_ of provided point.
|
|
fn semantic_search_left(&self, _: Point<usize>) -> Point<usize>;
|
|
/// Find the nearest semantic boundary _to the point_ of provided point.
|
|
fn semantic_search_right(&self, _: Point<usize>) -> Point<usize>;
|
|
}
|
|
|
|
/// A type that has 2-dimensional boundaries
|
|
pub trait Dimensions {
|
|
/// Get the size of the area
|
|
fn dimensions(&self) -> Point;
|
|
}
|
|
|
|
impl Selection {
|
|
pub fn simple(location: Point<usize>, side: Side) -> Selection {
|
|
Selection::Simple {
|
|
region: Range {
|
|
start: Anchor::new(location, side),
|
|
end: Anchor::new(location, side)
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn rotate(&mut self, offset: isize) {
|
|
match *self {
|
|
Selection::Simple { ref mut region } => {
|
|
region.start.point.line = (region.start.point.line as isize + offset) as usize;
|
|
region.end.point.line = (region.end.point.line as isize + offset) as usize;
|
|
},
|
|
Selection::Semantic { ref mut region, ref mut initial_expansion } => {
|
|
region.start.line = (region.start.line as isize + offset) as usize;
|
|
region.end.line = (region.end.line as isize + offset) as usize;
|
|
initial_expansion.start.line = (initial_expansion.start.line as isize + offset) as usize;
|
|
initial_expansion.end.line = (initial_expansion.end.line as isize + offset) as usize;
|
|
},
|
|
Selection::Lines { ref mut region, ref mut initial_line } => {
|
|
region.start.line = (region.start.line as isize + offset) as usize;
|
|
region.end.line = (region.end.line as isize + offset) as usize;
|
|
*initial_line = (*initial_line as isize + offset) as usize;
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn semantic<G: SemanticSearch>(point: Point<usize>, grid: &G) -> Selection {
|
|
let (start, end) = (grid.semantic_search_left(point), grid.semantic_search_right(point));
|
|
Selection::Semantic {
|
|
region: Range {
|
|
start: point,
|
|
end: point,
|
|
},
|
|
initial_expansion: Range {
|
|
start: start,
|
|
end: end
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn lines(point: Point<usize>) -> Selection {
|
|
Selection::Lines {
|
|
region: Range {
|
|
start: point,
|
|
end: point
|
|
},
|
|
initial_line: point.line
|
|
}
|
|
}
|
|
|
|
pub fn update(&mut self, location: Point<usize>, side: Side) {
|
|
// Always update the `end`; can normalize later during span generation.
|
|
match *self {
|
|
Selection::Simple { ref mut region } => {
|
|
region.end = Anchor::new(location, side);
|
|
},
|
|
Selection::Semantic { ref mut region, .. } |
|
|
Selection::Lines { ref mut region, .. } =>
|
|
{
|
|
region.end = location;
|
|
},
|
|
}
|
|
}
|
|
|
|
pub fn to_span<G: SemanticSearch + Dimensions>(&self, grid: &G) -> Option<Span> {
|
|
match *self {
|
|
Selection::Simple { ref region } => {
|
|
Selection::span_simple(grid, region)
|
|
},
|
|
Selection::Semantic { ref region, ref initial_expansion } => {
|
|
Selection::span_semantic(grid, region, initial_expansion)
|
|
},
|
|
Selection::Lines { ref region, ref initial_line } => {
|
|
Selection::span_lines(grid, region, *initial_line)
|
|
}
|
|
}
|
|
}
|
|
fn span_semantic<G>(
|
|
grid: &G,
|
|
region: &Range<Point<usize>>,
|
|
initial_expansion: &Range<Point<usize>>
|
|
) -> Option<Span>
|
|
where G: SemanticSearch + Dimensions
|
|
{
|
|
let mut start = initial_expansion.start;
|
|
let mut end = initial_expansion.end;
|
|
|
|
// Normalize ordering of selected cells
|
|
let (front, tail) = if region.start < region.end {
|
|
(region.start, region.end)
|
|
} else {
|
|
(region.end, region.start)
|
|
};
|
|
|
|
if front < tail && front.line == tail.line {
|
|
start = grid.semantic_search_left(front);
|
|
end = grid.semantic_search_right(tail);
|
|
} else {
|
|
start = grid.semantic_search_right(front);
|
|
end = grid.semantic_search_left(tail);
|
|
}
|
|
|
|
if start > end {
|
|
::std::mem::swap(&mut start, &mut end);
|
|
}
|
|
|
|
Some(Span {
|
|
cols: grid.dimensions().col,
|
|
front: start,
|
|
tail: end,
|
|
ty: SpanType::Inclusive,
|
|
})
|
|
}
|
|
|
|
fn span_lines<G>(grid: &G, region: &Range<Point<usize>>, initial_line: usize) -> Option<Span>
|
|
where G: Dimensions
|
|
{
|
|
// First, create start and end points based on initial line and the grid
|
|
// dimensions.
|
|
let mut start = Point {
|
|
col: grid.dimensions().col - 1,
|
|
line: initial_line
|
|
};
|
|
let mut end = Point {
|
|
col: Column(0),
|
|
line: initial_line
|
|
};
|
|
|
|
// Now, expand lines based on where cursor started and ended.
|
|
if region.start.line < region.end.line {
|
|
// Start is below end
|
|
start.line = min(start.line, region.start.line);
|
|
end.line = max(end.line, region.end.line);
|
|
} else {
|
|
// Start is above end
|
|
start.line = min(start.line, region.end.line);
|
|
end.line = max(end.line, region.start.line);
|
|
}
|
|
|
|
Some(Span {
|
|
cols: grid.dimensions().col,
|
|
front: start,
|
|
tail: end,
|
|
ty: SpanType::Inclusive
|
|
})
|
|
}
|
|
|
|
fn span_simple<G: Dimensions>(grid: &G, region: &Range<Anchor>) -> Option<Span> {
|
|
let start = region.start.point;
|
|
let start_side = region.start.side;
|
|
let end = region.end.point;
|
|
let end_side = region.end.side;
|
|
let cols = grid.dimensions().col;
|
|
|
|
// No selection for single cell with identical sides or two cell with right+left sides
|
|
if (start == end && start_side == end_side)
|
|
|| (start_side == Side::Right && end_side == Side::Left && end.col == start.col + 1)
|
|
{
|
|
return None;
|
|
}
|
|
|
|
// Make sure front is always the "bottom" and tail is always the "top"
|
|
let (mut front, mut tail, front_side, tail_side) =
|
|
if start.line > end.line || start.line == end.line && start.col <= end.col {
|
|
// Selected upward; start/end are swapped
|
|
(end, start, end_side, start_side)
|
|
} else {
|
|
// Selected downward; no swapping
|
|
(start, end, start_side, end_side)
|
|
};
|
|
|
|
// Remove last cell if selection ends to the left of a cell
|
|
if front_side == Side::Left && start != end {
|
|
if front.col != Column(0) {
|
|
front.col -= 1;
|
|
}
|
|
// Special case when selection starts to left of first cell
|
|
else {
|
|
front.col = cols - 1;
|
|
front.line += 1;
|
|
}
|
|
}
|
|
|
|
// Remove first cell if selection starts at the right of a cell
|
|
if tail_side == Side::Right && front != tail {
|
|
tail.col += 1;
|
|
}
|
|
|
|
// Return the selection with all cells inclusive
|
|
Some(Span {
|
|
cols,
|
|
front,
|
|
tail,
|
|
ty: SpanType::Inclusive,
|
|
})
|
|
}
|
|
}
|
|
|
|
/// How to interpret the locations of a Span.
|
|
#[derive(Debug, Eq, PartialEq)]
|
|
pub enum SpanType {
|
|
/// Includes the beginning and end locations
|
|
Inclusive,
|
|
|
|
/// Exclude both beginning and end
|
|
Exclusive,
|
|
|
|
/// Excludes last cell of selection
|
|
ExcludeTail,
|
|
|
|
/// Excludes first cell of selection
|
|
ExcludeFront,
|
|
}
|
|
|
|
/// Represents a span of selected cells
|
|
#[derive(Debug, Eq, PartialEq)]
|
|
pub struct Span {
|
|
front: Point<usize>,
|
|
tail: Point<usize>,
|
|
cols: Column,
|
|
|
|
/// The type says whether ends are included or not.
|
|
ty: SpanType,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Locations {
|
|
/// Start point from bottom of buffer
|
|
pub start: Point<usize>,
|
|
/// End point towards top of buffer
|
|
pub end: Point<usize>,
|
|
}
|
|
|
|
impl Span {
|
|
pub fn to_locations(&self) -> Locations {
|
|
let (start, end) = match self.ty {
|
|
SpanType::Inclusive => (self.front, self.tail),
|
|
SpanType::Exclusive => {
|
|
(Span::wrap_start(self.front, self.cols), Span::wrap_end(self.tail, self.cols))
|
|
},
|
|
SpanType::ExcludeFront => (Span::wrap_start(self.front, self.cols), self.tail),
|
|
SpanType::ExcludeTail => (self.front, Span::wrap_end(self.tail, self.cols))
|
|
};
|
|
|
|
Locations { start, end }
|
|
}
|
|
|
|
fn wrap_start(mut start: Point<usize>, cols: Column) -> Point<usize> {
|
|
if start.col == cols - 1 {
|
|
Point {
|
|
line: start.line + 1,
|
|
col: Column(0),
|
|
}
|
|
} else {
|
|
start.col += 1;
|
|
start
|
|
}
|
|
}
|
|
|
|
fn wrap_end(end: Point<usize>, cols: Column) -> Point<usize> {
|
|
if end.col == Column(0) && end.line != 0 {
|
|
Point {
|
|
line: end.line - 1,
|
|
col: cols
|
|
}
|
|
} else {
|
|
Point {
|
|
line: end.line,
|
|
col: end.col - 1
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Tests for selection
|
|
///
|
|
/// There are comments on all of the tests describing the selection. Pictograms
|
|
/// are used to avoid ambiguity. Grid cells are represented by a [ ]. Only
|
|
/// cells that are completely covered are counted in a selection. Ends are
|
|
/// represented by `B` and `E` for begin and end, respectively. A selected cell
|
|
/// looks like [XX], [BX] (at the start), [XB] (at the end), [XE] (at the end),
|
|
/// and [EX] (at the start), or [BE] for a single cell. Partially selected cells
|
|
/// look like [ B] and [E ].
|
|
#[cfg(test)]
|
|
mod test {
|
|
use index::{Line, Column, Side, Point};
|
|
use super::{Selection, Span, SpanType};
|
|
|
|
struct Dimensions(Point);
|
|
impl super::Dimensions for Dimensions {
|
|
fn dimensions(&self) -> Point {
|
|
self.0
|
|
}
|
|
}
|
|
|
|
impl Dimensions {
|
|
pub fn new(line: usize, col: usize) -> Self {
|
|
Dimensions(Point {
|
|
line: Line(line),
|
|
col: Column(col)
|
|
})
|
|
}
|
|
}
|
|
|
|
impl super::SemanticSearch for Dimensions {
|
|
fn semantic_search_left(&self, _: Point<usize>) -> Point<usize> { unimplemented!(); }
|
|
fn semantic_search_right(&self, _: Point<usize>) -> Point<usize> { unimplemented!(); }
|
|
}
|
|
|
|
/// Test case of single cell selection
|
|
///
|
|
/// 1. [ ]
|
|
/// 2. [B ]
|
|
/// 3. [BE]
|
|
#[test]
|
|
fn single_cell_left_to_right() {
|
|
let location = Point { line: 0, col: Column(0) };
|
|
let mut selection = Selection::simple(location, Side::Left);
|
|
selection.update(location, Side::Right);
|
|
|
|
assert_eq!(selection.to_span(&Dimensions::new(1, 1)).unwrap(), Span {
|
|
cols: Column(1),
|
|
ty: SpanType::Inclusive,
|
|
front: location,
|
|
tail: location
|
|
});
|
|
}
|
|
|
|
/// Test case of single cell selection
|
|
///
|
|
/// 1. [ ]
|
|
/// 2. [ B]
|
|
/// 3. [EB]
|
|
#[test]
|
|
fn single_cell_right_to_left() {
|
|
let location = Point { line: 0, col: Column(0) };
|
|
let mut selection = Selection::simple(location, Side::Right);
|
|
selection.update(location, Side::Left);
|
|
|
|
assert_eq!(selection.to_span(&Dimensions::new(1, 1)).unwrap(), Span {
|
|
cols: Column(1),
|
|
ty: SpanType::Inclusive,
|
|
front: location,
|
|
tail: location
|
|
});
|
|
}
|
|
|
|
/// Test adjacent cell selection from left to right
|
|
///
|
|
/// 1. [ ][ ]
|
|
/// 2. [ B][ ]
|
|
/// 3. [ B][E ]
|
|
#[test]
|
|
fn between_adjacent_cells_left_to_right() {
|
|
let mut selection = Selection::simple(Point::new(0, Column(0)), Side::Right);
|
|
selection.update(Point::new(0, Column(1)), Side::Left);
|
|
|
|
assert_eq!(selection.to_span(&Dimensions::new(1, 2)), None);
|
|
}
|
|
|
|
/// Test adjacent cell selection from right to left
|
|
///
|
|
/// 1. [ ][ ]
|
|
/// 2. [ ][B ]
|
|
/// 3. [ E][B ]
|
|
#[test]
|
|
fn between_adjacent_cells_right_to_left() {
|
|
let mut selection = Selection::simple(Point::new(0, Column(1)), Side::Left);
|
|
selection.update(Point::new(0, Column(0)), Side::Right);
|
|
|
|
assert_eq!(selection.to_span(&Dimensions::new(1, 2)), None);
|
|
}
|
|
|
|
/// Test selection across adjacent lines
|
|
///
|
|
///
|
|
/// 1. [ ][ ][ ][ ][ ]
|
|
/// [ ][ ][ ][ ][ ]
|
|
/// 2. [ ][ ][ ][ ][ ]
|
|
/// [ ][ B][ ][ ][ ]
|
|
/// 3. [ ][ E][XX][XX][XX]
|
|
/// [XX][XB][ ][ ][ ]
|
|
#[test]
|
|
fn across_adjacent_lines_upward_final_cell_exclusive() {
|
|
let mut selection = Selection::simple(Point::new(1, Column(1)), Side::Right);
|
|
selection.update(Point::new(0, Column(1)), Side::Right);
|
|
|
|
assert_eq!(selection.to_span(&Dimensions::new(2, 5)).unwrap(), Span {
|
|
cols: Column(5),
|
|
front: Point::new(0, Column(1)),
|
|
tail: Point::new(1, Column(1)),
|
|
ty: SpanType::ExcludeFront
|
|
});
|
|
}
|
|
|
|
/// Test selection across adjacent lines
|
|
///
|
|
///
|
|
/// 1. [ ][ ][ ][ ][ ]
|
|
/// [ ][ ][ ][ ][ ]
|
|
/// 2. [ ][ B][ ][ ][ ]
|
|
/// [ ][ ][ ][ ][ ]
|
|
/// 3. [ ][ B][XX][XX][XX]
|
|
/// [XX][XE][ ][ ][ ]
|
|
/// 4. [ ][ B][XX][XX][XX]
|
|
/// [XE][ ][ ][ ][ ]
|
|
#[test]
|
|
fn selection_bigger_then_smaller() {
|
|
let mut selection = Selection::simple(Point::new(0, Column(1)), Side::Right);
|
|
selection.update(Point::new(1, Column(1)), Side::Right);
|
|
selection.update(Point::new(1, Column(0)), Side::Right);
|
|
|
|
assert_eq!(selection.to_span(&Dimensions::new(2, 5)).unwrap(), Span {
|
|
cols: Column(5),
|
|
front: Point::new(0, Column(1)),
|
|
tail: Point::new(1, Column(0)),
|
|
ty: SpanType::ExcludeFront
|
|
});
|
|
}
|
|
}
|