mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-17 05:33:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

osc: OSC-1 does not set the icon, it sets the icon _label_

Browse source 
In fact, there appears there *is* no escape sequence to set the icon.

Keep most of the logic in place, but in practice, we'll always set the
icon to the app-id. That is, at startup, we set it to the configured
app-id (either from config, or the command line).

OSC-176, which sets the app-id, also updates the icon (to the app-id).
This commit is contained in:
Daniel Eklöf 2024-09-13 08:51:12 +02:00
parent c6208a98c8
commit 7984f08925
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 8 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

36
terminal.c
View file

@ -1814,9 +1814,7 @@ term_destroy(struct terminal *term)
composed_free(term->composed);
free(term->app_id);
free(term->window_icon);
free(term->window_title);
tll_free_and_free(term->window_icon_stack, free);
tll_free_and_free(term->window_title_stack, free);
for (size_t i = 0; i < sizeof(term->fonts) / sizeof(term->fonts[0]); i++)
@ -2048,9 +2046,7 @@ term_reset(struct terminal *term, bool hard)
term->saved_charsets = term->charsets;
tll_free_and_free(term->window_title_stack, free);
term_set_window_title(term, term->conf->title);
tll_free_and_free(term->window_icon_stack, free);
term_set_app_id(term, NULL);
term_set_icon(term, NULL);
term_set_user_mouse_cursor(term, NULL);
@ -3610,39 +3606,19 @@ term_set_app_id(struct terminal *term, const char *app_id)
render_refresh_icon(term);
}
void
term_set_icon(struct terminal *term, const char *icon)
{
if (icon != NULL && *icon == '\0')
icon = NULL;
if (term->window_icon == NULL && icon == NULL)
return;
if (term->window_icon != NULL && icon != NULL && streq(term->window_icon, icon))
return;
if (icon != NULL && !is_valid_utf8(icon)) {
LOG_WARN("%s: icon label is not valid UTF-8, ignoring", icon);
return;
}
free(term->window_icon);
if (icon != NULL) {
term->window_icon = xstrdup(icon);
} else {
term->window_icon = NULL;
}
render_refresh_icon(term);
}
const char *
term_icon(const struct terminal *term)
{
const char *app_id =
term->app_id != NULL ? term->app_id : term->conf->app_id;
return term->window_icon != NULL
return
#if 0
term->window_icon != NULL
? term->window_icon
: streq(app_id, "footclient")
:
#endif
streq(app_id, "footclient")
? "foot"
: app_id;
}