From 3bd5ac221ab3b122962063edd1f4c10f9f2d117f Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Tue, 30 Mar 2021 23:25:38 +0000 Subject: Unify the grid line indexing types Previously Alacritty was using two different ways to reference lines in the terminal. Either a `usize`, or a `Line(usize)`. These indexing systems both served different purposes, but made it difficult to reason about logic involving these systems because of its inconsistency. To resolve this issue, a single new `Line(i32)` type has been introduced. All existing references to lines and points now rely on this definition of a line. The indexing starts at the top of the terminal region with the line 0, which matches the line 1 used by escape sequences. Each line in the history becomes increasingly negative and the bottommost line is equal to the number of visible lines minus one. Having a system which goes into the negatives allows following the escape sequence's indexing system closely, while at the same time making it trivial to implement `Ord` for points. The Alacritty UI crate is the only place which has a different indexing system, since rendering and input puts the zero line at the top of the viewport, rather than the top of the terminal region. All instances which refer to a number of lines/columns instead of just a single Line/Column have also been changed to use a `usize` instead. This way a Line/Column will always refer to a specific place in the grid and no confusion is created by having a count of lines as a possible index into the grid storage. --- alacritty_config_derive/tests/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'alacritty_config_derive') diff --git a/alacritty_config_derive/tests/config.rs b/alacritty_config_derive/tests/config.rs index 03abf893..6838a42e 100644 --- a/alacritty_config_derive/tests/config.rs +++ b/alacritty_config_derive/tests/config.rs @@ -27,7 +27,7 @@ struct Test { #[config(deprecated = "shouldn't be hit")] field2: String, field3: Option, - #[doc("aaa")] + #[doc(hidden)] nesting: Test2, #[config(flatten)] flatten: Test3, -- cgit v1.2.3-54-g00ecf