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

Avoid redundant calls to get_face in highlight_selections

Browse Source
This commit is contained in:
Maxime Coste 2015-09-24 13:55:06 +01:00
parent e601bd5fe8
commit 12ef466f3a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/highlighters.cc
View File

@ -822,7 +822,13 @@ void highlight_selections(const Context& context, HighlightFlags flags, DisplayB
{ {
if (flags != HighlightFlags::Highlight) if (flags != HighlightFlags::Highlight)
return; return;
const auto& buffer = context.buffer(); const auto& buffer = context.buffer();
const Face primary_face = get_face("PrimarySelection");
const Face secondary_face = get_face("SecondarySelection");
const Face primary_cursor_face = get_face("PrimaryCursor");
const Face secondary_cursor_face = get_face("SecondaryCursor");
for (size_t i = 0; i < context.selections().size(); ++i) for (size_t i = 0; i < context.selections().size(); ++i)
{ {
auto& sel = context.selections()[i]; auto& sel = context.selections()[i];
@ -831,17 +837,15 @@ void highlight_selections(const Context& context, HighlightFlags flags, DisplayB
ByteCoord end = forward ? (ByteCoord)sel.cursor() : buffer.char_next(sel.anchor()); ByteCoord end = forward ? (ByteCoord)sel.cursor() : buffer.char_next(sel.anchor());
const bool primary = (i == context.selections().main_index()); const bool primary = (i == context.selections().main_index());
Face sel_face = get_face(primary ? "PrimarySelection" : "SecondarySelection");
highlight_range(display_buffer, begin, end, false, highlight_range(display_buffer, begin, end, false,
apply_face(sel_face)); apply_face(primary ? primary_face : secondary_face));
} }
for (size_t i = 0; i < context.selections().size(); ++i) for (size_t i = 0; i < context.selections().size(); ++i)
{ {
auto& sel = context.selections()[i]; auto& sel = context.selections()[i];
const bool primary = (i == context.selections().main_index()); const bool primary = (i == context.selections().main_index());
Face cur_face = get_face(primary ? "PrimaryCursor" : "SecondaryCursor");
highlight_range(display_buffer, sel.cursor(), buffer.char_next(sel.cursor()), false, highlight_range(display_buffer, sel.cursor(), buffer.char_next(sel.cursor()), false,
apply_face(cur_face)); apply_face(primary ? primary_cursor_face : secondary_cursor_face));
} }
} }