aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAyose <ayosec@gmail.com>2025-07-23 00:00:00 +0000
committerAyose <ayosec@gmail.com>2025-07-23 00:00:00 +0000
commita247c96e9f59ee73908ace776dde3812557c8b83 (patch)
tree41a8e4b4d0ae517443ff5f80c5227e37817986df
parent814e8fefc60b4457ea155d11df9f27795de830ec (diff)
parent376cdb370018b737d2d92f26bba0d5297b6eb0c0 (diff)
downloadr-alacritty-a247c96e9f59ee73908ace776dde3812557c8b83.tar.gz
r-alacritty-a247c96e9f59ee73908ace776dde3812557c8b83.tar.bz2
r-alacritty-a247c96e9f59ee73908ace776dde3812557c8b83.zip
Merge remote-tracking branch 'vendor/master' into graphics
-rw-r--r--.builds/freebsd.yml2
-rw-r--r--.builds/linux.yml2
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--CHANGELOG.md18
-rw-r--r--Cargo.lock1077
-rw-r--r--Cargo.toml8
-rw-r--r--INSTALL.md4
-rw-r--r--README.md1
-rw-r--r--alacritty/Cargo.toml28
-rw-r--r--alacritty/build.rs4
-rw-r--r--alacritty/src/cli.rs24
-rw-r--r--alacritty/src/clipboard.rs15
-rw-r--r--alacritty/src/config/bell.rs6
-rw-r--r--alacritty/src/config/bindings.rs40
-rw-r--r--alacritty/src/config/color.rs34
-rw-r--r--alacritty/src/config/cursor.rs10
-rw-r--r--alacritty/src/config/debug.rs6
-rw-r--r--alacritty/src/config/font.rs17
-rw-r--r--alacritty/src/config/general.rs4
-rw-r--r--alacritty/src/config/mod.rs27
-rw-r--r--alacritty/src/config/monitor.rs12
-rw-r--r--alacritty/src/config/mouse.rs5
-rw-r--r--alacritty/src/config/scrolling.rs6
-rw-r--r--alacritty/src/config/selection.rs4
-rw-r--r--alacritty/src/config/terminal.rs6
-rw-r--r--alacritty/src/config/ui_config.rs141
-rw-r--r--alacritty/src/config/window.rs28
-rw-r--r--alacritty/src/display/color.rs20
-rw-r--r--alacritty/src/display/content.rs8
-rw-r--r--alacritty/src/display/cursor.rs2
-rw-r--r--alacritty/src/display/damage.rs9
-rw-r--r--alacritty/src/display/hint.rs14
-rw-r--r--alacritty/src/display/mod.rs24
-rw-r--r--alacritty/src/display/window.rs10
-rw-r--r--alacritty/src/event.rs160
-rw-r--r--alacritty/src/input/keyboard.rs61
-rw-r--r--alacritty/src/input/mod.rs47
-rw-r--r--alacritty/src/ipc.rs80
-rw-r--r--alacritty/src/logging.rs9
-rw-r--r--alacritty/src/macos/locale.rs6
-rw-r--r--alacritty/src/macos/proc.rs2
-rw-r--r--alacritty/src/main.rs10
-rw-r--r--alacritty/src/panic.rs6
-rw-r--r--alacritty/src/renderer/graphics/draw.rs4
-rw-r--r--alacritty/src/renderer/graphics/mod.rs6
-rw-r--r--alacritty/src/renderer/mod.rs18
-rw-r--r--alacritty/src/renderer/platform.rs2
-rw-r--r--alacritty/src/renderer/rects.rs19
-rw-r--r--alacritty/src/renderer/text/builtin_font.rs4
-rw-r--r--alacritty/src/renderer/text/gles2.rs14
-rw-r--r--alacritty/src/renderer/text/glsl3.rs12
-rw-r--r--alacritty/src/renderer/text/glyph_cache.rs33
-rw-r--r--alacritty/src/renderer/text/mod.rs2
-rw-r--r--alacritty/src/window_context.rs8
-rw-r--r--alacritty_config/Cargo.toml6
-rw-r--r--alacritty_config_derive/Cargo.toml6
-rw-r--r--alacritty_config_derive/src/config_deserialize/de_enum.rs6
-rw-r--r--alacritty_config_derive/src/config_deserialize/de_struct.rs6
-rw-r--r--alacritty_config_derive/src/config_deserialize/mod.rs2
-rw-r--r--alacritty_config_derive/src/serde_replace.rs2
-rw-r--r--alacritty_config_derive/tests/config.rs10
-rw-r--r--alacritty_terminal/Cargo.toml11
-rw-r--r--alacritty_terminal/src/event_loop.rs12
-rw-r--r--alacritty_terminal/src/graphics/mod.rs14
-rw-r--r--alacritty_terminal/src/graphics/sixel.rs21
-rw-r--r--alacritty_terminal/src/grid/mod.rs22
-rw-r--r--alacritty_terminal/src/grid/resize.rs2
-rw-r--r--alacritty_terminal/src/grid/storage.rs10
-rw-r--r--alacritty_terminal/src/grid/tests.rs27
-rw-r--r--alacritty_terminal/src/index.rs2
-rw-r--r--alacritty_terminal/src/selection.rs2
-rw-r--r--alacritty_terminal/src/term/cell.rs11
-rw-r--r--alacritty_terminal/src/term/mod.rs112
-rw-r--r--alacritty_terminal/src/term/search.rs68
-rw-r--r--alacritty_terminal/src/tty/mod.rs4
-rw-r--r--alacritty_terminal/src/tty/unix.rs20
-rw-r--r--alacritty_terminal/src/tty/windows/blocking.rs2
-rw-r--r--alacritty_terminal/src/tty/windows/child.rs4
-rw-r--r--alacritty_terminal/src/tty/windows/conpty.rs14
-rw-r--r--alacritty_terminal/src/tty/windows/mod.rs2
-rw-r--r--alacritty_terminal/src/vi_mode.rs47
-rw-r--r--alacritty_terminal/tests/ref.rs2
-rw-r--r--extra/completions/_alacritty34
-rw-r--r--extra/completions/alacritty.bash75
-rw-r--r--extra/completions/alacritty.fish15
-rw-r--r--extra/man/alacritty-bindings.5.scd32
-rw-r--r--extra/man/alacritty-msg.1.scd13
-rw-r--r--extra/man/alacritty.1.scd1
-rw-r--r--extra/man/alacritty.5.scd9
89 files changed, 1767 insertions, 980 deletions
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 5e5021c6..0546b948 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -24,7 +24,7 @@ tasks:
cargo test
- oldstable: |
cd alacritty
- oldstable=$(cat alacritty/Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
+ oldstable=$(cat Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
rustup toolchain install --profile minimal $oldstable
rustup default $oldstable
cargo test
diff --git a/.builds/linux.yml b/.builds/linux.yml
index e036261b..7e19269d 100644
--- a/.builds/linux.yml
+++ b/.builds/linux.yml
@@ -34,7 +34,7 @@ tasks:
cargo test
- oldstable: |
cd alacritty
- oldstable=$(cat alacritty/Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
+ oldstable=$(cat Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
rustup toolchain install --profile minimal $oldstable
rustup default $oldstable
cargo test
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c65e7f82..d7ae755d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
run: cargo test -p alacritty_terminal --no-default-features
- name: Oldstable
run: |
- rustup default $(cat alacritty/Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
+ rustup default $(cat Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
cargo test
- name: Clippy
run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf13eb7a..9daa45a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,18 @@ Notable changes to the `alacritty_terminal` crate are documented in its
## 0.16.0-dev
+### Packaging
+
+- Minimum Rust version has been bumped to 1.85.0
+
+### Added
+
+- Vi motions `*`, `#`, `{`, and `}`
+- IPC config retrieval using `alacritty msg get-config`
+- Multi-sequence touch zoom sequences
+- Vi action `Y` keybind, yank to the end of line
+- Add `/etc/alacritty/alacritty.toml` fallback for system wide configuration
+
### Changed
- Hide login message if `~/.hushlogin` is present
@@ -17,6 +29,12 @@ Notable changes to the `alacritty_terminal` crate are documented in its
### Fixed
- Crash when OpenGL context resets
+- Modifier keys clearing selection with kitty keyboard protocol enabled
+- `glyph_offset.y` not applied to strikeout
+- `Enter`,`Tab`, `Backspace` not disambiguated with `shift` in kitty keyboard's disambiguate mode
+- Hint bindings not respecting IPC overrides
+- Search matching a wrapping fullwidth character in the last column
+- Crash when `AppleFontSmoothing` option is not present on macOS
## 0.15.1
diff --git a/Cargo.lock b/Cargo.lock
index 987a1715..1b38fb1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,21 +1,21 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4
[[package]]
name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
[[package]]
name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
dependencies = [
"cfg-if",
- "getrandom",
+ "getrandom 0.3.3",
"once_cell",
"version_check",
"zerocopy",
@@ -38,7 +38,7 @@ dependencies = [
"alacritty_config",
"alacritty_config_derive",
"alacritty_terminal",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
"clap",
"clap_complete",
"copypasta",
@@ -52,9 +52,9 @@ dependencies = [
"log",
"memoffset",
"notify",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.6.1",
+ "objc2-app-kit 0.3.1",
+ "objc2-foundation 0.3.1",
"parking_lot",
"png",
"serde",
@@ -63,9 +63,9 @@ dependencies = [
"smallvec",
"tempfile",
"toml",
- "toml_edit",
+ "toml_edit 0.23.1",
"unicode-width",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
"winit",
"xdg",
]
@@ -98,7 +98,7 @@ name = "alacritty_terminal"
version = "0.25.1-dev"
dependencies = [
"base64",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
"home",
"libc",
"log",
@@ -107,6 +107,7 @@ dependencies = [
"piper",
"polling",
"regex-automata",
+ "rustix 1.0.7",
"rustix-openpty",
"serde",
"serde_json",
@@ -124,7 +125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
dependencies = [
"android-properties",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
"cc",
"cesu8",
"jni",
@@ -135,7 +136,7 @@ dependencies = [
"ndk-context",
"ndk-sys",
"num_enum",
- "thiserror",
+ "thiserror 1.0.69",
]
[[package]]
@@ -146,9 +147,9 @@ checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
[[package]]
name = "anstream"
-version = "0.6.18"
+version = "0.6.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -161,35 +162,36 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
[[package]]
name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
dependencies = [
"anstyle",
+ "once_cell_polyfill",
"windows-sys 0.59.0",
]
@@ -219,9 +221,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "base64"
@@ -237,45 +239,39 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.6.0"
+version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
dependencies = [
"serde",
]
[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
name = "block2"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
dependencies = [
- "objc2",
+ "objc2 0.5.2",
]
[[package]]
name = "bumpalo"
-version = "3.16.0"
+version = "3.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
[[package]]
name = "bytemuck"
-version = "1.20.0"
+version = "1.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
+checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
[[package]]
name = "bytes"
-version = "1.9.0"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
[[package]]
name = "calloop"
@@ -283,12 +279,12 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
"log",
"polling",
- "rustix",
+ "rustix 0.38.44",
"slab",
- "thiserror",
+ "thiserror 1.0.69",
]
[[package]]
@@ -298,16 +294,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
dependencies = [
"calloop",
- "rustix",
+ "rustix 0.38.44",
"wayland-backend",
"wayland-client",
]
[[package]]
name = "cc"
-version = "1.2.4"
+version = "1.2.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
dependencies = [
"jobserver",
"libc",
@@ -322,9 +318,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
[[package]]
name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
[[package]]
name = "cfg_aliases"
@@ -343,9 +339,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.23"
+version = "4.5.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
dependencies = [
"clap_builder",
"clap_derive",
@@ -353,9 +349,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.23"
+version = "4.5.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
dependencies = [
"anstream",
"anstyle",
@@ -365,18 +361,18 @@ dependencies = [
[[package]]
name = "clap_complete"
-version = "4.5.38"
+version = "4.5.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9647a559c112175f17cf724dc72d3645680a883c58481332779192b0d8e7a01"
+checksum = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a"
dependencies = [
"clap",
]