Browse Source

Cleanup draw naming

master
cancel 6 years ago
parent
commit
a2183f892d
  1. 12
      tui_main.c

12
tui_main.c

@ -161,7 +161,7 @@ void tui_cursor_move_relative(Tui_cursor* tc, Usz field_h, Usz field_w,
tc->x = (Usz)x0; tc->x = (Usz)x0;
} }
void draw_tui_cursor(WINDOW* win, Glyph const* gbuffer, Usz field_h, void tdraw_tui_cursor(WINDOW* win, Glyph const* gbuffer, Usz field_h,
Usz field_w, Usz ruler_spacing_y, Usz ruler_spacing_x, Usz field_w, Usz ruler_spacing_y, Usz ruler_spacing_x,
Usz cursor_y, Usz cursor_x) { Usz cursor_y, Usz cursor_x) {
(void)ruler_spacing_y; (void)ruler_spacing_y;
@ -257,7 +257,7 @@ void undo_history_pop(Undo_history* hist, Field* out_field, Usz* out_tick_num) {
Usz undo_history_count(Undo_history* hist) { return hist->count; } Usz undo_history_count(Undo_history* hist) { return hist->count; }
void draw_ui_bar(WINDOW* win, int win_y, int win_x, const char* filename, void tdraw_hud(WINDOW* win, int win_y, int win_x, const char* filename,
Usz tick_num) { Usz tick_num) {
wmove(win, win_y, win_x); wmove(win, win_y, win_x);
wattrset(win, A_dim | Cdef_normal); wattrset(win, A_dim | Cdef_normal);
@ -269,7 +269,7 @@ void draw_ui_bar(WINDOW* win, int win_y, int win_x, const char* filename,
wclrtoeol(win); wclrtoeol(win);
} }
void draw_field(WINDOW* win, int term_h, int term_w, int pos_y, int pos_x, void tdraw_field(WINDOW* win, int term_h, int term_w, int pos_y, int pos_x,
Glyph const* gbuffer, Mark const* mbuffer, Usz field_h, Glyph const* gbuffer, Mark const* mbuffer, Usz field_h,
Usz field_w, Usz ruler_spacing_y, Usz ruler_spacing_x) { Usz field_w, Usz ruler_spacing_y, Usz ruler_spacing_x) {
enum { Bufcount = 4096 }; enum { Bufcount = 4096 };
@ -485,17 +485,17 @@ int main(int argc, char** argv) {
field_copy(&scratch_field, &field); field_copy(&scratch_field, &field);
needs_remarking = false; needs_remarking = false;
} }
draw_field(stdscr, term_height, term_width, 0, 0, field.buffer, tdraw_field(stdscr, term_height, term_width, 0, 0, field.buffer,
markmap_r.buffer, field.height, field.width, ruler_spacing_y, markmap_r.buffer, field.height, field.width, ruler_spacing_y,
ruler_spacing_x); ruler_spacing_x);
for (int y = field.height; y < term_height - 1; ++y) { for (int y = field.height; y < term_height - 1; ++y) {
wmove(stdscr, y, 0); wmove(stdscr, y, 0);
wclrtoeol(stdscr); wclrtoeol(stdscr);
} }
draw_tui_cursor(stdscr, field.buffer, field.height, field.width, tdraw_tui_cursor(stdscr, field.buffer, field.height, field.width,
ruler_spacing_y, ruler_spacing_x, tui_cursor.y, ruler_spacing_y, ruler_spacing_x, tui_cursor.y,
tui_cursor.x); tui_cursor.x);
draw_ui_bar(stdscr, term_height - 1, 0, input_file, tick_num); tdraw_hud(stdscr, term_height - 1, 0, input_file, tick_num);
int key; int key;
// ncurses gives us ERR if there was no user input. We'll sleep for 0 // ncurses gives us ERR if there was no user input. We'll sleep for 0

Loading…
Cancel
Save