Fix type - attributes should be u_char not int.

This commit is contained in:
Nicholas Marriott 2009-11-26 22:47:14 +00:00
parent c2eb869f72
commit e7f4319ac6

11
tty.c
View File

@ -36,8 +36,8 @@ void tty_fill_acs(struct tty *);
int tty_try_256(struct tty *, u_char, const char *); int tty_try_256(struct tty *, u_char, const char *);
int tty_try_88(struct tty *, u_char, const char *); int tty_try_88(struct tty *, u_char, const char *);
void tty_colours(struct tty *, const struct grid_cell *, int *); void tty_colours(struct tty *, const struct grid_cell *, u_char *);
void tty_colours_fg(struct tty *, const struct grid_cell *, int *); void tty_colours_fg(struct tty *, const struct grid_cell *, u_char *);
void tty_colours_bg(struct tty *, const struct grid_cell *); void tty_colours_bg(struct tty *, const struct grid_cell *);
void tty_redraw_region(struct tty *, const struct tty_ctx *); void tty_redraw_region(struct tty *, const struct tty_ctx *);
@ -1145,8 +1145,7 @@ void
tty_attributes(struct tty *tty, const struct grid_cell *gc) tty_attributes(struct tty *tty, const struct grid_cell *gc)
{ {
struct grid_cell *tc = &tty->cell, gc2; struct grid_cell *tc = &tty->cell, gc2;
u_char changed; u_char changed, new_attr;
u_int new_attr;
/* If the character is space, don't care about foreground. */ /* If the character is space, don't care about foreground. */
if (gc->data == ' ' && !(gc->flags & GRID_FLAG_UTF8)) { if (gc->data == ' ' && !(gc->flags & GRID_FLAG_UTF8)) {
@ -1217,7 +1216,7 @@ tty_attributes(struct tty *tty, const struct grid_cell *gc)
} }
void void
tty_colours(struct tty *tty, const struct grid_cell *gc, int *attr) tty_colours(struct tty *tty, const struct grid_cell *gc, u_char *attr)
{ {
struct grid_cell *tc = &tty->cell; struct grid_cell *tc = &tty->cell;
u_char fg = gc->fg, bg = gc->bg, flags = gc->flags; u_char fg = gc->fg, bg = gc->bg, flags = gc->flags;
@ -1284,7 +1283,7 @@ tty_colours(struct tty *tty, const struct grid_cell *gc, int *attr)
} }
void void
tty_colours_fg(struct tty *tty, const struct grid_cell *gc, int *attr) tty_colours_fg(struct tty *tty, const struct grid_cell *gc, u_char *attr)
{ {
struct grid_cell *tc = &tty->cell; struct grid_cell *tc = &tty->cell;
u_char fg = gc->fg; u_char fg = gc->fg;