=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- src/usr.bin/tmux/grid.c 2019/05/26 17:34:45 1.95 +++ src/usr.bin/tmux/grid.c 2019/06/27 15:17:41 1.96 @@ -1,4 +1,4 @@ -/* $OpenBSD: grid.c,v 1.95 2019/05/26 17:34:45 nicm Exp $ */ +/* $OpenBSD: grid.c,v 1.96 2019/06/27 15:17:41 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -37,12 +37,12 @@ /* Default grid cell data. */ const struct grid_cell grid_default_cell = { - 0, 0, 8, 8, { { ' ' }, 0, 1, 1 } + 0, 0, 8, 8, 0, { { ' ' }, 0, 1, 1 } }; /* Cleared grid cell data. */ const struct grid_cell grid_cleared_cell = { - GRID_FLAG_CLEARED, 0, 8, 8, { { ' ' }, 0, 1, 1 } + GRID_FLAG_CLEARED, 0, 8, 8, 0, { { ' ' }, 0, 1, 1 } }; static const struct grid_cell_entry grid_cleared_entry = { GRID_FLAG_CLEARED, { .data = { 0, 8, 8, ' ' } } @@ -81,6 +81,8 @@ if (gc->data.size != 1 || gc->data.width != 1) return (1); if ((gc->fg & COLOUR_FLAG_RGB) || (gc->bg & COLOUR_FLAG_RGB)) + return (1); + if (gc->us != 0) /* only supports 256 or RGB */ return (1); return (0); }