aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2026-03-14 07:34:05 +0000
committerDaniel Eklöf <daniel@ekloef.se>2026-03-14 07:34:05 +0000
commit6f1157395b6c26c023bf282161644edd1098c038 (patch)
tree6ffd9e1525418c11bc0ba1097e5dccaa65e901e3
parentmeson: bump version to 1.26.0 (diff)
parentOpenBSD has UTF-32 (diff)
Merge branch 'master' into releases/1.26
-rw-r--r--CHANGELOG.md21
-rw-r--r--char32.c2
-rw-r--r--doc/foot.ini.5.scd2
-rw-r--r--meson.build5
-rw-r--r--themes/paper-color-light2
-rw-r--r--wayland.c4
6 files changed, 31 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9319875..30b3e1e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
# Changelog
+* [Unreleased](#unreleased)
* [1.26.0](#1-26-0)
* [1.25.0](#1-25-0)
* [1.24.0](#1-24-0)
@@ -67,6 +68,26 @@
* [1.2.0](#1-2-0)
+## Unreleased
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+
+* Wrong documented default value for `initial-color-theme` in
+ `foot.ini(5)` ([#2292][2292]).
+* Occasional crashes when closing a window and
+ `tweak.pre-apply-damage=yes` (the default) ([#2288][2288]).
+
+[2292]: https://codeberg.org/dnkl/foot/issues/2292
+[2288]: https://codeberg.org/dnkl/foot/issues/2288
+
+
+### Security
+### Contributors
+
+
## 1.26.0
### Added
diff --git a/char32.c b/char32.c
index 3d6c2c78..be5bf229 100644
--- a/char32.c
+++ b/char32.c
@@ -34,7 +34,7 @@ _Static_assert(
#if !defined(__STDC_UTF_32__) || !__STDC_UTF_32__
#error "char32_t does not use UTF-32"
#endif
-#if (!defined(__STDC_ISO_10646__) || !__STDC_ISO_10646__) && !defined(__FreeBSD__)
+#if (!defined(__STDC_ISO_10646__) || !__STDC_ISO_10646__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
#error "wchar_t does not use UTF-32"
#endif
diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd
index 2f5fc38c..a1ee326f 100644
--- a/doc/foot.ini.5.scd
+++ b/doc/foot.ini.5.scd
@@ -392,7 +392,7 @@ empty string to be set, but it must be quoted: *KEY=""*
at runtime, or send SIGUSR1/SIGUSR2 to the foot process (see
*foot*(1) for details).
- Default: _1_
+ Default: _dark_
*initial-window-size-pixels*
Initial window width and height in _pixels_ (subject to output
diff --git a/meson.build b/meson.build
index 66b3d6bc..16e8e3c0 100644
--- a/meson.build
+++ b/meson.build
@@ -12,6 +12,11 @@ is_debug_build = get_option('buildtype').startswith('debug')
cc = meson.get_compiler('c')
+# Newer clang versions warns when using __COUNTER__ without -std=c2y
+if cc.has_argument('-Wc2y-extensions')
+ add_project_arguments('-Wno-c2y-extensions', language: 'c')
+endif
+
if cc.has_function('memfd_create',
args: ['-D_GNU_SOURCE'],
prefix: '#include <sys/mman.h>')
diff --git a/themes/paper-color-light b/themes/paper-color-light
index 2f7a8003..554aabc0 100644
--- a/themes/paper-color-light
+++ b/themes/paper-color-light
@@ -4,7 +4,7 @@
[main]
initial-color-theme=light
-xs
+
[colors-light]
cursor=eeeeee 444444
background=eeeeee
diff --git a/wayland.c b/wayland.c
index 1d258213..1ffd62a6 100644
--- a/wayland.c
+++ b/wayland.c
@@ -2177,8 +2177,6 @@ wayl_win_destroy(struct wl_window *win)
struct terminal *term = win->term;
- render_wait_for_preapply_damage(term);
-
if (win->csd.move_timeout_fd != -1)
close(win->csd.move_timeout_fd);
@@ -2236,6 +2234,8 @@ wayl_win_destroy(struct wl_window *win)
tll_remove(win->urls, it);
}
+ render_wait_for_preapply_damage(term);
+
csd_destroy(win);
wayl_win_subsurface_destroy(&win->search);
wayl_win_subsurface_destroy(&win->scrollback_indicator);