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

Show cursor position in status bar

Browse Source
This commit is contained in:
Josh Holtrop 2016-09-13 22:51:51 -04:00
parent f9fd1dc754
commit b9d7e1f93e
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/Window.cc
View File

@ -406,7 +406,7 @@ void Window::draw_text()
if ((character != 0xFFFFFFFFu) &&
(character != ' ') &&
(character != '\t'))
draw_character(screen_column, screen_row, character);
draw_buffer_character(screen_column, screen_row, character);
}
if (!cursor.go_right(1))
{
@ -427,11 +427,16 @@ void Window::draw_text()
}
}
void Window::draw_character(int screen_column, int screen_row, uint32_t character)
void Window::draw_buffer_character(int screen_column, int screen_row, uint32_t character)
{
int x, y;
m_shaders.text->use();
colrow_to_xy(screen_column, screen_row, &x, &y);
draw_character(x, y, character);
}
void Window::draw_character(int x, int y, uint32_t character)
{
m_shaders.text->use();
auto g = m_font.get_glyph(character);
m_shaders.text->set_position(x, y + m_font.get_baseline_offset());
g->render();
@ -506,4 +511,13 @@ void Window::draw_status_bar()
{
draw_rect(0, m_font.get_line_height(), m_width, 1, 0.5, 0.5, 0.5, 1.0);
draw_rect(0, 0, m_width, m_font.get_line_height(), 0.0, 0.0, 0.0, 1.0);
char cursor_position[20];
sprintf(cursor_position, "%d, %d", m_cursor->line + 1, m_cursor->column + 1u);
int cursor_position_length = strlen(cursor_position);
int x = m_width - m_font.get_advance() * cursor_position_length;
for (int i = 0; i < cursor_position_length; i++)
{
draw_character(x, 0, cursor_position[i]);
x += m_font.get_advance();
}
}

3
src/gui/Window.h
View File

@ -37,7 +37,8 @@ protected:
void cursor_move(int which);
std::pair<int, PieceTable::Cursor> calculate_start_position();
void draw_text();
void draw_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 update_cursor_row(int cursor_row);
void draw_rect(int x, int y, int width, int height, float r, float g, float b, float a);
void draw_status_bar();