diff --git a/src/hl_vt100.c b/src/hl_vt100.c index 091b6b6..b96150d 100644 --- a/src/hl_vt100.c +++ b/src/hl_vt100.c @@ -133,7 +133,7 @@ void vt100_headless_fork(struct vt100_headless *this, } else { - this->term = vt100_init(this, lw_terminal_default_unimplemented); + this->term = lw_terminal_vt100_init(this, lw_terminal_default_unimplemented); this->term->master_write = master_write; ioctl(this->master, TIOCSWINSZ, &winsize); main_loop(this); diff --git a/src/lw_terminal_vt100.c b/src/lw_terminal_vt100.c index b5f81b0..40ea664 100644 --- a/src/lw_terminal_vt100.c +++ b/src/lw_terminal_vt100.c @@ -170,7 +170,7 @@ static void set(struct lw_terminal_vt100 *headless_term, } -char vt100_get(struct lw_terminal_vt100 *vt100, unsigned int x, unsigned int y) +char lw_terminal_vt100_get(struct lw_terminal_vt100 *vt100, unsigned int x, unsigned int y) { if (y < vt100->margin_top || y > vt100->margin_bottom) return vt100->frozen_screen[FROZEN_SCREEN_PTR(vt100, x, y)]; @@ -883,7 +883,7 @@ static void vt100_write(struct lw_terminal *term_emul, char c) vt100->x += 1; } -const char **vt100_getlines(struct lw_terminal_vt100 *vt100) +const char **lw_terminal_vt100_getlines(struct lw_terminal_vt100 *vt100) { unsigned int y; @@ -895,7 +895,7 @@ const char **vt100_getlines(struct lw_terminal_vt100 *vt100) return (const char **)vt100->lines; } -struct lw_terminal_vt100 *vt100_init(void *user_data, +struct lw_terminal_vt100 *lw_terminal_vt100_init(void *user_data, void (*unimplemented)(struct lw_terminal* term_emul, char *seq, char chr)) { struct lw_terminal_vt100 *this; @@ -970,7 +970,7 @@ void lw_terminal_vt100_read_str(struct lw_terminal_vt100 *this, char *buffer) lw_terminal_read_str(this->lw_terminal, buffer); } -void lw_terminal_this_destroy(struct lw_terminal_vt100 *this) +void lw_terminal_vt100_destroy(struct lw_terminal_vt100 *this) { lw_terminal_destroy(this->lw_terminal); free(this->screen); diff --git a/src/lw_terminal_vt100.h b/src/lw_terminal_vt100.h index 95fde4b..8cffb84 100644 --- a/src/lw_terminal_vt100.h +++ b/src/lw_terminal_vt100.h @@ -66,12 +66,12 @@ struct lw_terminal_vt100 void *user_data; }; -struct lw_terminal_vt100 *vt100_init(void *user_data, +struct lw_terminal_vt100 *lw_terminal_vt100_init(void *user_data, void (*unimplemented)(struct lw_terminal* term_emul, char *seq, char chr)); -char vt100_get(struct lw_terminal_vt100 *vt100, unsigned int x, unsigned int y); -const char **vt100_getlines(struct lw_terminal_vt100 *vt100); -void lw_terminal_this_destroy(struct lw_terminal_vt100 *this); +char lw_terminal_vt100_get(struct lw_terminal_vt100 *vt100, unsigned int x, unsigned int y); +const char **lw_terminal_vt100_getlines(struct lw_terminal_vt100 *vt100); +void lw_terminal_vt100_destroy(struct lw_terminal_vt100 *this); void lw_terminal_vt100_read_str(struct lw_terminal_vt100 *this, char *buffer); #endif diff --git a/src/test.c b/src/test.c index b85e341..edb12f9 100644 --- a/src/test.c +++ b/src/test.c @@ -11,7 +11,7 @@ void disp(struct vt100_headless *vt100) unsigned int y; const char **lines; - lines = vt100_getlines(vt100->term); + lines = lw_terminal_vt100_getlines(vt100->term); write(1, "\n", 1); for (y = 0; y < vt100->term->height; ++y) {