circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-13 03:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-12-27 14:43:20 +00:00
commit cd46568ebe
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
screen-redraw.c
View File

@ -18,6 +18,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include "tmux.h" #include "tmux.h"
@ -299,6 +300,7 @@ screen_redraw_make_pane_status(struct client *c, struct window *w,
screen_write_cnputs(&ctx, outlen, &gc, "%s", out); screen_write_cnputs(&ctx, outlen, &gc, "%s", out);
screen_write_stop(&ctx); screen_write_stop(&ctx);
free(out);
format_free(ft); format_free(ft);
wp->status_size = outlen; wp->status_size = outlen;

10
status.c
View File

@ -659,9 +659,10 @@ status_message_redraw(struct client *c)
memcpy(&old_status, &c->status, sizeof old_status); memcpy(&old_status, &c->status, sizeof old_status);
lines = status_line_size(c->session); lines = status_line_size(c->session);
if (lines <= 1) if (lines <= 1) {
lines = 1;
screen_init(&c->status, c->tty.sx, 1, 0); screen_init(&c->status, c->tty.sx, 1, 0);
else } else
screen_init(&c->status, c->tty.sx, lines, 0); screen_init(&c->status, c->tty.sx, lines, 0);
len = screen_write_strlen("%s", c->message_string); len = screen_write_strlen("%s", c->message_string);
@ -811,9 +812,10 @@ status_prompt_redraw(struct client *c)
memcpy(&old_status, &c->status, sizeof old_status); memcpy(&old_status, &c->status, sizeof old_status);
lines = status_line_size(c->session); lines = status_line_size(c->session);
if (lines <= 1) if (lines <= 1) {
lines = 1;
screen_init(&c->status, c->tty.sx, 1, 0); screen_init(&c->status, c->tty.sx, 1, 0);
else } else
screen_init(&c->status, c->tty.sx, lines, 0); screen_init(&c->status, c->tty.sx, lines, 0);
len = screen_write_strlen("%s", c->prompt_string); len = screen_write_strlen("%s", c->prompt_string);