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

Access selections via helper methods

Browse Source 
The next commit changes the selections to a history of
selections. Today we directly access the selections data member. Let's
instead use an accessor method, to reduce the number of changes in
the next commit.
This commit is contained in:
Johannes Altmanninger 2022-08-06 21:51:35 +02:00
parent aeae2fba37
commit 611bdebf3c
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/context.cc
View File

@ -26,7 +26,7 @@ Buffer& Context::buffer() const
{ {
if (not has_buffer()) if (not has_buffer())
throw runtime_error("no buffer in context"); throw runtime_error("no buffer in context");
return const_cast<Buffer&>((*m_selections).buffer()); return const_cast<Buffer&>(selections(false).buffer());
} }
Window& Context::window() const Window& Context::window() const
@ -223,24 +223,23 @@ Buffer* Context::last_buffer() const
return previous_buffer != jump_list.rend() ? &previous_buffer->buffer() : nullptr; return previous_buffer != jump_list.rend() ? &previous_buffer->buffer() : nullptr;
} }
SelectionList& Context::selections() SelectionList& Context::selections(bool update)
{ {
if (not m_selections) if (not m_selections)
throw runtime_error("no selections in context"); throw runtime_error("no selections in context");
if (update)
(*m_selections).update(); (*m_selections).update();
return *m_selections; return *m_selections;
} }
SelectionList& Context::selections_write_only() SelectionList& Context::selections_write_only()
{ {
if (not m_selections) return selections(false);
throw runtime_error("no selections in context");
return *m_selections;
} }
const SelectionList& Context::selections() const const SelectionList& Context::selections(bool update) const
{ {
return const_cast<Context&>(*this).selections(); return const_cast<Context&>(*this).selections(update);
} }
Vector<String> Context::selections_content() const Vector<String> Context::selections_content() const
@ -277,7 +276,7 @@ void Context::end_edition()
StringView Context::main_sel_register_value(StringView reg) const StringView Context::main_sel_register_value(StringView reg) const
{ {
size_t index = m_selections ? (*m_selections).main_index() : 0; size_t index = has_buffer() ? selections(false).main_index() : 0;
return RegisterManager::instance()[reg].get_main(*this, index); return RegisterManager::instance()[reg].get_main(*this, index);
} }

4
src/context.hh
View File

@ -83,8 +83,8 @@ public:
InputHandler& input_handler() const; InputHandler& input_handler() const;
bool has_input_handler() const { return (bool)m_input_handler; } bool has_input_handler() const { return (bool)m_input_handler; }
SelectionList& selections(); SelectionList& selections(bool update = true);
const SelectionList& selections() const; const SelectionList& selections(bool update = true) const;
Vector<String> selections_content() const; Vector<String> selections_content() const;
// Return potentially out of date selections // Return potentially out of date selections