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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-03-14 00:02:37 +00:00
commit 81b393a493
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd-select-pane.c
View File

@ -19,6 +19,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "tmux.h" #include "tmux.h"
@ -143,6 +144,8 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
if (args_has(self->args, 'P') || args_has(self->args, 'g')) { if (args_has(self->args, 'P') || args_has(self->args, 'g')) {
if (args_has(args, 'P')) { if (args_has(args, 'P')) {
style = args_get(args, 'P'); style = args_get(args, 'P');
memcpy(&wp->colgc, &grid_default_cell,
sizeof wp->colgc);
if (style_parse(&grid_default_cell, &wp->colgc, if (style_parse(&grid_default_cell, &wp->colgc,
style) == -1) { style) == -1) {
cmdq_error(item, "bad style: %s", style); cmdq_error(item, "bad style: %s", style);

2
colour.c
View File

@ -160,7 +160,7 @@ colour_tostring(int c)
case 97: case 97:
return ("brightwhite"); return ("brightwhite");
} }
return (NULL); return ("invalid");
} }
/* Convert colour from string. */ /* Convert colour from string. */

4
tty.c
View File

@ -1281,12 +1281,12 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
gcp->bg != last.bg || gcp->bg != last.bg ||
ux + width + gcp->data.width > nx || ux + width + gcp->data.width > nx ||
(sizeof buf) - len < gcp->data.size)) { (sizeof buf) - len < gcp->data.size)) {
tty_attributes(tty, &last, wp);
if (last.flags & GRID_FLAG_CLEARED) { if (last.flags & GRID_FLAG_CLEARED) {
log_debug("%s: %zu cleared", __func__, len); log_debug("%s: %zu cleared", __func__, len);
tty_clear_line(tty, wp, aty, atx + ux, width, tty_clear_line(tty, wp, aty, atx + ux, width,
last.bg); last.bg);
} else { } else {
tty_attributes(tty, &last, wp);
tty_cursor(tty, atx + ux, aty); tty_cursor(tty, atx + ux, aty);
tty_putn(tty, buf, len, width); tty_putn(tty, buf, len, width);
} }
@ -1322,11 +1322,11 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
} }
} }
if (len != 0 && ((~last.flags & GRID_FLAG_CLEARED) || last.bg != 8)) { if (len != 0 && ((~last.flags & GRID_FLAG_CLEARED) || last.bg != 8)) {
tty_attributes(tty, &last, wp);
if (last.flags & GRID_FLAG_CLEARED) { if (last.flags & GRID_FLAG_CLEARED) {
log_debug("%s: %zu cleared (end)", __func__, len); log_debug("%s: %zu cleared (end)", __func__, len);
tty_clear_line(tty, wp, aty, atx + ux, width, last.bg); tty_clear_line(tty, wp, aty, atx + ux, width, last.bg);
} else { } else {
tty_attributes(tty, &last, wp);
tty_cursor(tty, atx + ux, aty); tty_cursor(tty, atx + ux, aty);
tty_putn(tty, buf, len, width); tty_putn(tty, buf, len, width);
} }