Skip to content

Commit

Permalink
Fix window being focused by default
Browse files Browse the repository at this point in the history
Winit explicitly states that the window is not focused by default and
the `Focused` event will deliver the state later on.

Also start adding notable changes to alacritty_terminal in its own
CHANGELOG.

Closes #7866.
  • Loading branch information
kchibisov committed Apr 18, 2024
1 parent d4f2f85 commit d288688
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 23 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@ The sections should follow the order `Packaging`, `Added`, `Changed`, `Fixed` an

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

Notable changes to the `alacritty_terminal` crate are documented in its
[CHANGELOG](./alacritty_terminal/CHANGELOG.md).

## 0.14.0-dev

### Fixed

- New window being treated as focused when it's not on Wayland

### Changed

- Pressing `Alt` with unicode input will now add `ESC` like for ASCII input
Expand Down
9 changes: 5 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,11 @@ If any change has been made to the `config.rs` file, it should also be documente

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

### Style

Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion alacritty/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rust-version = "1.70.0"

[dependencies.alacritty_terminal]
path = "../alacritty_terminal"
version = "0.22.1-dev"
version = "0.23.0-dev"

[dependencies.alacritty_config_derive]
path = "../alacritty_config_derive"
Expand Down
15 changes: 15 additions & 0 deletions alacritty_terminal/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Changelog

All notable changes to alacritty_terminal are documented in this file. The
sections should follow the order `Added`, `Changed`, `Deprecated`, `Fixed` and
`Removed`.

**Breaking changes are written in bold style.**

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

## 0.23.0-dev

### Changed

- **`Term` is not focused by default anymore**
2 changes: 1 addition & 1 deletion alacritty_terminal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "alacritty_terminal"
version = "0.22.1-dev"
version = "0.23.0-dev"
authors = ["Christian Duerr <contact@christianduerr.com>", "Joe Wilm <joe@jwilm.com>"]
license = "Apache-2.0"
description = "Library for writing terminal emulators"
Expand Down
32 changes: 16 additions & 16 deletions alacritty_terminal/src/term/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -407,13 +407,13 @@ impl<T> Term<T> {
}
}

pub fn new<D: Dimensions>(options: Config, dimensions: &D, event_proxy: T) -> Term<T> {
pub fn new<D: Dimensions>(config: Config, dimensions: &D, event_proxy: T) -> Term<T> {
let num_cols = dimensions.columns();
let num_lines = dimensions.screen_lines();

let history_size = options.scrolling_history;
let history_size = config.scrolling_history;
let grid = Grid::new(num_lines, num_cols, history_size);
let alt = Grid::new(num_lines, num_cols, 0);
let inactive_grid = Grid::new(num_lines, num_cols, 0);

let tabs = TabStops::new(grid.columns());

Expand All @@ -423,24 +423,24 @@ impl<T> Term<T> {
let damage = TermDamageState::new(num_cols, num_lines);

Term {
inactive_grid,
scroll_region,
event_proxy,
damage,
config,
grid,
inactive_grid: alt,
tabs,
inactive_keyboard_mode_stack: Default::default(),
keyboard_mode_stack: Default::default(),
active_charset: Default::default(),
vi_mode_cursor: Default::default(),
tabs,
mode: Default::default(),
scroll_region,
cursor_style: Default::default(),
colors: color::Colors::default(),
cursor_style: None,
event_proxy,
is_focused: true,
title: None,
title_stack: Default::default(),
keyboard_mode_stack: Default::default(),
inactive_keyboard_mode_stack: Default::default(),
selection: None,
damage,
config: options,
is_focused: Default::default(),
selection: Default::default(),
title: Default::default(),
mode: Default::default(),
}
}

Expand Down

0 comments on commit d288688

Please sign in to comment.