summaryrefslogtreecommitdiffstats
path: root/window-tree.c
diff options
context:
space:
mode:
authornicm <nicm>2017-06-30 22:36:11 +0000
committernicm <nicm>2017-06-30 22:36:11 +0000
commitb565644c81a3c79580323b162806b52b74e2a2a9 (patch)
treea57debb8387f3f95c74000cf39ce816c8a149495 /window-tree.c
parent7247553c77eb9dae8eab1b7ee12b10fc70cca69c (diff)
Fix previous when we end up able to show no panes.
Diffstat (limited to 'window-tree.c')
-rw-r--r--window-tree.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/window-tree.c b/window-tree.c
index e6851531..d034e3ed 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -432,6 +432,8 @@ window_tree_draw_session(struct session *s, struct screen_write_ctx *ctx,
each = sx / n;
if (each < 24) {
n = (sx - 6) / 24;
+ if (n == 0)
+ n = 1;
each = (sx - 6) / n;
left = sx - (n * each);
@@ -440,7 +442,7 @@ window_tree_draw_session(struct session *s, struct screen_write_ctx *ctx,
screen_write_cursormove(ctx, sx - left + left / 2, sy / 2);
screen_write_puts(ctx, &grid_default_cell, "...");
- if (sx == left)
+ if (each == 0)
return;
left = 0;
} else
@@ -466,7 +468,8 @@ window_tree_draw_session(struct session *s, struct screen_write_ctx *ctx,
xasprintf(&label, " %u ", wl->idx);
len = strlen(label) / 2;
screen_write_cursormove(ctx, i * each + each / 2 - len, sy / 2);
- screen_write_puts(ctx, &gc, "%s", label);
+ if (len <= width)
+ screen_write_puts(ctx, &gc, "%s", label);
free(label);
if (i != n - 1) {
@@ -500,6 +503,8 @@ window_tree_draw_window(struct session *s, struct window *w,
each = sx / n;
if (each < 24) {
n = (sx - 6) / 24;
+ if (n == 0)
+ n = 1;
each = (sx - 6) / n;
left = sx - (n * each);
@@ -508,7 +513,7 @@ window_tree_draw_window(struct session *s, struct window *w,
screen_write_cursormove(ctx, sx - left + left / 2, sy / 2);
screen_write_puts(ctx, &grid_default_cell, "...");
- if (sx == left)
+ if (each == 0)
return;
left = 0;
} else
@@ -531,7 +536,8 @@ window_tree_draw_window(struct session *s, struct window *w,
xasprintf(&label, " %u ", i);
len = strlen(label) / 2;
screen_write_cursormove(ctx, i * each + each / 2 - len, sy / 2);
- screen_write_puts(ctx, &gc, "%s", label);
+ if (len <= width)
+ screen_write_puts(ctx, &gc, "%s", label);
free(label);
if (i != n - 1) {