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

conf: add 'title' conf option and --title command line option

Browse source
This commit is contained in:
Daniel Eklöf 2020-04-01 19:59:47 +02:00
parent 57761fbd50
commit ec7a768487
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
12 changed files with 65 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server.c
View file

@ -74,6 +74,7 @@ client_destroy(struct client *client)
/* TODO: clone server conf completely, so that we can just call
* conf_destroy() here */
free(client->conf.term);
free(client->conf.title);
free(client->conf.app_id);
free(client);
@ -225,6 +226,19 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
goto shutdown;
}
CHECK_BUF(sizeof(uint16_t));
uint16_t title_len = *(uint16_t *)p; p += sizeof(title_len);
CHECK_BUF(title_len);
const char *title = (const char *)p; p += title_len;
LOG_DBG("app-id = %.*s", title_len, title);
if (title_len != strlen(title) + 1) {
LOG_ERR("title length mismatch: indicated = %hu, actual = %zu",
title_len - 1, strlen(title));
goto shutdown;
}
CHECK_BUF(sizeof(uint16_t));
uint16_t app_id_len = *(uint16_t *)p; p += sizeof(app_id_len);
@ -273,6 +287,8 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
client->conf = *server->conf;
client->conf.term = strlen(term_env) > 0
? strdup(term_env) : strdup(server->conf->term);
client->conf.title = strlen(title) > 0
? strdup(title) : strdup(server->conf->title);
client->conf.app_id = strlen(app_id) > 0
? strdup(app_id) : strdup(server->conf->app_id);
client->conf.login_shell = login_shell;