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

Extract function for reporting color theme mode

Browse source
This commit is contained in:
Johannes Altmanninger 2025-12-10 20:27:03 +01:00
parent 6ab7190d74
commit 7e2ea901d6
3 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
csi.c
View file

@ -1566,21 +1566,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
switch (param) { switch (param) {
case 996: { /* Query current theme mode (see private mode 2031) */ case 996: { /* Query current theme mode (see private mode 2031) */
/* term_send_color_theme_mode(term);
* 1 - dark mode
* 2 - light mode
*
* In foot, the themes aren't necessarily light/dark,
* but by convention, the primary theme is dark, and
* the alternative theme is light.
*/
char reply[16] = {0};
int chars = snprintf(
reply, sizeof(reply),
"\033[?997;%dn",
term->colors.active_theme == COLOR_THEME1 ? 1 : 2);
term_to_slave(term, reply, chars);
break; break;
} }
} }

30
terminal.c
View file

@ -4734,7 +4734,7 @@ term_theme_switch_to_1(struct terminal *term)
term_font_subpixel_changed(term); term_font_subpixel_changed(term);
if (term->report_theme_changes) if (term->report_theme_changes)
term_to_slave(term, "\033[?997;1n", 9); term_send_color_theme_mode(term);
term_damage_view(term); term_damage_view(term);
term_damage_margins(term); term_damage_margins(term);
@ -4754,7 +4754,7 @@ term_theme_switch_to_2(struct terminal *term)
term_font_subpixel_changed(term); term_font_subpixel_changed(term);
if (term->report_theme_changes) if (term->report_theme_changes)
term_to_slave(term, "\033[?997;2n", 9); term_send_color_theme_mode(term);
term_damage_view(term); term_damage_view(term);
term_damage_margins(term); term_damage_margins(term);
@ -4767,16 +4767,12 @@ term_theme_toggle(struct terminal *term)
if (term->colors.active_theme == COLOR_THEME1) { if (term->colors.active_theme == COLOR_THEME1) {
term_theme_apply(term, &term->conf->colors2); term_theme_apply(term, &term->conf->colors2);
term->colors.active_theme = COLOR_THEME2; term->colors.active_theme = COLOR_THEME2;
if (term->report_theme_changes)
term_to_slave(term, "\033[?997;2n", 9);
} else { } else {
term_theme_apply(term, &term->conf->colors); term_theme_apply(term, &term->conf->colors);
term->colors.active_theme = COLOR_THEME1; term->colors.active_theme = COLOR_THEME1;
if (term->report_theme_changes)
term_to_slave(term, "\033[?997;1n", 9);
} }
if (term->report_theme_changes)
term_send_color_theme_mode(term);
wayl_win_alpha_changed(term->window); wayl_win_alpha_changed(term->window);
term_font_subpixel_changed(term); term_font_subpixel_changed(term);
@ -4785,3 +4781,21 @@ term_theme_toggle(struct terminal *term)
term_damage_margins(term); term_damage_margins(term);
render_refresh(term); render_refresh(term);
} }
/*
* 1 - dark mode
* 2 - light mode
*
* In foot, the themes aren't necessarily light/dark,
* but by convention, the primary theme is dark, and
* the alternative theme is light.
*/
void term_send_color_theme_mode(struct terminal* term)
{
static const char reply[2][9] = {
"\033[?997;2n",
"\033[?997;1n",
};
const bool is_dark = term->colors.active_theme == COLOR_THEME1;
term_to_slave(term, reply[is_dark], 9);
}

1
terminal.h
View file

@ -997,6 +997,7 @@ void term_send_size_notification(struct terminal *term);
void term_theme_switch_to_1(struct terminal *term); void term_theme_switch_to_1(struct terminal *term);
void term_theme_switch_to_2(struct terminal *term); void term_theme_switch_to_2(struct terminal *term);
void term_theme_toggle(struct terminal *term); void term_theme_toggle(struct terminal *term);
void term_send_color_theme_mode(struct terminal* term);
static inline void term_reset_grapheme_state(struct terminal *term) static inline void term_reset_grapheme_state(struct terminal *term)
{ {