aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorjdevdevdev <jdevdevdev@noreply.codeberg.org>2023-05-01 15:53:01 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-05-22 16:57:54 +0000
commit134b54dfe0e4d142ac4b6b7fe25e84485ba63387 (patch)
tree1055d072900caa7157f01b772315e93fa340a42d /config.c
parenttest: config: add test for main.utmp-helper option (diff)
.desktop: remove StartupWMClass from server, use distinct StartupWMClass for foot and footclient
For this to work, the default app-id of footclient has been changed from ‘foot’ to ‘footclient’. By using distinct StartupWMClasses, the compositor can connect a running foot/footclient instance to the correct .desktop-file. This ensures the correct icon is being used in e.g. docks, and that actions like “open another window” works correctly. Note that the user can override the app-id, either by setting app-id in foot.ini, or with the -a,--app-id command line option. Closes #1355
Diffstat (limited to 'config.c')
-rw-r--r--config.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/config.c b/config.c
index c3ab61e2..1d9f200b 100644
--- a/config.c
+++ b/config.c
@@ -2905,7 +2905,8 @@ config_font_list_clone(struct config_font_list *dst,
bool
config_load(struct config *conf, const char *conf_path,
user_notifications_t *initial_user_notifications,
- config_override_t *overrides, bool errors_are_fatal)
+ config_override_t *overrides, bool errors_are_fatal,
+ bool as_server)
{
bool ret = false;
enum fcft_capabilities fcft_caps = fcft_capabilities();
@@ -2914,7 +2915,7 @@ config_load(struct config *conf, const char *conf_path,
.term = xstrdup(FOOT_DEFAULT_TERM),
.shell = get_shell(),
.title = xstrdup("foot"),
- .app_id = xstrdup("foot"),
+ .app_id = (as_server ? xstrdup("footclient") : xstrdup("foot")),
.word_delimiters = xc32dup(U",│`|:\"'()[]{}<>"),
.size = {
.type = CONF_SIZE_PX,
@@ -3348,7 +3349,7 @@ UNITTEST
user_notifications_t nots = tll_init();
config_override_t overrides = tll_init();
- bool ret = config_load(&original, "/dev/null", &nots, &overrides, false);
+ bool ret = config_load(&original, "/dev/null", &nots, &overrides, false, false);
xassert(ret);
struct config *clone = config_clone(&original);