circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some customize mode drawing nits.

pull/2209/head
Nicholas Marriott 2020-05-08 22:09:31 +01:00
parent a61cbf1c33
commit 5e97d79eb1
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
key-bindings.c
View File

@ -278,7 +278,7 @@ key_bindings_init(void)
"bind -N 'Toggle the marked pane' m select-pane -m",
"bind -N 'Select the next window' n next-window",
"bind -N 'Select the next pane' o select-pane -t:.+",
"bind -N 'Customizeoptions' C customize-mode",
"bind -N 'Customize options' C customize-mode",
"bind -N 'Select the previous pane' p previous-window",
"bind -N 'Display pane numbers' q display-panes",
"bind -N 'Redraw the current client' r refresh-client",

3
mode-tree.c
View File

@ -708,7 +708,8 @@ mode_tree_draw(struct mode_tree_data *mtd)
else
screen_write_puts(&ctx, &gc0, "active");
screen_write_puts(&ctx, &gc0, ") ");
}
} else
screen_write_puts(&ctx, &gc0, " ");
}
free(text);

2
screen-write.c
View File

@ -428,7 +428,7 @@ screen_write_text(struct screen_write_ctx *ctx, u_int width, u_int lines,
idx = next;
}
screen_write_cursormove(ctx, cx, s->cy + 1, 0);
screen_write_cursormove(ctx, cx, s->cy, 0);
free(text);
}

6
window-customize.c
View File

@ -492,6 +492,9 @@ window_customize_draw(void *modedata, void *itemdata,
else
text = oe->text;
screen_write_text(ctx, sx, sy, &grid_default_cell, "%s", text);
if (s->cy >= cy + sy - 1)
goto out;
screen_write_cursormove(ctx, s->cx, s->cy + 1, 0);
if (s->cy >= cy + sy - 1)
goto out;
@ -524,6 +527,9 @@ window_customize_draw(void *modedata, void *itemdata,
if (s->cy > cy + sy - 1)
goto out;
}
screen_write_cursormove(ctx, s->cx, s->cy + 1, 0);
if (s->cy >= cy + sy - 1)
goto out;
value = options_to_string(o, idx, 0);
if (oe != NULL && idx == -1) {