josh/jes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid empty screen rows if there is buffer content to fill them

Browse Source
This commit is contained in:
Josh Holtrop 2016-11-09 22:43:04 -05:00
parent 74b9421f30
commit afd584566c
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/gui/Window.cc
View File

@ -365,13 +365,19 @@ void Window::cursor_move(int which)
#endif #endif
} }
void Window::update_cursor_row(int cursor_row) void Window::update_cursor_row()
{ {
m_cursor_row = std::max(m_scroll_offset, std::min(m_rows - m_scroll_offset - 1, cursor_row)); int so = effective_scroll_offset();
int rows_above = screen_rows_above_cursor(std::max(so, m_cursor_row));
int rows_below = screen_rows_below_cursor(std::max(so, m_rows - m_cursor_row - 1));
int min_rows_to_leave_above = std::min(rows_above, so);
int min_rows_to_leave_below = std::min(rows_below, so);
m_cursor_row = std::max(min_rows_to_leave_above, std::min(m_rows - min_rows_to_leave_below - 1, m_cursor_row));
} }
void Window::draw_buffer() void Window::draw_buffer()
{ {
update_cursor_row();
} }
void Window::draw_buffer_character(int screen_column, int screen_row, uint32_t character) void Window::draw_buffer_character(int screen_column, int screen_row, uint32_t character)
@ -403,7 +409,6 @@ void Window::resize()
if (m_columns < 1) if (m_columns < 1)
m_columns = 1; m_columns = 1;
m_rows = (m_height - 2) / m_font.get_line_height(); m_rows = (m_height - 2) / m_font.get_line_height();
update_cursor_row(m_cursor_row);
} }
void Window::redraw() void Window::redraw()
@ -533,3 +538,30 @@ uint32_t Window::get_shifted(uint32_t keysym)
return keysym; return keysym;
} }
int Window::screen_rows_below_cursor(int stop_at)
{
GapBuffer::Cursor cursor = *m_cursor;
size_t column = cursor.column();
cursor.go_end_of_line(false);
int rows = (cursor.column() / m_columns) - (column / m_columns);
while ((rows < stop_at) && cursor.go_down(0u))
{
cursor.go_end_of_line(false);
rows += (cursor.column() / m_columns) + 1;
}
return rows;
}
int Window::screen_rows_above_cursor(int stop_at)
{
GapBuffer::Cursor cursor = *m_cursor;
int rows = cursor.column() / m_columns;
while ((rows < stop_at) && cursor.go_up(0u))
{
GapBuffer::Cursor cursor2 = cursor;
cursor2.go_end_of_line(false);
rows += (cursor2.column() / m_columns) + 1;
}
return rows;
}

8
src/gui/Window.h
View File

@ -47,11 +47,17 @@ protected:
void draw_buffer(); void draw_buffer();
void draw_buffer_character(int screen_column, int screen_row, uint32_t character); void draw_buffer_character(int screen_column, int screen_row, uint32_t character);
void draw_character(int x, int y, uint32_t character); void draw_character(int x, int y, uint32_t character);
void update_cursor_row(int cursor_row); void update_cursor_row();
void draw_rect(int x, int y, int width, int height, float r, float g, float b, float a); void draw_rect(int x, int y, int width, int height, float r, float g, float b, float a);
void draw_status_bar(); void draw_status_bar();
uint32_t get_keyval(SDL_Keycode keysym); uint32_t get_keyval(SDL_Keycode keysym);
uint32_t get_shifted(uint32_t keysym); uint32_t get_shifted(uint32_t keysym);
int screen_rows_below_cursor(int stop_at);
int screen_rows_above_cursor(int stop_at);
int effective_scroll_offset()
{
return std::min(m_scroll_offset, (m_rows - 1) / 2);
}
SDL_Window * m_window; SDL_Window * m_window;
bool m_exit_requested; bool m_exit_requested;