diff --git a/CHANGELOG.md b/CHANGELOG.md index f554124b..c9319875 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,5 @@ # Changelog -* [Unreleased](#unreleased) -* [1.26.1](#1-26-1) * [1.26.0](#1-26-0) * [1.25.0](#1-25-0) * [1.24.0](#1-24-0) @@ -69,42 +67,6 @@ * [1.2.0](#1-2-0) -## Unreleased -### Added -### Changed -### Deprecated -### Removed -### Fixed - -* Other output (key presses, query replies etc) being mixed with paste - data, both interactive pastes and OSC-52 ([#2307][2307]). - -[2307]: https://codeberg.org/dnkl/foot/issues/2307 - - -### Security -### Contributors - - -## 1.26.1 - -### 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 - - -### Contributors - -* Roshless -* vlkrs - - ## 1.26.0 ### Added diff --git a/char32.c b/char32.c index be5bf229..3d6c2c78 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__) && !defined(__OpenBSD__) +#if (!defined(__STDC_ISO_10646__) || !__STDC_ISO_10646__) && !defined(__FreeBSD__) #error "wchar_t does not use UTF-32" #endif diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd index a1ee326f..2f5fc38c 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: _dark_ + Default: _1_ *initial-window-size-pixels* Initial window width and height in _pixels_ (subject to output diff --git a/meson.build b/meson.build index a0e602bb..66b3d6bc 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('foot', 'c', - version: '1.26.1', + version: '1.26.0', license: 'MIT', meson_version: '>=0.59.0', default_options: [ @@ -12,11 +12,6 @@ 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 ') diff --git a/terminal.c b/terminal.c index 8eafbcbe..ac7922a7 100644 --- a/terminal.c +++ b/terminal.c @@ -120,10 +120,7 @@ term_to_slave(struct terminal *term, const void *data, size_t len) return false; } - if (unlikely(tll_length(term->ptmx_buffers) > 0 || - term->is_sending_paste_data || - tll_length(term->ptmx_paste_buffers) > 0)) - { + if (tll_length(term->ptmx_buffers) > 0 || term->is_sending_paste_data) { /* * Don't even try to send data *now* if there's queued up * data, since that would result in events arriving out of diff --git a/themes/paper-color-light b/themes/paper-color-light index 554aabc0..2f7a8003 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 1ffd62a6..1d258213 100644 --- a/wayland.c +++ b/wayland.c @@ -2177,6 +2177,8 @@ 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); @@ -2234,8 +2236,6 @@ 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);