From 6d310f0f147f6d6a962e4eb7b4721879c4ca5926 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Sat, 23 Sep 2017 16:12:52 -0400 Subject: [PATCH] BufferPane: remove some cursor-tracking fields that are now tracked by BufferView --- src/gui/BufferPane.cc | 8 +------- src/gui/BufferPane.h | 5 ----- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/gui/BufferPane.cc b/src/gui/BufferPane.cc index a30ce90..c17bcfb 100644 --- a/src/gui/BufferPane.cc +++ b/src/gui/BufferPane.cc @@ -19,13 +19,10 @@ int BufferPane::Cwd::operator()(uint32_t character) BufferPane::BufferPane(Window * window, std::shared_ptr buffer) : m_window(window), m_buffer(buffer), m_cwd(window) { - m_cursor_screen_row = 0; - m_scroll_offset = 5; m_iterator = buffer->add_cursor(); m_buffer_view = std::make_shared(buffer, m_iterator, m_cwd); m_buffer_view->set_scroll_offset(5); m_buffer_view->update(); - m_target_column = 0; m_show_status_bar = true; m_command_mode = false; m_focused = false; @@ -257,10 +254,7 @@ void BufferPane::insert_code_point(uint32_t code_point) } else { - if (code_point == '\n') - { - m_cursor_screen_row++; - } + /* TODO: adjust cursor screen row in m_buffer_view. */ m_buffer->insert_code_point(*m_iterator, code_point); } m_buffer_view->update(); diff --git a/src/gui/BufferPane.h b/src/gui/BufferPane.h index 5039d88..e539542 100644 --- a/src/gui/BufferPane.h +++ b/src/gui/BufferPane.h @@ -77,13 +77,8 @@ protected: std::shared_ptr m_buffer_view; int m_rows; int m_columns; - int m_scroll_offset; - int m_cursor_screen_row; - int m_cursor_screen_column; - int m_cursor_row_offset; std::shared_ptr m_iterator; std::list> m_screen_lines; - int m_target_column; bool m_show_status_bar; bool m_command_mode; bool m_focused;