From 1233e000f02ce664134fbbba7b46b710f544436d Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 31 Aug 2021 19:52:31 +0200 Subject: server: verify primary font is monospaced MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... unless we’re re-using the main conf as-is, in which case we will already have done this (and the conf’s user-notification list will already contain a warning). --- server.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'server.c') diff --git a/server.c b/server.c index 7d3d3ca0..5144ed17 100644 --- a/server.c +++ b/server.c @@ -291,6 +291,12 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data) conf->hold_at_exit = cdata.hold; config_override_apply(conf, &overrides, false); + + if (conf->tweak.font_monospace_warn && conf->fonts[0].count > 0) { + check_if_font_is_monospaced( + conf->fonts[0].arr[0].pattern, + &conf->notifications); + } } *instance = (struct terminal_instance) { -- cgit v1.3 From f39a62fa5e9207a6f8c16066527c68ca9a5524a6 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 5 Sep 2021 09:28:19 +0200 Subject: server: no need to clone the config to handle -N,--no-wait --- config.h | 1 - server.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'server.c') diff --git a/config.h b/config.h index 6646cca3..599bc464 100644 --- a/config.h +++ b/config.h @@ -70,7 +70,6 @@ struct config { char *app_id; wchar_t *word_delimiters; bool login_shell; - bool no_wait; bool locked_title; struct { diff --git a/server.c b/server.c index 5144ed17..a5d87b04 100644 --- a/server.c +++ b/server.c @@ -277,16 +277,12 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data) const bool need_to_clone_conf = tll_length(overrides)> 0 || - cdata.hold != server->conf->hold_at_exit || - cdata.no_wait != server->conf->no_wait; + cdata.hold != server->conf->hold_at_exit; struct config *conf = NULL; if (need_to_clone_conf) { conf = config_clone(server->conf); - 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; @@ -317,7 +313,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data) goto shutdown; } - if (conf != NULL && conf->no_wait) { + if (cdata.no_wait) { // the server owns the instance tll_push_back(server->terminals, instance); client_send_exit_code(client, 0); -- cgit v1.3