circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-25 02:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-07-04 14:01:15 +01:00
commit feb044bd2d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mode-tree.c
View File

@ -445,7 +445,7 @@ void
mode_tree_draw(struct mode_tree_data *mtd) mode_tree_draw(struct mode_tree_data *mtd)
{ {
struct window_pane *wp = mtd->wp; struct window_pane *wp = mtd->wp;
struct screen *s = &mtd->screen, *box; struct screen *s = &mtd->screen, *box = NULL;
struct mode_tree_line *line; struct mode_tree_line *line;
struct mode_tree_item *mti; struct mode_tree_item *mti;
struct options *oo = wp->window->options; struct options *oo = wp->window->options;
@ -571,7 +571,8 @@ mode_tree_draw(struct mode_tree_data *mtd)
box_x = w - 4; box_x = w - 4;
box_y = sy - h - 2; box_y = sy - h - 2;
box = mtd->drawcb(mtd->modedata, mti->itemdata, box_x, box_y); if (box_x != 0 && box_y != 0)
box = mtd->drawcb(mtd->modedata, mti->itemdata, box_x, box_y);
if (box != NULL) { if (box != NULL) {
screen_write_cursormove(&ctx, 2, h + 1); screen_write_cursormove(&ctx, 2, h + 1);
screen_write_copy(&ctx, box, 0, 0, box_x, box_y, NULL, NULL); screen_write_copy(&ctx, box, 0, 0, box_x, box_y, NULL, NULL);

4
window-tree.c
View File

@ -422,8 +422,6 @@ window_tree_draw_session(struct session *s, struct screen_write_ctx *ctx,
char *label; char *label;
size_t len; size_t len;
if (sx == 0)
return;
total = winlink_count(&s->windows); total = winlink_count(&s->windows);
memcpy(&gc, &grid_default_cell, sizeof gc); memcpy(&gc, &grid_default_cell, sizeof gc);
@ -544,8 +542,6 @@ window_tree_draw_window(struct session *s, struct window *w,
char *label; char *label;
size_t len; size_t len;
if (sx == 0)
return;
total = window_count_panes(w); total = window_count_panes(w);
memcpy(&gc, &grid_default_cell, sizeof gc); memcpy(&gc, &grid_default_cell, sizeof gc);