From 309b722df94a365d71198afc6803b3d0f42c0d47 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Tue, 27 Sep 2011 18:45:22 +0000 Subject: [PATCH] Window: cursors are now implicit, taken from current selections Window hence guarantees that there is always at least one selection. --- src/main.cc | 2 +- src/window.cc | 151 +++++++++++++++++++++++--------------------------- src/window.hh | 13 ++--- 3 files changed, 76 insertions(+), 90 deletions(-) diff --git a/src/main.cc b/src/main.cc index 67a13363..f5992f0d 100644 --- a/src/main.cc +++ b/src/main.cc @@ -228,7 +228,7 @@ void do_insert(Window& window, bool append = false) draw_window(window); while(true) { - const WindowCoord& pos = inserter.cursors().back(); + const WindowCoord& pos = window.cursor_position(); move(pos.line, pos.column); char c = getch(); diff --git a/src/window.cc b/src/window.cc index e73ef4f1..85ab632d 100644 --- a/src/window.cc +++ b/src/window.cc @@ -36,28 +36,37 @@ private: Window::Window(Buffer& buffer) : m_buffer(buffer), m_position(0, 0), - m_cursor(0, 0), m_dimensions(0, 0), m_current_inserter(nullptr) { + m_selections.push_back(Selection(buffer.begin(), buffer.begin())); +} + +void Window::check_invariant() const +{ + assert(not m_selections.empty()); +} + +WindowCoord Window::cursor_position() const +{ + check_invariant(); + return line_and_column_at(m_selections.back().last()); } void Window::erase() { scoped_undo_group undo_group(m_buffer); - if (m_selections.empty()) - { - BufferIterator cursor = iterator_at(m_cursor); - m_buffer.erase(cursor, cursor+1); - } + erase_noundo(); +} +void Window::erase_noundo() +{ + check_invariant(); for (auto& sel : m_selections) { m_buffer.erase(sel.begin(), sel.end()); sel = Selection(sel.begin(), sel.begin()); } - if (not m_selections.empty()) - m_cursor = line_and_column_at(m_selections.back().last()); } static WindowCoord measure_string(const Window::String& string) @@ -79,13 +88,11 @@ static WindowCoord measure_string(const Window::String& string) void Window::insert(const String& string) { scoped_undo_group undo_group(m_buffer); + insert_noundo(string); +} - if (m_selections.empty()) - { - m_buffer.insert(iterator_at(m_cursor), string); - move_cursor(measure_string(string)); - } - +void Window::insert_noundo(const String& string) +{ for (auto& sel : m_selections) { m_buffer.insert(sel.begin(), string); @@ -95,19 +102,14 @@ void Window::insert(const String& string) void Window::append(const String& string) { - if (m_selections.empty()) - { - move_cursor(WindowCoord(0 , 1)); - insert(string); - } - else - { - scoped_undo_group undo_group(m_buffer); - for (auto& sel : m_selections) - { - m_buffer.insert(sel.end(), string); - } - } + scoped_undo_group undo_group(m_buffer); + append_noundo(string); +} + +void Window::append_noundo(const String& string) +{ + for (auto& sel : m_selections) + m_buffer.insert(sel.end(), string); } bool Window::undo() @@ -144,15 +146,22 @@ WindowCoord Window::line_and_column_at(const BufferIterator& iterator) const void Window::empty_selections() { + check_invariant(); + Selection sel = Selection(m_selections.back().last(), + m_selections.back().last()); m_selections.clear(); + m_selections.push_back(std::move(sel)); } void Window::select(bool append, const Selector& selector) { - if (not append or m_selections.empty()) + check_invariant(); + + if (not append) { - empty_selections(); - m_selections.push_back(selector(iterator_at(m_cursor))); + Selection sel = selector(m_selections.back().last()); + m_selections.clear(); + m_selections.push_back(std::move(sel)); } else { @@ -161,32 +170,27 @@ void Window::select(bool append, const Selector& selector) sel = Selection(sel.first(), selector(sel.last()).last()); } } - m_cursor = line_and_column_at(m_selections.back().last()); scroll_to_keep_cursor_visible_ifn(); } BufferString Window::selection_content() const { - if (m_selections.empty()) - { - BufferIterator it = iterator_at(m_cursor); - return m_buffer.string(it, it+1); - } - else - return m_buffer.string(m_selections.back().begin(), - m_selections.back().end()); + check_invariant(); + + return m_buffer.string(m_selections.back().begin(), + m_selections.back().end()); } void Window::move_cursor(const WindowCoord& offset) { - move_cursor_to(m_cursor + offset); + move_cursor_to(cursor_position() + offset); } void Window::move_cursor_to(const WindowCoord& new_pos) { - BufferCoord target_position = window_to_buffer(new_pos); - - m_cursor = buffer_to_window(m_buffer.clamp(target_position)); + BufferIterator target = iterator_at(new_pos); + m_selections.clear(); + m_selections.push_back(Selection(target, target)); scroll_to_keep_cursor_visible_ifn(); } @@ -234,26 +238,25 @@ void Window::set_dimensions(const WindowCoord& dimensions) void Window::scroll_to_keep_cursor_visible_ifn() { - if (m_cursor.line < 0) + check_invariant(); + + WindowCoord cursor = line_and_column_at(m_selections.back().last()); + if (cursor.line < 0) { - m_position.line = std::max(m_position.line + m_cursor.line, 0); - m_cursor.line = 0; + m_position.line = std::max(m_position.line + cursor.line, 0); } - else if (m_cursor.line >= m_dimensions.line) + else if (cursor.line >= m_dimensions.line) { - m_position.line += m_cursor.line - (m_dimensions.line - 1); - m_cursor.line = m_dimensions.line - 1; + m_position.line += cursor.line - (m_dimensions.line - 1); } - if (m_cursor.column < 0) + if (cursor.column < 0) { - m_position.column = std::max(m_position.column + m_cursor.column, 0); - m_cursor.column = 0; + m_position.column = std::max(m_position.column + cursor.column, 0); } - else if (m_cursor.column >= m_dimensions.column) + else if (cursor.column >= m_dimensions.column) { - m_position.column += m_cursor.column - (m_dimensions.column - 1); - m_cursor.column = m_dimensions.column - 1; + m_position.column += cursor.column - (m_dimensions.column - 1); } } @@ -262,21 +265,12 @@ IncrementalInserter::IncrementalInserter(Window& window, bool append) { assert(not m_window.m_current_inserter); m_window.m_current_inserter = this; + m_window.check_invariant(); - if (m_window.m_selections.empty()) + for (auto& sel : m_window.m_selections) { - WindowCoord pos = m_window.m_cursor; - if (append) - pos += WindowCoord(0, 1); - m_cursors.push_back(pos); - } - else - { - for (auto& sel : m_window.m_selections) - { - const BufferIterator& pos = append ? sel.end() : sel.begin(); - m_cursors.push_back(m_window.line_and_column_at(pos)); - } + const BufferIterator& pos = append ? sel.end() : sel.begin(); + sel = Selection(pos, pos); } m_window.m_buffer.begin_undo_group(); } @@ -291,29 +285,22 @@ IncrementalInserter::~IncrementalInserter() void IncrementalInserter::insert(const Window::String& string) { - for (auto& cursor : m_cursors) - { - m_window.m_buffer.insert(m_window.iterator_at(cursor), string); - move_cursor(measure_string(string)); - } + m_window.insert_noundo(string); } void IncrementalInserter::erase() { - for (auto& cursor : m_cursors) - { - BufferIterator pos = m_window.iterator_at(cursor); - m_window.m_buffer.erase(pos - 1, pos); - move_cursor(WindowCoord(0, -1)); - } + move_cursor(WindowCoord(0, -1)); + m_window.erase_noundo(); } void IncrementalInserter::move_cursor(const WindowCoord& offset) { - for (auto& cursor : m_cursors) + for (auto& sel : m_window.m_selections) { - BufferCoord target = m_window.window_to_buffer(cursor + offset); - cursor = m_window.buffer_to_window(m_window.m_buffer.clamp(target)); + WindowCoord pos = m_window.line_and_column_at(sel.last()); + BufferIterator it = m_window.iterator_at(pos + offset); + sel = Selection(it, it); } } diff --git a/src/window.hh b/src/window.hh index 4314da8e..911e9ceb 100644 --- a/src/window.hh +++ b/src/window.hh @@ -50,7 +50,7 @@ public: void append(const String& string); const BufferCoord& position() const { return m_position; } - const WindowCoord& cursor_position() const { return m_cursor; } + WindowCoord cursor_position() const; Buffer& buffer() const { return m_buffer; } @@ -82,14 +82,18 @@ private: Window(Buffer& buffer); Window(const Window&) = delete; + void check_invariant() const; void scroll_to_keep_cursor_visible_ifn(); + void erase_noundo(); + void insert_noundo(const String& string); + void append_noundo(const String& string); + friend class IncrementalInserter; IncrementalInserter* m_current_inserter; Buffer& m_buffer; BufferCoord m_position; - WindowCoord m_cursor; WindowCoord m_dimensions; SelectionList m_selections; DisplayBuffer m_display_buffer; @@ -98,8 +102,6 @@ private: class IncrementalInserter { public: - typedef std::vector CursorList; - IncrementalInserter(Window& window, bool append = false); ~IncrementalInserter(); @@ -107,11 +109,8 @@ public: void erase(); void move_cursor(const WindowCoord& offset); - const CursorList& cursors() const { return m_cursors; } - private: Window& m_window; - std::vector m_cursors; }; }