aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-02-09 20:30:12 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-02-09 20:30:12 +0000
commitc97e5da7c64f50d05f8be3b03754e9a02b16582e (patch)
tree1c624ab89fb5c538b04aa1604477ca5217f7d741
parentcsi: add 47+1047 (alt screen) to DECRQM (diff)
parentinstall: add -Dterminfo to list of compile-time options (diff)
Merge branch 'turn-meson-terminfo-option-into-a-feature'
-rw-r--r--.builds/freebsd-x64.yml4
-rw-r--r--CHANGELOG.md2
-rw-r--r--INSTALL.md7
-rw-r--r--doc/foot.ini.5.scd2
-rw-r--r--foot.ini2
-rw-r--r--meson_options.txt2
6 files changed, 11 insertions, 8 deletions
diff --git a/.builds/freebsd-x64.yml b/.builds/freebsd-x64.yml
index 8147184e..d14ae645 100644
--- a/.builds/freebsd-x64.yml
+++ b/.builds/freebsd-x64.yml
@@ -28,11 +28,11 @@ sources:
tasks:
- debug: |
mkdir -p bld/debug
- meson --buildtype=debug -Dterminfo=false -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug
+ meson --buildtype=debug -Dterminfo=disabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug
ninja -C bld/debug -k0
meson test -C bld/debug --print-errorlogs
- release: |
mkdir -p bld/release
- meson --buildtype=minsize -Dterminfo=false -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/release
+ meson --buildtype=minsize -Dterminfo=disabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/release
ninja -C bld/release -k0
meson test -C bld/release --print-errorlogs
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fc679df..c393043d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@
`resize-delay-ms` (https://codeberg.org/dnkl/foot/issues/301).
* The IME state no longer stays stuck in the terminal if the IME goes
away during preedit.
+* `-Dterminfo` changed from a `boolean` to a `feature` option.
### Deprecated
@@ -89,6 +90,7 @@
* [craigbarnes](https://codeberg.org/craigbarnes)
* [tdeo](https://codeberg.org/tdeo)
+* jbeich
## 1.6.3
diff --git a/INSTALL.md b/INSTALL.md
index c647be61..ecd1840f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -120,9 +120,10 @@ mkdir -p bld/release && cd bld/release
Available compile-time options:
-| Option | Type | Default | Description | Extra dependencies |
-|----------|------|---------|---------------------|--------------------|
-| `-Dime` | bool | `true` | Enables IME support | None |
+| Option | Type | Default | Description | Extra dependencies |
+|-------------|---------|---------|---------------------|--------------------|
+| `-Dime` | bool | `true` | Enables IME support | None |
+| `-Dterminfo | feature | `auto` | Build terminfo | `tic` (ncurses) |
### Release build
diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd
index 5bf9bbf5..cb1f1c32 100644
--- a/doc/foot.ini.5.scd
+++ b/doc/foot.ini.5.scd
@@ -30,7 +30,7 @@ in this order:
*term*
Value to set the environment variable *TERM* to. Default: _foot_
- or _xterm-256color_ if built with _-Dterminfo=false_
+ or _xterm-256color_ if built with _-Dterminfo=disabled_
*font*, *font-bold*, *font-italic*, *font-bold-italic*
Comma separated list of fonts to use, in fontconfig format. That
diff --git a/foot.ini b/foot.ini
index 8896eef0..062162f7 100644
--- a/foot.ini
+++ b/foot.ini
@@ -1,7 +1,7 @@
# -*- conf -*-
# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
-# term=foot (or xterm-256color if built with -Dterminfo=false)
+# term=foot (or xterm-256color if built with -Dterminfo=disabled)
# login-shell=no
# font=monospace:size=8
diff --git a/meson_options.txt b/meson_options.txt
index 0a5b0a3d..b21bc7a4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1,2 @@
option('ime', type: 'boolean', value: true, description: 'IME (Input Method Editor) support')
-option('terminfo', type: 'boolean', value: true, description: 'Install terminfo')
+option('terminfo', type: 'feature', description: 'Install terminfo')