mirror of https://github.com/tmux/tmux.git
Merge branch 'obsd-master'
commit
149d9cc851
2
grid.c
2
grid.c
|
@ -53,7 +53,7 @@ static const struct grid_cell grid_cleared_cell = {
|
||||||
{ { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 0, 0
|
{ { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 0, 0
|
||||||
};
|
};
|
||||||
static const struct grid_cell_entry grid_cleared_entry = {
|
static const struct grid_cell_entry grid_cleared_entry = {
|
||||||
GRID_FLAG_CLEARED, { .data = { 0, 8, 8, ' ' } }
|
{ .data = { 0, 8, 8, ' ' } }, GRID_FLAG_CLEARED
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Store cell in entry. */
|
/* Store cell in entry. */
|
||||||
|
|
2
tmux.h
2
tmux.h
|
@ -727,7 +727,6 @@ struct grid_extd_entry {
|
||||||
|
|
||||||
/* Grid cell entry. */
|
/* Grid cell entry. */
|
||||||
struct grid_cell_entry {
|
struct grid_cell_entry {
|
||||||
u_char flags;
|
|
||||||
union {
|
union {
|
||||||
u_int offset;
|
u_int offset;
|
||||||
struct {
|
struct {
|
||||||
|
@ -737,6 +736,7 @@ struct grid_cell_entry {
|
||||||
u_char data;
|
u_char data;
|
||||||
} data;
|
} data;
|
||||||
};
|
};
|
||||||
|
u_char flags;
|
||||||
} __packed;
|
} __packed;
|
||||||
|
|
||||||
/* Grid line. */
|
/* Grid line. */
|
||||||
|
|
Loading…
Reference in New Issue