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

server: use config_clone() + config_override_apply()

Browse source 
When the connecting client overrides config options, clone the
server’s configuration, and then convert the overridden options to
config overrides, and apply them using config_override_apply().

When destroying the client, free the cloned config using the regular
config_free().
This commit is contained in:
Daniel Eklöf 2021-06-23 13:18:55 +02:00
parent a5dd71bc7b
commit fa5cde6ce1
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 50 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

72
server.c
View file

@ -120,11 +120,9 @@ instance_destroy(struct terminal_instance *instance, int exit_code)
/* TODO: clone server conf completely, so that we can just call
* conf_destroy() here */
if (instance->conf != NULL) {
free(instance->conf->term);
free(instance->conf->title);
free(instance->conf->app_id);
config_free(*instance->conf);
free(instance->conf);
}
free(instance->conf);
free(instance);
}
@ -296,29 +294,59 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
struct config *conf = NULL;
if (need_to_clone_conf) {
conf = xmalloc(sizeof(*conf));
*conf = *server->conf;
conf = config_clone(server->conf);
conf->term = strlen(term_env) > 0
? xstrdup(term_env) : xstrdup(server->conf->term);
conf->title = strlen(title) > 0
? xstrdup(title) : xstrdup(server->conf->title);
conf->app_id = strlen(app_id) > 0
? xstrdup(app_id) : xstrdup(server->conf->app_id);
conf->hold_at_exit = cdata.hold;
conf->login_shell = cdata.login_shell;
conf->no_wait = cdata.no_wait;
char buf[1024];
config_override_t overrides = tll_init();
if (cdata.maximized)
conf->startup_mode = STARTUP_MAXIMIZED;
else if (cdata.fullscreen)
conf->startup_mode = STARTUP_FULLSCREEN;
if (strlen(term_env) > 0) {
snprintf(buf, sizeof(buf), "term=%s", term_env);
tll_push_back(overrides, xstrdup(buf));
}
if (strlen(title) > 0) {
snprintf(buf, sizeof(buf), "title=%s", title);
tll_push_back(overrides, xstrdup(buf));
}
if (strlen(app_id)> 0) {
snprintf(buf, sizeof(buf), "app-id=%s", app_id);
tll_push_back(overrides, xstrdup(buf));
}
if (cdata.login_shell != server->conf->login_shell)
tll_push_back(overrides, xstrdup("login-shell=yes"));
if (cdata.maximized && server->conf->startup_mode != STARTUP_MAXIMIZED)
tll_push_back(overrides, xstrdup("initial-window-mode=maximized"));
if (cdata.fullscreen && server->conf->startup_mode != STARTUP_FULLSCREEN)
tll_push_back(overrides, xstrdup("initial-window-mode=fullscreen"));
if (cdata.width > 0 && cdata.height > 0) {
conf->size.type = cdata.size_type;
conf->size.width = cdata.width;
conf->size.height = cdata.height;
switch (cdata.size_type) {
case CONF_SIZE_PX:
snprintf(buf, sizeof(buf), "initial-window-size-pixels=%ux%u",
cdata.width, cdata.height);
tll_push_back(overrides, xstrdup(buf));
break;
case CONF_SIZE_CELLS:
snprintf(buf, sizeof(buf), "initial-window-size-chars=%ux%u",
cdata.width, cdata.height);
tll_push_back(overrides, xstrdup(buf));
break;
}
}
if (cdata.no_wait != server->conf->no_wait)
conf->no_wait = cdata.no_wait;
if (cdata.hold != server->conf->hold_at_exit)
conf->hold_at_exit = cdata.hold;
config_override_apply(conf, &overrides, false);
tll_free_and_free(overrides, free);
}
*instance = (struct terminal_instance) {