aboutsummaryrefslogtreecommitdiff
path: root/screen-write.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-09-24 18:01:24 +0100
committerThomas Adam <thomas@xteddy.org>2019-09-24 18:01:24 +0100
commit2534aa4d2d0b29013065468f75fb407c6eb603c4 (patch)
tree25e5791b50406281f882e4239f29e33b240b533d /screen-write.c
parentcb1a6266921fc57991e572c898e06e8dd9f49c00 (diff)
parente8adcae0f24c6089cae9c60e7b087a00a582f9f9 (diff)
downloadrtmux-2534aa4d2d0b29013065468f75fb407c6eb603c4.tar.gz
rtmux-2534aa4d2d0b29013065468f75fb407c6eb603c4.tar.bz2
rtmux-2534aa4d2d0b29013065468f75fb407c6eb603c4.zip
Merge branch 'obsd-master'
Diffstat (limited to 'screen-write.c')
-rw-r--r--screen-write.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/screen-write.c b/screen-write.c
index 66053eaf..6c509e2c 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -100,7 +100,6 @@ void
screen_write_start(struct screen_write_ctx *ctx, struct window_pane *wp,
struct screen *s)
{
- char tmp[32];
u_int y;
memset(ctx, 0, sizeof *ctx);
@@ -119,12 +118,17 @@ screen_write_start(struct screen_write_ctx *ctx, struct window_pane *wp,
ctx->scrolled = 0;
ctx->bg = 8;
- if (wp != NULL) {
- snprintf(tmp, sizeof tmp, "pane %%%u (at %u,%u)", wp->id,
- wp->xoff, wp->yoff);
+ if (log_get_level() != 0) {
+ if (wp != NULL) {
+ log_debug("%s: size %ux%u, pane %%%u (at %u,%u)",
+ __func__, screen_size_x(ctx->s),
+ screen_size_y(ctx->s), wp->id, wp->xoff, wp->yoff);
+ } else {
+ log_debug("%s: size %ux%u, no pane",
+ __func__, screen_size_x(ctx->s),
+ screen_size_y(ctx->s));
+ }
}
- log_debug("%s: size %ux%u, %s", __func__, screen_size_x(ctx->s),
- screen_size_y(ctx->s), wp == NULL ? "no pane" : tmp);
}
/* Finish writing. */
@@ -1234,7 +1238,6 @@ screen_write_collect_scroll(struct screen_write_ctx *ctx)
for (y = s->rupper; y < s->rlower; y++) {
cl = &ctx->list[y + 1];
TAILQ_CONCAT(&ctx->list[y].items, &cl->items, entry);
- TAILQ_INIT(&cl->items);
}
}