mirror of
https://github.com/tmux/tmux.git
synced 2026-10-10 20:24:21 +00:00
Rebased on current master without conflicts and completed the cleanup: comments above new function in longer functions, metadata comments, aligned declarations and simpler guards, consistent braces and shorter lines.
This commit is contained in:
12
tty-draw.c
12
tty-draw.c
@@ -272,18 +272,18 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int px, u_int py, u_int nx,
|
||||
/* Get the current cell. */
|
||||
grid_view_get_cell(gd, px + i, py, &gc);
|
||||
#ifdef ENABLE_IMAGES
|
||||
if (kitty_cell_is_placeholder(&gc)) {
|
||||
if (image_grid_get_placeholder(gd,
|
||||
px + i, gd->hsize + py,
|
||||
&placeholder))
|
||||
utf8_set(&gc.data, ' ');
|
||||
if (kitty_cell_is_placeholder(&gc) &&
|
||||
image_grid_get_placeholder(gd, px + i,
|
||||
gd->hsize + py, &placeholder)) {
|
||||
utf8_set(&gc.data, ' ');
|
||||
}
|
||||
#endif
|
||||
gcp = &gc;
|
||||
#ifdef ENABLE_IMAGES
|
||||
if (image_get_fallback_at(tty, s, px + i, py, &gc,
|
||||
&image_gc) == 1)
|
||||
&image_gc) == 1) {
|
||||
gcp = &image_gc;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Work out empty cells. */
|
||||
|
||||
Reference in New Issue
Block a user