Skip to content

Commit

Permalink
Fix hang on startup with some Wayland compositors
Browse files Browse the repository at this point in the history
  • Loading branch information
kchibisov committed Feb 3, 2024
1 parent 2d2b894 commit 3b49af7
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 17 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- CLI env variables clearing configuration file variables
- Vi inline search/semantic selection expanding across newlines
- C0 and C1 codes being emitted in associated text when using kitty keyboard
- Occasional hang on startup with some Wayland compositors
- Missing key for `NumpadDecimal` in key bindings

### Changed

Expand Down
30 changes: 15 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions alacritty/src/config/bindings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@ impl<'a> Deserialize<'a> for BindingKey {
"NumpadEnter" => (Key::Named(NamedKey::Enter), KeyLocation::Numpad),
"NumpadAdd" => (Key::Character("+".into()), KeyLocation::Numpad),
"NumpadComma" => (Key::Character(",".into()), KeyLocation::Numpad),
"NumpadDecimal" => (Key::Character(".".into()), KeyLocation::Numpad),
"NumpadDivide" => (Key::Character("/".into()), KeyLocation::Numpad),
"NumpadEquals" => (Key::Character("=".into()), KeyLocation::Numpad),
"NumpadSubtract" => (Key::Character("-".into()), KeyLocation::Numpad),
Expand Down
4 changes: 2 additions & 2 deletions extra/man/alacritty.5.scd
Original file line number Diff line number Diff line change
Expand Up @@ -739,8 +739,8 @@ This section documents the *[keyboard]* table of the configuration file.
_https://docs.rs/winit/latest/winit/keyboard/enum.Key.html#variant.Dead_

Numpad keys are prefixed by _Numpad_: _"NumpadEnter"_ | _"NumpadAdd"_ |
_"NumpadComma"_ | _"NumpadDivide"_ | _"NumpadEquals"_ | _"NumpadSubtract"_ |
_"NumpadMultiply"_ | _"Numpad[0-9]"_.
_"NumpadComma"_ | _"NumpadDecimal"_ | _"NumpadDivide"_ | _"NumpadEquals"_ |
_"NumpadSubtract"_ | _"NumpadMultiply"_ | _"Numpad[0-9]"_.

The _key_ field also supports using scancodes, which are specified as a
decimal number.
Expand Down

0 comments on commit 3b49af7

Please sign in to comment.