Skip to content

Commit 3a0a4d4

Browse files
committed
Updating upstream alacritty/alacritty master branch on 2024-12-25
Signed-off-by: Seb Ospina <[email protected]>
2 parents 2db203d + d45eca8 commit 3a0a4d4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+3616
-2346
lines changed

.builds/freebsd.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ tasks:
2424
cargo test
2525
- oldstable: |
2626
cd alacritty
27-
rustup toolchain install --profile minimal 1.70.0
28-
rustup default 1.70.0
27+
oldstable=$(cat alacritty/Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
28+
rustup toolchain install --profile minimal $oldstable
29+
rustup default $oldstable
2930
cargo test
3031
- clippy: |
3132
cd alacritty

.builds/linux.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ tasks:
3434
cargo test
3535
- oldstable: |
3636
cd alacritty
37-
rustup toolchain install --profile minimal 1.70.0
38-
rustup default 1.70.0
37+
oldstable=$(cat alacritty/Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
38+
rustup toolchain install --profile minimal $oldstable
39+
rustup default $oldstable
3940
cargo test
4041
- clippy: |
4142
cd alacritty

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ jobs:
1414
runs-on: ${{ matrix.os }}
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Stable
1919
run: cargo test
2020
- name: Stable (no default features)
2121
run: cargo test -p alacritty_terminal --no-default-features
2222
- name: Oldstable
2323
run: |
24-
rustup default 1.76.0
24+
rustup default $(cat alacritty/Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/')
2525
cargo test
2626
- name: Clippy
2727
run: |
2828
rustup component add clippy
2929
cargo clippy --all-targets
30-
check-macos-arm:
31-
runs-on: macos-11
30+
check-macos-x86_64:
31+
runs-on: macos-latest
3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434
- name: Install target
35-
run: rustup update && rustup target add aarch64-apple-darwin
35+
run: rustup update && rustup target add x86_64-apple-darwin
3636
- name: Build
37-
run: cargo build --target=aarch64-apple-darwin
37+
run: cargo build --target=x86_64-apple-darwin

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ env:
1010

1111
jobs:
1212
macos:
13-
runs-on: macos-11
13+
runs-on: macos-latest
1414

1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Install dependencies
1818
run: brew install scdoc
1919
- name: Install ARM target
20-
run: rustup update && rustup target add aarch64-apple-darwin
20+
run: rustup update && rustup target add aarch64-apple-darwin && rustup target add x86_64-apple-darwin
2121
- name: Test
22-
run: cargo test --release
22+
run: cargo test --release --target=x86_64-apple-darwin
2323
- name: Build ARM
2424
run: cargo build --release --target=aarch64-apple-darwin
2525
- name: Make DMG
@@ -37,7 +37,7 @@ jobs:
3737
shell: bash
3838

3939
steps:
40-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v4
4141
- name: Test
4242
run: cargo test --release
4343
- name: Build
@@ -48,10 +48,10 @@ jobs:
4848
./.github/workflows/upload_asset.sh \
4949
./Chartacritty-${GITHUB_REF##*/}-portable.exe $GITHUB_TOKEN
5050
- name: Install WiX
51-
run: dotnet tool install --global wix --version 4.0.1
52-
- name: Crate msi installer
51+
run: dotnet tool install --global wix --version 4.0.5
52+
- name: Create msi installer
5353
run: |
54-
wix extension add WixToolset.UI.wixext WixToolset.Util.wixext
54+
wix extension add WixToolset.UI.wixext/4.0.5 WixToolset.Util.wixext/4.0.5
5555
wix build -arch "x64" -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext \
5656
-out "./Chartacritty-${GITHUB_REF##*/}-installer.msi" "alacritty/windows/wix/alacritty.wxs"
5757
- name: Upload msi installer
@@ -63,7 +63,7 @@ jobs:
6363
runs-on: ubuntu-latest
6464

6565
steps:
66-
- uses: actions/checkout@v3
66+
- uses: actions/checkout@v4
6767
- name: Install dependencies
6868
run: |
6969
sudo apt-get install cmake pkg-config libfreetype6-dev libfontconfig1-dev \

CHANGELOG.md

Lines changed: 85 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,75 @@ The sections should follow the order `Packaging`, `Added`, `Changed`, `Fixed` an
55

66
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
77

8-
## 0.14.0-dev
8+
Notable changes to the `alacritty_terminal` crate are documented in its
9+
[CHANGELOG](./alacritty_terminal/CHANGELOG.md).
10+
11+
## 0.15.0-dev
12+
13+
### Added
14+
15+
- Config option `window.level = "AlwaysOnTop"` to force Alacritty to always be the toplevel window
16+
17+
### Changed
18+
19+
- Always focus new windows on macOS
20+
21+
### Fixed
22+
23+
- Mouse/Vi cursor hint highlighting broken on the terminal cursor line
24+
- Hint launcher opening arbitrary text, when terminal content changed while opening
25+
- `SemanticRight`/`SemanticLeft` vi motions breaking with wide semantic escape characters
26+
- `alacritty migrate` crashing with recursive toml imports
27+
- Migrating nonexistent toml import breaking the entire migration
28+
- First daemon mode window ignoring window options passed through CLI
29+
30+
## 0.14.0
31+
32+
### Packaging
33+
34+
- Minimum Rust version has been bumped to 1.74.0
35+
36+
### Added
37+
38+
- Support relative path imports from config files
39+
- `alacritty migrate` support for TOML configuration changes
40+
- Headless mode using `alacritty --daemon`
41+
42+
### Changed
43+
44+
- Pressing `Alt` with unicode input will now add `ESC` like for ASCII input
45+
- Decorations use opaque style and system window background on macOS
46+
- No longer source `~/.zshenv` on macOS
47+
- Moved config options `import`, `working_directory`, `live_config_reload`, and `ipc_socket`
48+
to the new `general` section
49+
- Moved config option `shell` to `terminal.shell`
50+
- `ctrl+shift+u` binding to open links to `ctrl+shift+o` to avoid collisions with IMEs
51+
- Use `Beam` cursor for single char cursor inside the IME preview
52+
- Always emit `1` for the first parameter when having modifiers in kitty keyboard protocol
53+
54+
### Fixed
55+
56+
- Crash when trying to create a new tab without decorations enabled
57+
- New window being treated as focused when it's not on Wayland
58+
- IME preview blending into text below it
59+
- Dynamic title disabled for new windows when initial one has title as CLI option
60+
- While terminal in mouse mode, mouse bindings that used the shift modifier and
61+
had multiple actions only performed the first action
62+
- Leaking FDs when closing windows on Unix systems
63+
- Config emitting errors for nonexistent import paths
64+
- Kitty keyboard protocol reporting shifted key codes
65+
- Broken search with words broken across line boundary on the first character
66+
- Config import changes not being live reloaded
67+
- Cursor color requests with default cursor colors
68+
- Fullwidth semantic escape characters
69+
- Windows app icon now displays properly in old alt+tab on Windows
70+
- Alacritty not being properly activated with startup notify
71+
- Invalid URL highlights after terminal scrolling
72+
- Hollow block cursor not spanning multiple chars being edited inside the IME preview
73+
- Vi inline search only working for direct key input without modifiers
74+
- Crash when pressing certain modifier keys on macOS 15+
75+
76+
## 0.13.2
977

1078
### Added
1179

@@ -18,6 +86,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1886
- C0 and C1 codes being emitted in associated text when using kitty keyboard
1987
- Occasional hang on startup with some Wayland compositors
2088
- Missing key for `NumpadDecimal` in key bindings
89+
- Scrolling content upwards moving lines into history when it shouldn't
90+
- Sticky keys not working sometimes on X11
91+
- Modifiers occasionally getting desynced on X11
92+
- Autokey no longer working with alacritty on X11
93+
- Freeze when moving window between monitors on Xfwm
94+
- Mouse cursor not changing on Wayland when cursor theme uses legacy cursor icon names
95+
- Config keys are available under proper names
96+
- Build failure when compiling with x11 feature on NetBSD
97+
- Hint `Select` action selecting the entire line for URL escapes
98+
- Kitty encoding used for regular keys when they don't carry text
2199

22100
### Changed
23101

@@ -285,7 +363,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
285363
- Terminal not exiting sometimes after closing all windows on macOS
286364
- CPU usage spikes due to mouse movements for unfocused windows on X11/Windows
287365
- First window on macOS not tabbed with system prefer tabs setting
288-
- Window being treaten as focused by default on Wayland
366+
- Window being treated as focused by default on Wayland
289367

290368
### Removed
291369

@@ -309,7 +387,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
309387
- OSC 104 not clearing colors when second parameter is empty
310388
- Builtin font lines not contiguous when `font.offset` is used
311389
- `font.glyph_offset` is no longer applied on builtin font
312-
- Buili-in font arcs alignment
390+
- Built-in font arcs alignment
313391
- Repeated permission prompts on M1 macs
314392
- Colors being slightly off when using `colors.transparent_background_colors`
315393

@@ -475,7 +553,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
475553
- Performance of scrolling regions with offset from the bottom
476554
- Extra mouse buttons are no longer ignored on Wayland
477555
- Numpad arrow keys are now properly recognized on Wayland
478-
- Compilation when targetting aarch64-apple-darwin
556+
- Compilation when targeting aarch64-apple-darwin
479557
- Window not being completely opaque on Windows
480558
- Window being always on top during alt-tab on Windows
481559
- Cursor position not reported to apps when mouse is moved with button held outside of window
@@ -641,7 +719,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
641719
- Reflow of cursor during resize
642720
- Cursor color escape ignored when its color is set to inverted in the config
643721
- Fontconfig's `autohint` and `hinting` options being ignored
644-
- Ingoring of default FreeType properties
722+
- Ignoring of default FreeType properties
645723
- Alacritty crashing at startup when the configured font does not exist
646724
- Font size rounding error
647725
- Opening URLs while search is active
@@ -849,7 +927,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
849927
- Block URL highlight while a selection is active
850928
- Bindings for Alt + F1-F12
851929
- Discard scrolling region escape with bottom above top
852-
- Opacity always applying to cells with their background color matching the teriminal background
930+
- Opacity always applying to cells with their background color matching the terminal background
853931
- Allow semicolons when setting titles using an OSC
854932
- Background always opaque on X11
855933
- Skipping redraws on PTY update
@@ -919,7 +997,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
919997

920998
### Fixed
921999

922-
- Double-width characters in URLs only being highlit on the left half
1000+
- Double-width characters in URLs only being highlighted on the left half
9231001
- PTY size not getting updated when message bar is shown
9241002
- Text Cursor disappearing
9251003
- Incorrect positioning of zero-width characters over double-width characters

CONTRIBUTING.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,17 @@ introduced the regression helps out a lot.
3434

3535
## Patches / Pull Requests
3636

37-
All patches have to be sent on Github as [pull requests](https://github.com/alacritty/alacritty/pulls).
37+
All patches have to be sent on GitHub as [pull requests](https://github.com/alacritty/alacritty/pulls).
3838

3939
If you are looking for a place to start contributing to Alacritty, take a look at the
4040
[help wanted](https://github.com/alacritty/alacritty/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
4141
and
4242
[easy](https://github.com/alacritty/alacritty/issues?q=is%3Aopen+is%3Aissue+label%3A%22D+-+easy%22)
4343
issues.
4444

45-
Please note that the minimum supported version of Alacritty is Rust 1.70.0. All patches are expected
46-
to work with the minimum supported version.
45+
You can find the minimum supported Rust version in Alacritty's manifest file
46+
(`cat alacritty/Cargo.toml | grep "rust-version"`). Alacritty **must** always
47+
build with the MSRV and bumping it should be avoided if possible.
4748

4849
Since `alacritty_terminal`'s version always tracks the next release, make sure that the version is
4950
bumped according to semver when necessary.
@@ -90,10 +91,11 @@ If any change has been made to the `config.rs` file, it should also be documente
9091

9192
Changes compared to the latest Alacritty release which have a direct effect on the user (opposed to
9293
things like code refactorings or documentation/tests) additionally need to be documented in the
93-
`CHANGELOG.md`. The existing entries should be used as a style guideline. The change log should be
94-
used to document changes from a user-perspective, instead of explaining the technical background
95-
(like commit messages). More information about Alacritty's change log format can be found
96-
[here](https://keepachangelog.com).
94+
`CHANGELOG.md`. When a notable change is made to `alacritty_terminal`, it should be documented in
95+
`alacritty_terminal/CHANGELOG.md` as well. The existing entries should be used as a style guideline.
96+
The change log should be used to document changes from a user-perspective, instead of explaining the
97+
technical background (like commit messages) More information about Alacritty's change log format can
98+
be found [here](https://keepachangelog.com).
9799

98100
### Style
99101

0 commit comments

Comments
 (0)