=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- src/usr.bin/tmux/grid.c 2020/05/25 18:19:29 1.111 +++ src/usr.bin/tmux/grid.c 2020/05/25 18:57:24 1.112 @@ -1,4 +1,4 @@ -/* $OpenBSD: grid.c,v 1.111 2020/05/25 18:19:29 nicm Exp $ */ +/* $OpenBSD: grid.c,v 1.112 2020/05/25 18:57:24 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -76,7 +76,7 @@ return (1); if (gc->attr > 0xff) return (1); - if (gc->data.size != 1 || gc->data.width != 1) + if (gc->data.size > 1 || gc->data.width > 1) return (1); if ((gc->fg & COLOUR_FLAG_RGB) || (gc->bg & COLOUR_FLAG_RGB)) return (1); @@ -496,6 +496,7 @@ gc->fg = gee->fg; gc->bg = gee->bg; gc->us = gee->us; + log_debug("!!! %x", gc->flags); utf8_to_data(gee->data, &gc->data); } return; @@ -541,6 +542,7 @@ gl->cellused = px + 1; gce = &gl->celldata[px]; + if (gc->flags & GRID_FLAG_PADDING) log_debug("!!! padding %d\n", grid_need_extended_cell(gce, gc)); if (grid_need_extended_cell(gce, gc)) grid_extended_cell(gl, gce, gc); else