Fixing typo and function name inconsistencies

This commit is contained in:
Julien Palard 2011-10-16 12:54:50 +02:00
parent 5da2786c14
commit 9f85b7ff90
4 changed files with 10 additions and 10 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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

View File

@ -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)
{