diff options
author | nicm <nicm> | 2020-05-25 18:57:24 +0000 |
---|---|---|
committer | nicm <nicm> | 2020-05-25 18:57:24 +0000 |
commit | 6f03e49e68dfe0d9c0c7d49079c4383b26aca916 (patch) | |
tree | 86a94f09a878fe2d32cd3ef29a69db242208897f /grid.c | |
parent | 35779d655d7eec4b904eeb3a670bbef02aba016d (diff) | |
download | rtmux-6f03e49e68dfe0d9c0c7d49079c4383b26aca916.tar.gz rtmux-6f03e49e68dfe0d9c0c7d49079c4383b26aca916.tar.bz2 rtmux-6f03e49e68dfe0d9c0c7d49079c4383b26aca916.zip |
Use the internal representation for UTF-8 keys instead of wchar_t and
drop some code only needed for that.
Diffstat (limited to 'grid.c')
-rw-r--r-- | grid.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -76,7 +76,7 @@ grid_need_extended_cell(const struct grid_cell_entry *gce, 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 @@ grid_get_cell1(struct grid_line *gl, u_int px, struct grid_cell *gc) 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 @@ grid_set_cell(struct grid *gd, u_int px, u_int py, const struct grid_cell *gc) 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 |