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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-04-24 22:09:57 +01:00
commit 4ab208ecc8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
format-draw.c
View File

@ -837,7 +837,8 @@ format_trim_left(const char *expanded, u_int limit)
*out++ = *cp; *out++ = *cp;
width++; width++;
cp++; cp++;
} } else
cp++;
} }
*out = '\0'; *out = '\0';
return (copy); return (copy);
@ -883,7 +884,8 @@ format_trim_right(const char *expanded, u_int limit)
*out++ = *cp; *out++ = *cp;
width++; width++;
cp++; cp++;
} } else
cp++;
} }
*out = '\0'; *out = '\0';
return (copy); return (copy);

8
tty.c
View File

@ -2361,7 +2361,7 @@ tty_check_bg(struct tty *tty, struct window_pane *wp, struct grid_cell *gc)
if (gc->bg & 8) { if (gc->bg & 8) {
gc->bg &= 7; gc->bg &= 7;
if (colours >= 16) if (colours >= 16)
gc->fg += 90; gc->bg += 90;
} }
} }
return; return;
@ -2388,8 +2388,7 @@ tty_colours_fg(struct tty *tty, const struct grid_cell *gc)
/* Is this an aixterm bright colour? */ /* Is this an aixterm bright colour? */
if (gc->fg >= 90 && gc->fg <= 97) { if (gc->fg >= 90 && gc->fg <= 97) {
xsnprintf(s, sizeof s, "\033[%dm", gc->fg); tty_putcode1(tty, TTYC_SETAF, gc->fg - 90 + 8);
tty_puts(tty, s);
goto save_fg; goto save_fg;
} }
@ -2417,8 +2416,7 @@ tty_colours_bg(struct tty *tty, const struct grid_cell *gc)
/* Is this an aixterm bright colour? */ /* Is this an aixterm bright colour? */
if (gc->bg >= 90 && gc->bg <= 97) { if (gc->bg >= 90 && gc->bg <= 97) {
xsnprintf(s, sizeof s, "\033[%dm", gc->bg + 10); tty_putcode1(tty, TTYC_SETAB, gc->bg - 90 + 8);
tty_puts(tty, s);
goto save_bg; goto save_bg;
} }