wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 22:01:47 +03:00
Code Issues Projects Releases Wiki Activity

termwiz: micro-optimize ClusteredLine::new(), set_last_wrapped

Browse Source
This commit is contained in:
Wez Furlong 2022-07-24 08:18:23 -07:00
parent c2dfba27f3
commit 656f725623
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
termwiz/src/surface/line.rs
View File

@ -125,7 +125,7 @@ impl Line {
pub fn new(seqno: SequenceNo) -> Self { pub fn new(seqno: SequenceNo) -> Self {
Self { Self {
bits: LineBits::NONE, bits: LineBits::NONE,
cells: CellStorage::C(ClusteredLine::default()), cells: CellStorage::C(ClusteredLine::new()),
seqno, seqno,
zones: vec![], zones: vec![],
} }
@ -956,10 +956,13 @@ impl Line {
pub fn set_last_cell_was_wrapped(&mut self, wrapped: bool, seqno: SequenceNo) { pub fn set_last_cell_was_wrapped(&mut self, wrapped: bool, seqno: SequenceNo) {
self.update_last_change_seqno(seqno); self.update_last_change_seqno(seqno);
if let CellStorage::C(cl) = &mut self.cells { if let CellStorage::C(cl) = &mut self.cells {
if cl.len() > 0 { if cl.len() == 0 {
cl.set_last_cell_was_wrapped(wrapped); // Need to mark that implicit space as wrapped, so
return; // explicitly add it
cl.append(Cell::blank());
} }
cl.set_last_cell_was_wrapped(wrapped);
return;
} }
let cells = self.coerce_vec_storage(); let cells = self.coerce_vec_storage();
@ -1258,7 +1261,7 @@ struct Cluster {
} }
#[cfg_attr(feature = "use_serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "use_serde", derive(Serialize, Deserialize))]
#[derive(Default, Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
struct ClusteredLine { struct ClusteredLine {
text: String, text: String,
#[cfg_attr( #[cfg_attr(
@ -1310,6 +1313,15 @@ where
} }
impl ClusteredLine { impl ClusteredLine {
pub fn new() -> Self {
Self {
text: String::with_capacity(80),
is_double_wide: None,
clusters: vec![],
len: 0,
}
}
fn to_cell_vec(&self) -> Vec<Cell> { fn to_cell_vec(&self) -> Vec<Cell> {
let mut cells = vec![]; let mut cells = vec![];
@ -1915,7 +1927,7 @@ C(
#[test] #[test]
fn cluster_append() { fn cluster_append() {
let mut cl = ClusteredLine::default(); let mut cl = ClusteredLine::new();
cl.append(Cell::new_grapheme("h", CellAttributes::default(), None)); cl.append(Cell::new_grapheme("h", CellAttributes::default(), None));
cl.append(Cell::new_grapheme("e", CellAttributes::default(), None)); cl.append(Cell::new_grapheme("e", CellAttributes::default(), None));
cl.append(Cell::new_grapheme("l", bold(), None)); cl.append(Cell::new_grapheme("l", bold(), None));