xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DisplayBuffer: optimize Text and ReplacedBufferRange as well

Browse Source
This commit is contained in:
Maxime Coste 2013-05-02 18:57:15 +02:00
parent d238707e6d
commit 4ab5c7a203
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/display_buffer.cc
View File

@ -19,26 +19,41 @@ DisplayLine::iterator DisplayLine::split(iterator it, BufferIterator pos)
void DisplayLine::optimize() void DisplayLine::optimize()
{ {
for (auto atom_it = m_atoms.begin(); atom_it != m_atoms.end(); ++atom_it) if (m_atoms.empty())
{ return;
decltype(atom_it) next_atom_it;
while ((next_atom_it = atom_it + 1) != m_atoms.end())
{
auto& atom = *atom_it;
auto& next_atom = *next_atom_it;
if (atom.colors == next_atom.colors and auto atom_it = m_atoms.begin();
atom.attribute == next_atom.attribute and auto next_atom_it = atom_it + 1;
atom.content.type() == AtomContent::BufferRange and while (next_atom_it != m_atoms.end())
next_atom.content.type() == AtomContent::BufferRange and {
auto& atom = *atom_it;
auto& next_atom = *next_atom_it;
bool merged = false;
if (atom.colors == next_atom.colors and
atom.attribute == next_atom.attribute and
atom.content.type() == next_atom.content.type())
{
auto type = atom.content.type();
if ((type == AtomContent::BufferRange or
type == AtomContent::ReplacedBufferRange) and
next_atom.content.begin() == atom.content.end()) next_atom.content.begin() == atom.content.end())
{ {
atom.content.m_end = next_atom.content.end(); atom.content.m_end = next_atom.content.end();
atom_it = m_atoms.erase(next_atom_it) - 1; if (type == AtomContent::ReplacedBufferRange)
atom.content.m_text += next_atom.content.m_text;
merged = true;
}
if (type == AtomContent::Text)
{
atom.content.m_text += next_atom.content.m_text;
merged = true;
} }
else
break;
} }
if (merged)
next_atom_it = m_atoms.erase(next_atom_it);
else
atom_it = next_atom_it++;
} }
} }