config/terminal: refactor: remove “default_*” color members from terminal struct

Access the original colors in the configuration instead.
This commit is contained in:
Daniel Eklöf 2021-04-07 08:07:43 +02:00
parent 44a166dde8
commit 936063271f
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
6 changed files with 61 additions and 86 deletions

16
osc.c
View file

@ -705,8 +705,8 @@ osc_dispatch(struct terminal *term)
LOG_DBG("resetting all colors");
for (size_t i = 0; i < ALEN(term->colors.table); i++) {
update_color_in_grids(
term, term->colors.table[i], term->colors.default_table[i]);
term->colors.table[i] = term->colors.default_table[i];
term, term->colors.table[i], term->conf->colors.table[i]);
term->colors.table[i] = term->conf->colors.table[i];
}
}
@ -729,8 +729,8 @@ osc_dispatch(struct terminal *term)
LOG_DBG("resetting color #%u", idx);
update_color_in_grids(
term, term->colors.table[idx], term->colors.default_table[idx]);
term->colors.table[idx] = term->colors.default_table[idx];
term, term->colors.table[idx], term->conf->colors.table[idx]);
term->colors.table[idx] = term->conf->colors.table[idx];
}
}
@ -741,14 +741,14 @@ osc_dispatch(struct terminal *term)
break;
case 110: /* Reset default text foreground color */
LOG_DBG("resetting foreground");
term->colors.fg = term->colors.default_fg;
LOG_DBG("resetting foreground color");
term->colors.fg = term->conf->colors.fg;
term_damage_view(term);
break;
case 111: /* Reset default text background color */
LOG_DBG("resetting background");
term->colors.bg = term->colors.default_bg;
LOG_DBG("resetting background color");
term->colors.bg = term->conf->colors.bg;
term_damage_view(term);
term_damage_margins(term);
break;