mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-15 22:05:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'reverse-video-only-affects-default-fg-bg'

Browse source
This commit is contained in:
Daniel Eklöf 2021-06-08 19:52:13 +02:00
commit a2f54c810b
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -98,6 +98,9 @@
* `scrollback-*`+`pipe-scrollback` key bindings are now passed through
to the client application when the alt screen is active
(https://codeberg.org/dnkl/foot/issues/573).
* Reverse video (`\E[?5h`) now only swaps the default foreground and
background colors. Cells with explicit foreground and/or background
colors remain unchanged.
### Deprecated

8
render.c
View file

@ -377,7 +377,7 @@ cursor_colors_for_cell(const struct terminal *term, const struct cell *cell,
term->cursor_color.text >> 31
? term->cursor_color.text : term->colors.bg);
if (term->reverse ^ cell->attrs.reverse ^ is_selected) {
if (cell->attrs.reverse ^ is_selected) {
pixman_color_t swap = *cursor_color;
*cursor_color = *text_color;
*text_color = swap;
@ -461,10 +461,10 @@ render_cell(struct terminal *term, pixman_image_t *pix,
_bg = term->colors.selection_bg;
} else {
/* Use cell specific color, if set, otherwise the default colors (possible reversed) */
_fg = cell->attrs.have_fg ? cell->attrs.fg : term->colors.fg;
_bg = cell->attrs.have_bg ? cell->attrs.bg : term->colors.bg;
_fg = cell->attrs.have_fg ? cell->attrs.fg : term->reverse ? term->colors.bg : term->colors.fg;
_bg = cell->attrs.have_bg ? cell->attrs.bg : term->reverse ? term->colors.fg : term->colors.bg;
if (term->reverse ^ cell->attrs.reverse ^ is_selected) {
if (cell->attrs.reverse ^ is_selected) {
uint32_t swap = _fg;
_fg = _bg;
_bg = swap;