aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-12-08 18:53:36 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-12-08 18:53:55 +0000
commit386796cec69089b0acb70c5f10f6b049a30aad52 (patch)
treef52a6f085d4eb6348f8c7e1ee1bbb6a41478518d
parentconfig: remove support for default.scrollback (diff)
config: remove support for default.geometry
-rw-r--r--CHANGELOG.md1
-rw-r--r--config.c17
2 files changed, 2 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96d1c57e..22bd560e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -101,6 +101,7 @@ means foot can be PGO:d in e.g. sandboxed build scripts. See
* Support for loading configuration from `$XDG_CONFIG_HOME/footrc`.
* **scrollback** option from `foot.ini`.
+* **geometry** option from `foot.ini`.
### Fixed
diff --git a/config.c b/config.c
index b24aae48..a3f4e674 100644
--- a/config.c
+++ b/config.c
@@ -436,22 +436,7 @@ parse_section_main(const char *key, const char *value, struct config *conf,
conf->app_id = xstrdup(value);
}
- else if (strcmp(key, "initial-window-size-pixels") == 0 ||
- strcmp(key, "geometry") == 0 /* deprecated */)
- {
- if (strcmp(key, "geometry") == 0) {
- LOG_WARN("deprecated: %s:%d: [default]: geometry: use 'initial-window-size-pixels' instead'", path, lineno);
-
- const char fmt[] = "%s:%d: \033[1mgeometry\033[21m, use \033[1minitial-window-size-pixels\033[21m instead";
- char *text = xasprintf(fmt, path, lineno);
-
- struct user_notification deprecation = {
- .kind = USER_NOTIFICATION_DEPRECATED,
- .text = text,
- };
- tll_push_back(conf->notifications, deprecation);
- }
-
+ else if (strcmp(key, "initial-window-size-pixels") == 0) {
unsigned width, height;
if (sscanf(value, "%ux%u", &width, &height) != 2 || width == 0 || height == 0) {
LOG_AND_NOTIFY_ERR(