Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package alacritty for openSUSE:Factory
checked in at 2021-02-21 22:14:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alacritty (Old)
and /work/SRC/openSUSE:Factory/.alacritty.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alacritty"
Sun Feb 21 22:14:21 2021 rev:18 rq:874070 version:0.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/alacritty/alacritty.changes 2021-01-18
11:32:37.524700613 +0100
+++ /work/SRC/openSUSE:Factory/.alacritty.new.28504/alacritty.changes
2021-02-21 22:14:23.102103989 +0100
@@ -1,0 +2,13 @@
+Sat Feb 20 22:34:40 UTC 2021 - Avindra Goolcharan <avin...@opensuse.org>
+
+- Update to version 0.7.2
+ * shell completions: remove obsolete options
+ * shell compeltions: add the -o/-option setting
+ * fix: Crash due to assertion failure on 32-bit architectures
+ * fix: Segmentation fault on shutdown with Wayland
+ * fix: Incorrect estimated DPR with Wayland
+ * fix: Consecutive clipboard stores dropped on Wayland until the
+ application is refocused
+- ran spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
alacritty-0.7.1.tar.xz
New:
----
alacritty-0.7.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alacritty.spec ++++++
--- /var/tmp/diff_new_pack.Mp8qKt/_old 2021-02-21 22:14:24.018104955 +0100
+++ /var/tmp/diff_new_pack.Mp8qKt/_new 2021-02-21 22:14:24.022104959 +0100
@@ -17,7 +17,7 @@
Name: alacritty
-Version: 0.7.1
+Version: 0.7.2
Release: 0
Summary: A GPU-accelerated terminal emulator
License: Apache-2.0
@@ -70,7 +70,7 @@
%prep
%autosetup -a1
%define cargo_registry $(pwd)/vendor
-%cargo_prep
+%{cargo_prep}
%ifarch aarch64 ppc64le riscv64
# Remove checksum of config.guess and config.sub since aarch64 and ppc64le
modify them
@@ -83,7 +83,7 @@
%build
export CARGO_NET_OFFLINE=true
-%cargo_build
+%{cargo_build}
%install
mkdir -p "%{buildroot}%{_bindir}"
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Mp8qKt/_old 2021-02-21 22:14:24.058104998 +0100
+++ /var/tmp/diff_new_pack.Mp8qKt/_new 2021-02-21 22:14:24.058104998 +0100
@@ -6,8 +6,8 @@
<service name="tar_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/alacritty/alacritty.git</param>
- <param name="revision">a852eb85d57a9c966cea20063923444c18d63c54</param>
- <param name="version">0.7.1</param>
+ <param name="revision">5ac8060bf45e39f4f7dbdf095f3f1fd7d02dcd86</param>
+ <param name="version">0.7.2</param>
<param name="exclude">.builds</param>
<param name="exclude">.github</param>
++++++ alacritty-0.7.1.tar.xz -> alacritty-0.7.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/CHANGELOG.md
new/alacritty-0.7.2/CHANGELOG.md
--- old/alacritty-0.7.1/CHANGELOG.md 2021-01-09 12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/CHANGELOG.md 2021-02-20 00:59:48.000000000 +0100
@@ -5,6 +5,19 @@
The format is based on [Keep a
Changelog](https://keepachangelog.com/en/1.0.0/).
+## 0.7.2
+
+### Packaging
+
+- Updated shell completions
+
+### Fixed
+
+- Crash due to assertion failure on 32-bit architectures
+- Segmentation fault on shutdown with Wayland
+- Incorrect estimated DPR with Wayland
+- Consecutive clipboard stores dropped on Wayland until the application is
refocused
+
## 0.7.1
### Fixed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/Cargo.lock
new/alacritty-0.7.2/Cargo.lock
--- old/alacritty-0.7.1/Cargo.lock 2021-01-09 12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/Cargo.lock 2021-02-20 00:59:48.000000000 +0100
@@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
+version = 3
+
[[package]]
name = "ab_glyph_rasterizer"
version = "0.1.4"
@@ -14,7 +16,7 @@
[[package]]
name = "alacritty"
-version = "0.7.1"
+version = "0.7.2"
dependencies = [
"alacritty_config_derive",
"alacritty_terminal",
@@ -61,7 +63,7 @@
[[package]]
name = "alacritty_terminal"
-version = "0.12.0"
+version = "0.13.0"
dependencies = [
"alacritty_config_derive",
"base64 0.12.3",
@@ -179,9 +181,9 @@
[[package]]
name = "byteorder"
-version = "1.3.4"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
[[package]]
name = "calloop"
@@ -246,15 +248,6 @@
]
[[package]]
-name = "cloudabi"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
name = "cmake"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index";
@@ -426,11 +419,11 @@
[[package]]
name = "crc32fast"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
]
[[package]]
@@ -502,9 +495,9 @@
[[package]]
name = "derivative"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2",
"quote",
@@ -575,10 +568,11 @@
[[package]]
name = "embed-resource"
-version = "1.4.1"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c3b2f39c0462f098c1ca4abc408f7482949bbe2ab19bca5a4419f91f69e5bccc"
+checksum = "0bd6a41d89e233bcd6978fe7333191a2054d518d105a1165ada1d2ebc445ce98"
dependencies = [
+ "cc",
"vswhom",
"winreg",
]
@@ -595,13 +589,13 @@
[[package]]
name = "filetime"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e"
+checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.4",
"winapi 0.3.9",
]
@@ -712,11 +706,11 @@
[[package]]
name = "getrandom"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"libc",
"wasi 0.9.0+wasi-snapshot-preview1",
]
@@ -806,9 +800,9 @@
[[package]]
name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
dependencies = [
"libc",
]
@@ -832,20 +826,20 @@
[[package]]
name = "inotify-sys"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c4563555856585ab3180a5bf0b2f9f8d301a728462afffc8195b3f5394229c55"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
dependencies = [
"libc",
]
[[package]]
name = "instant"
-version = "0.1.7"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
]
[[package]]
@@ -905,25 +899,25 @@
[[package]]
name = "libc"
-version = "0.2.81"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
[[package]]
name = "libloading"
-version = "0.6.4"
+version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3557c9384f7f757f6d139cd3a4c62ef4e850696c16bf27924a5538c8a09717a1"
+checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"winapi 0.3.9",
]
[[package]]
name = "linked-hash-map"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
[[package]]
name = "lock_api"
@@ -936,11 +930,11 @@
[[package]]
name = "log"
-version = "0.4.11"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"serde",
]
@@ -1118,9 +1112,9 @@
[[package]]
name = "nom"
-version = "6.0.1"
+version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
+checksum = "ab6f70b46d6325aa300f1c7bb3d470127dfc27806d8ea6bf294ee0ce643ce2b1"
dependencies = [
"memchr",
"version_check",
@@ -1232,15 +1226,14 @@
[[package]]
name = "parking_lot_core"
-version = "0.8.0"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
dependencies = [
- "cfg-if 0.1.10",
- "cloudabi",
+ "cfg-if 1.0.0",
"instant",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.4",
"smallvec",
"winapi 0.3.9",
]
@@ -1288,9 +1281,9 @@
[[package]]
name = "quote"
-version = "1.0.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
"proc-macro2",
]
@@ -1311,13 +1304,22 @@
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
+name = "redox_syscall"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
name = "redox_users"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
dependencies = [
"getrandom",
- "redox_syscall",
+ "redox_syscall 0.1.57",
"rust-argon2",
]
@@ -1333,9 +1335,9 @@
[[package]]
name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.22"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
[[package]]
name = "rust-argon2"
@@ -1388,18 +1390,18 @@
[[package]]
name = "serde"
-version = "1.0.118"
+version = "1.0.123"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.118"
+version = "1.0.123"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
dependencies = [
"proc-macro2",
"quote",
@@ -1408,9 +1410,9 @@
[[package]]
name = "serde_json"
-version = "1.0.61"
+version = "1.0.62"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
+checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
dependencies = [
"itoa",
"ryu",
@@ -1419,9 +1421,9 @@
[[package]]
name = "serde_yaml"
-version = "0.8.14"
+version = "0.8.17"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f7baae0a99f1a324984bcdc5f0718384c1f69775f1c7eec8b859b71b443e3fd7"
+checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
dependencies = [
"dtoa",
"linked-hash-map",
@@ -1488,9 +1490,9 @@
[[package]]
name = "smallvec"
-version = "1.5.1"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
[[package]]
name = "smithay-client-toolkit"
@@ -1513,9 +1515,9 @@
[[package]]
name = "smithay-clipboard"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ab88b219728cad0697a6c9e75da50bf5220ba01b3485e33e407931539a8ebc91"
+checksum = "06384dfaf645908220d976ae24ed39f6cf92efecb0225ea0a948e403014de527"
dependencies = [
"smithay-client-toolkit",
"wayland-client",
@@ -1552,9 +1554,9 @@
[[package]]
name = "syn"
-version = "1.0.56"
+version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a9802ddde94170d186eeee5005b798d9c159fa970403f1be19976d0cfb939b72"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
dependencies = [
"proc-macro2",
"quote",
@@ -1955,9 +1957,9 @@
[[package]]
name = "yaml-rust"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
dependencies = [
"linked-hash-map",
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty/Cargo.toml
new/alacritty-0.7.2/alacritty/Cargo.toml
--- old/alacritty-0.7.1/alacritty/Cargo.toml 2021-01-09 12:39:35.000000000
+0100
+++ new/alacritty-0.7.2/alacritty/Cargo.toml 2021-02-20 00:59:48.000000000
+0100
@@ -1,6 +1,6 @@
[package]
name = "alacritty"
-version = "0.7.1"
+version = "0.7.2"
authors = ["Christian Duerr <cont...@christianduerr.com>", "Joe Wilm
<j...@jwilm.com>"]
license = "Apache-2.0"
description = "A fast, cross-platform, OpenGL terminal emulator"
@@ -10,7 +10,7 @@
[dependencies.alacritty_terminal]
path = "../alacritty_terminal"
-version = "0.12.0"
+version = "0.13.0"
default-features = false
[dependencies.alacritty_config_derive]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty/src/clipboard.rs
new/alacritty-0.7.2/alacritty/src/clipboard.rs
--- old/alacritty-0.7.1/alacritty/src/clipboard.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty/src/clipboard.rs 2021-02-20
00:59:48.000000000 +0100
@@ -1,4 +1,4 @@
-#[cfg(not(any(target_os = "macos", target_os = "windows")))]
+#[cfg(all(feature = "wayland", not(any(target_os = "macos", windows))))]
use std::ffi::c_void;
use log::{debug, warn};
@@ -7,9 +7,9 @@
#[cfg(any(test, not(any(feature = "x11", target_os = "macos", windows))))]
use copypasta::nop_clipboard::NopClipboardContext;
-#[cfg(all(not(any(target_os = "macos", windows)), feature = "wayland"))]
+#[cfg(all(feature = "wayland", not(any(target_os = "macos", windows))))]
use copypasta::wayland_clipboard;
-#[cfg(all(not(any(target_os = "macos", windows)), feature = "x11"))]
+#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
use copypasta::x11_clipboard::{Primary as X11SelectionClipboard,
X11ClipboardContext};
#[cfg(any(feature = "x11", target_os = "macos", windows))]
use copypasta::ClipboardContext;
@@ -21,28 +21,21 @@
}
impl Clipboard {
- #[cfg(any(target_os = "macos", windows))]
+ #[cfg(any(not(feature = "wayland"), target_os = "macos", windows))]
pub fn new() -> Self {
Self::default()
}
- #[cfg(not(any(target_os = "macos", windows)))]
- pub fn new(_display: Option<*mut c_void>) -> Self {
- #[cfg(feature = "wayland")]
- if let Some(display) = _display {
- let (selection, clipboard) =
- unsafe {
wayland_clipboard::create_clipboards_from_external(display) };
- return Self { clipboard: Box::new(clipboard), selection:
Some(Box::new(selection)) };
+ #[cfg(all(feature = "wayland", not(any(target_os = "macos", windows))))]
+ pub unsafe fn new(display: Option<*mut c_void>) -> Self {
+ match display {
+ Some(display) => {
+ let (selection, clipboard) =
+
wayland_clipboard::create_clipboards_from_external(display);
+ Self { clipboard: Box::new(clipboard), selection:
Some(Box::new(selection)) }
+ },
+ None => Self::default(),
}
-
- #[cfg(feature = "x11")]
- return Self {
- clipboard: Box::new(ClipboardContext::new().unwrap()),
- selection:
Some(Box::new(X11ClipboardContext::<X11SelectionClipboard>::new().unwrap())),
- };
-
- #[cfg(not(feature = "x11"))]
- return Self::new_nop();
}
/// Used for tests and to handle missing clipboard provider when built
without the `x11`
@@ -55,8 +48,15 @@
impl Default for Clipboard {
fn default() -> Self {
- #[cfg(any(feature = "x11", target_os = "macos", windows))]
+ #[cfg(any(target_os = "macos", windows))]
return Self { clipboard: Box::new(ClipboardContext::new().unwrap()),
selection: None };
+
+ #[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
+ return Self {
+ clipboard: Box::new(ClipboardContext::new().unwrap()),
+ selection:
Some(Box::new(X11ClipboardContext::<X11SelectionClipboard>::new().unwrap())),
+ };
+
#[cfg(not(any(feature = "x11", target_os = "macos", windows)))]
return Self::new_nop();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty/src/config/mod.rs
new/alacritty-0.7.2/alacritty/src/config/mod.rs
--- old/alacritty-0.7.1/alacritty/src/config/mod.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty/src/config/mod.rs 2021-02-20
00:59:48.000000000 +0100
@@ -1,5 +1,5 @@
use std::fmt::{self, Display, Formatter};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
use std::{env, fs, io};
use log::{error, info};
@@ -23,12 +23,12 @@
pub use crate::config::bindings::{Action, Binding, BindingMode, Key,
SearchAction, ViAction};
#[cfg(test)]
pub use crate::config::mouse::{ClickHandler, Mouse};
-use crate::config::ui_config::UIConfig;
+use crate::config::ui_config::UiConfig;
/// Maximum number of depth for the configuration file imports.
const IMPORT_RECURSION_LIMIT: usize = 5;
-pub type Config = TermConfig<UIConfig>;
+pub type Config = TermConfig<UiConfig>;
/// Result from config loading.
pub type Result<T> = std::result::Result<T, Error>;
@@ -123,7 +123,7 @@
}
/// Attempt to reload the configuration file.
-pub fn reload(config_path: &PathBuf, options: &Options) -> Result<Config> {
+pub fn reload(config_path: &Path, options: &Options) -> Result<Config> {
// Load config, propagating errors.
let config_options = options.config_options().clone();
let mut config = load_from(&config_path, config_options)?;
@@ -135,7 +135,7 @@
}
/// Load configuration file and log errors.
-fn load_from(path: &PathBuf, cli_config: Value) -> Result<Config> {
+fn load_from(path: &Path, cli_config: Value) -> Result<Config> {
match read_config(path, cli_config) {
Ok(config) => Ok(config),
Err(err) => {
@@ -146,7 +146,7 @@
}
/// Deserialize configuration file from path.
-fn read_config(path: &PathBuf, cli_config: Value) -> Result<Config> {
+fn read_config(path: &Path, cli_config: Value) -> Result<Config> {
let mut config_paths = Vec::new();
let mut config_value = parse_config(&path, &mut config_paths,
IMPORT_RECURSION_LIMIT)?;
@@ -162,7 +162,7 @@
/// Deserialize all configuration files as generic Value.
fn parse_config(
- path: &PathBuf,
+ path: &Path,
config_paths: &mut Vec<PathBuf>,
recursion_limit: usize,
) -> Result<Value> {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty/src/config/ui_config.rs
new/alacritty-0.7.2/alacritty/src/config/ui_config.rs
--- old/alacritty-0.7.1/alacritty/src/config/ui_config.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty/src/config/ui_config.rs 2021-02-20
00:59:48.000000000 +0100
@@ -13,7 +13,7 @@
use crate::config::window::WindowConfig;
#[derive(ConfigDeserialize, Debug, PartialEq)]
-pub struct UIConfig {
+pub struct UiConfig {
/// Font configuration.
pub font: Font,
@@ -45,7 +45,7 @@
background_opacity: Percentage,
}
-impl Default for UIConfig {
+impl Default for UiConfig {
fn default() -> Self {
Self {
alt_send_esc: true,
@@ -62,7 +62,7 @@
}
}
-impl UIConfig {
+impl UiConfig {
#[inline]
pub fn background_opacity(&self) -> f32 {
self.background_opacity.as_f32()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty/src/display.rs
new/alacritty-0.7.2/alacritty/src/display.rs
--- old/alacritty-0.7.1/alacritty/src/display.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty/src/display.rs 2021-02-20
00:59:48.000000000 +0100
@@ -169,9 +169,18 @@
impl Display {
pub fn new<E>(config: &Config, event_loop: &EventLoop<E>) ->
Result<Display, Error> {
- // Guess DPR based on first monitor.
- let estimated_dpr =
- event_loop.available_monitors().next().map(|m|
m.scale_factor()).unwrap_or(1.);
+ #[cfg(any(not(feature = "x11"), target_os = "macos", windows))]
+ let is_x11 = false;
+ #[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
+ let is_x11 = event_loop.is_x11();
+
+ // Guess DPR based on first monitor. On Wayland the initial frame
always renders at a DPR
+ // of 1.
+ let estimated_dpr = if cfg!(any(target_os = "macos", windows)) ||
is_x11 {
+ event_loop.available_monitors().next().map(|m|
m.scale_factor()).unwrap_or(1.)
+ } else {
+ 1.
+ };
// Guess the target window dimensions.
let metrics =
GlyphCache::static_metrics(config.ui_config.font.clone(), estimated_dpr)?;
@@ -259,11 +268,6 @@
#[cfg(target_os = "macos")]
window.set_has_shadow(config.ui_config.background_opacity() >= 1.0);
- #[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
- let is_x11 = event_loop.is_x11();
- #[cfg(not(any(feature = "x11", target_os = "macos", windows)))]
- let is_x11 = false;
-
// On Wayland we can safely ignore this call, since the window isn't
visible until you
// actually draw something into it and commit those changes.
#[cfg(not(any(target_os = "macos", windows)))]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty/src/event.rs
new/alacritty-0.7.2/alacritty/src/event.rs
--- old/alacritty-0.7.1/alacritty/src/event.rs 2021-01-09 12:39:35.000000000
+0100
+++ new/alacritty-0.7.2/alacritty/src/event.rs 2021-02-20 00:59:48.000000000
+0100
@@ -12,7 +12,7 @@
use std::io::Write;
use std::mem;
use std::ops::RangeInclusive;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
#[cfg(not(any(target_os = "macos", windows)))]
use std::sync::atomic::Ordering;
use std::sync::Arc;
@@ -66,7 +66,7 @@
#[derive(Debug, Clone)]
pub enum Event {
TerminalEvent(TerminalEvent),
- DPRChanged(f64, (u32, u32)),
+ DprChanged(f64, (u32, u32)),
Scroll(Scroll),
ConfigReload(PathBuf),
Message(Message),
@@ -874,7 +874,6 @@
mouse: Mouse,
received_count: usize,
suppress_chars: bool,
- clipboard: Clipboard,
modifiers: ModifiersState,
config: Config,
message_buffer: MessageBuffer,
@@ -896,11 +895,6 @@
display: Display,
cli_options: CLIOptions,
) -> Processor<N> {
- #[cfg(not(any(target_os = "macos", windows)))]
- let clipboard = Clipboard::new(display.window.wayland_display());
- #[cfg(any(target_os = "macos", windows))]
- let clipboard = Clipboard::new();
-
Processor {
notifier,
mouse: Default::default(),
@@ -912,7 +906,6 @@
message_buffer,
display,
event_queue: Vec::new(),
- clipboard,
search_state: SearchState::new(),
cli_options,
}
@@ -956,6 +949,12 @@
self.event_queue.push(event.into());
}
+ // NOTE: Since this takes a pointer to the winit event loop, it MUST
be dropped first.
+ #[cfg(all(feature = "wayland", not(any(target_os = "macos",
windows))))]
+ let mut clipboard = unsafe {
Clipboard::new(event_loop.wayland_display()) };
+ #[cfg(any(not(feature = "wayland"), target_os = "macos", windows))]
+ let mut clipboard = Clipboard::new();
+
event_loop.run_return(|event, event_loop, control_flow| {
if self.config.ui_config.debug.print_events {
info!("glutin event: {:?}", event);
@@ -990,7 +989,7 @@
} => {
*control_flow = ControlFlow::Poll;
let size = (new_inner_size.width, new_inner_size.height);
- self.event_queue.push(Event::DPRChanged(scale_factor,
size).into());
+ self.event_queue.push(Event::DprChanged(scale_factor,
size).into());
return;
},
// Transmute to extend lifetime, which exists only for
`ScaleFactorChanged` event.
@@ -1011,8 +1010,8 @@
terminal: &mut terminal,
notifier: &mut self.notifier,
mouse: &mut self.mouse,
- clipboard: &mut self.clipboard,
size_info: &mut self.display.size_info,
+ clipboard: &mut clipboard,
received_count: &mut self.received_count,
suppress_chars: &mut self.suppress_chars,
modifiers: &mut self.modifiers,
@@ -1085,7 +1084,7 @@
{
match event {
GlutinEvent::UserEvent(event) => match event {
- Event::DPRChanged(scale_factor, (width, height)) => {
+ Event::DprChanged(scale_factor, (width, height)) => {
let display_update_pending = &mut
processor.ctx.display_update_pending;
// Push current font to update its DPR.
@@ -1254,7 +1253,7 @@
}
fn reload_config<T>(
- path: &PathBuf,
+ path: &Path,
processor: &mut input::Processor<'_, T, ActionContext<'_, N, T>>,
) where
T: EventListener,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty/src/renderer/mod.rs
new/alacritty-0.7.2/alacritty/src/renderer/mod.rs
--- old/alacritty-0.7.1/alacritty/src/renderer/mod.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty/src/renderer/mod.rs 2021-02-20
00:59:48.000000000 +0100
@@ -21,7 +21,7 @@
use alacritty_terminal::term::SizeInfo;
use crate::config::font::{Font, FontDescription};
-use crate::config::ui_config::{Delta, UIConfig};
+use crate::config::ui_config::{Delta, UiConfig};
use crate::gl;
use crate::gl::types::*;
use crate::renderer::rects::{RectRenderer, RenderRect};
@@ -448,7 +448,7 @@
atlas: &'a mut Vec<Atlas>,
current_atlas: &'a mut usize,
program: &'a mut TextShaderProgram,
- config: &'a UIConfig,
+ config: &'a UiConfig,
}
#[derive(Debug)]
@@ -682,7 +682,7 @@
}
}
- pub fn with_api<F, T>(&mut self, config: &UIConfig, props: &SizeInfo,
func: F) -> T
+ pub fn with_api<F, T>(&mut self, config: &UiConfig, props: &SizeInfo,
func: F) -> T
where
F: FnOnce(RenderApi<'_>) -> T,
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty/src/wayland_theme.rs
new/alacritty-0.7.2/alacritty/src/wayland_theme.rs
--- old/alacritty-0.7.1/alacritty/src/wayland_theme.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty/src/wayland_theme.rs 2021-02-20
00:59:48.000000000 +0100
@@ -69,11 +69,11 @@
}
}
-trait IntoARGBColor {
+trait IntoArgbColor {
fn into_rgba(self) -> ARGBColor;
}
-impl IntoARGBColor for Rgb {
+impl IntoArgbColor for Rgb {
fn into_rgba(self) -> ARGBColor {
ARGBColor { a: 0xff, r: self.r, g: self.g, b: self.b }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty/src/window.rs
new/alacritty-0.7.2/alacritty/src/window.rs
--- old/alacritty-0.7.1/alacritty/src/window.rs 2021-01-09 12:39:35.000000000
+0100
+++ new/alacritty-0.7.2/alacritty/src/window.rs 2021-02-20 00:59:48.000000000
+0100
@@ -401,16 +401,6 @@
}
#[cfg(all(feature = "wayland", not(any(target_os = "macos", windows))))]
- pub fn wayland_display(&self) -> Option<*mut std::ffi::c_void> {
- self.window().wayland_display()
- }
-
- #[cfg(not(any(feature = "wayland", target_os = "macos", windows)))]
- pub fn wayland_display(&self) -> Option<*mut std::ffi::c_void> {
- None
- }
-
- #[cfg(all(feature = "wayland", not(any(target_os = "macos", windows))))]
pub fn wayland_surface(&self) -> Option<&Attached<WlSurface>> {
self.wayland_surface.as_ref()
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty_terminal/Cargo.toml
new/alacritty-0.7.2/alacritty_terminal/Cargo.toml
--- old/alacritty-0.7.1/alacritty_terminal/Cargo.toml 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty_terminal/Cargo.toml 2021-02-20
00:59:48.000000000 +0100
@@ -1,6 +1,6 @@
[package]
name = "alacritty_terminal"
-version = "0.12.0"
+version = "0.13.0"
authors = ["Christian Duerr <cont...@christianduerr.com>", "Joe Wilm
<j...@jwilm.com>"]
license = "Apache-2.0"
description = "Library for writing terminal emulators"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty_terminal/src/ansi.rs
new/alacritty-0.7.2/alacritty_terminal/src/ansi.rs
--- old/alacritty-0.7.1/alacritty_terminal/src/ansi.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty_terminal/src/ansi.rs 2021-02-20
00:59:48.000000000 +0100
@@ -372,7 +372,7 @@
pub enum Mode {
/// ?1
CursorKeys = 1,
- /// Select 80 or 132 columns per page.
+ /// Select 80 or 132 columns per page (DECCOLM).
///
/// CSI ? 3 h -> set 132 column font.
/// CSI ? 3 l -> reset 80 column font.
@@ -383,7 +383,7 @@
/// * erases all data in page memory
/// * resets DECLRMM to unavailable
/// * clears data from the status line (if set to host-writable)
- DECCOLM = 3,
+ ColumnMode = 3,
/// IRM Insert Mode.
///
/// NB should be part of non-private mode enum.
@@ -440,7 +440,7 @@
if private {
Some(match num {
1 => Mode::CursorKeys,
- 3 => Mode::DECCOLM,
+ 3 => Mode::ColumnMode,
6 => Mode::Origin,
7 => Mode::LineWrap,
12 => Mode::BlinkingCursor,
@@ -1406,7 +1406,7 @@
let mut parser = Processor::new();
let mut handler = MockHandler::default();
- for byte in &BYTES[..] {
+ for byte in BYTES {
parser.advance(&mut handler, *byte, &mut io::sink());
}
@@ -1420,7 +1420,7 @@
let mut parser = Processor::new();
let mut handler = MockHandler::default();
- for byte in &bytes[..] {
+ for byte in bytes {
parser.advance(&mut handler, *byte, &mut io::sink());
}
@@ -1429,7 +1429,7 @@
let bytes: &[u8] = &[0x1b, b'[', b'c'];
- for byte in &bytes[..] {
+ for byte in bytes {
parser.advance(&mut handler, *byte, &mut io::sink());
}
@@ -1438,7 +1438,7 @@
let bytes: &[u8] = &[0x1b, b'[', b'0', b'c'];
- for byte in &bytes[..] {
+ for byte in bytes {
parser.advance(&mut handler, *byte, &mut io::sink());
}
@@ -1452,7 +1452,7 @@
let mut parser = Processor::new();
let mut handler = MockHandler::default();
- for byte in &bytes[..] {
+ for byte in bytes {
parser.advance(&mut handler, *byte, &mut io::sink());
}
@@ -1464,7 +1464,7 @@
let mut parser = Processor::new();
let mut handler = MockHandler::default();
- for byte in &bytes[..] {
+ for byte in bytes {
parser.advance(&mut handler, *byte, &mut io::sink());
}
@@ -1482,7 +1482,7 @@
let mut parser = Processor::new();
let mut handler = MockHandler::default();
- for byte in &BYTES[..] {
+ for byte in BYTES {
parser.advance(&mut handler, *byte, &mut io::sink());
}
@@ -1513,7 +1513,7 @@
let mut handler = MockHandler::default();
let mut parser = Processor::new();
- for byte in &BYTES[..] {
+ for byte in BYTES {
parser.advance(&mut handler, *byte, &mut io::sink());
}
}
@@ -1524,7 +1524,7 @@
let mut parser = Processor::new();
let mut handler = MockHandler::default();
- for byte in &BYTES[..] {
+ for byte in BYTES {
parser.advance(&mut handler, *byte, &mut io::sink());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty_terminal/src/config/mod.rs
new/alacritty-0.7.2/alacritty_terminal/src/config/mod.rs
--- old/alacritty-0.7.1/alacritty_terminal/src/config/mod.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty_terminal/src/config/mod.rs 2021-02-20
00:59:48.000000000 +0100
@@ -127,8 +127,8 @@
}
}
-#[serde(untagged)]
#[derive(Deserialize, Debug, Copy, Clone, PartialEq, Eq)]
+#[serde(untagged)]
pub enum ConfigCursorStyle {
Shape(CursorShape),
WithBlinking {
@@ -190,14 +190,14 @@
}
}
-impl Into<bool> for CursorBlinking {
- fn into(self) -> bool {
- self == Self::On || self == Self::Always
+impl From<CursorBlinking> for bool {
+ fn from(cursor_blinking: CursorBlinking) -> bool {
+ cursor_blinking == CursorBlinking::On || cursor_blinking ==
CursorBlinking::Always
}
}
-#[serde(untagged)]
#[derive(Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(untagged)]
pub enum Program {
Just(String),
WithArgs {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty_terminal/src/event_loop.rs
new/alacritty-0.7.2/alacritty_terminal/src/event_loop.rs
--- old/alacritty-0.7.1/alacritty_terminal/src/event_loop.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty_terminal/src/event_loop.rs 2021-02-20
00:59:48.000000000 +0100
@@ -221,7 +221,7 @@
let mut terminal = None;
loop {
- match self.pty.reader().read(&mut buf[..]) {
+ match self.pty.reader().read(buf) {
Ok(0) => break,
Ok(got) => {
// Record bytes read; used to limit time spent in pty_read.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/alacritty-0.7.1/alacritty_terminal/src/grid/storage.rs
new/alacritty-0.7.2/alacritty_terminal/src/grid/storage.rs
--- old/alacritty-0.7.1/alacritty_terminal/src/grid/storage.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty_terminal/src/grid/storage.rs 2021-02-20
00:59:48.000000000 +0100
@@ -156,7 +156,7 @@
/// instructions. This implementation achieves the swap in only 8 movups
/// instructions.
pub fn swap(&mut self, a: usize, b: usize) {
- debug_assert_eq!(std::mem::size_of::<Row<T>>(), 32);
+ debug_assert_eq!(mem::size_of::<Row<T>>(), mem::size_of::<usize>() *
4);
let a = self.compute_index(a);
let b = self.compute_index(b);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty_terminal/src/term/color.rs
new/alacritty-0.7.2/alacritty_terminal/src/term/color.rs
--- old/alacritty-0.7.1/alacritty_terminal/src/term/color.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty_terminal/src/term/color.rs 2021-02-20
00:59:48.000000000 +0100
@@ -117,7 +117,7 @@
where
E: serde::de::Error,
{
- Rgb::from_str(&value[..]).map_err(|_| {
+ Rgb::from_str(value).map_err(|_| {
E::custom(format!(
"failed to parse rgb color {}; expected hex color like
#ff00ff",
value
@@ -221,7 +221,7 @@
_ => (),
}
- Rgb::from_str(&value[..]).map(CellRgb::Rgb).map_err(|_| {
+ Rgb::from_str(value).map(CellRgb::Rgb).map_err(|_| {
E::custom(format!("failed to parse color {}; expected {}",
value, EXPECTING))
})
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/alacritty_terminal/src/term/mod.rs
new/alacritty-0.7.2/alacritty_terminal/src/term/mod.rs
--- old/alacritty-0.7.1/alacritty_terminal/src/term/mod.rs 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/alacritty_terminal/src/term/mod.rs 2021-02-20
00:59:48.000000000 +0100
@@ -1761,7 +1761,7 @@
ansi::Mode::LineWrap => self.mode.insert(TermMode::LINE_WRAP),
ansi::Mode::LineFeedNewLine =>
self.mode.insert(TermMode::LINE_FEED_NEW_LINE),
ansi::Mode::Origin => self.mode.insert(TermMode::ORIGIN),
- ansi::Mode::DECCOLM => self.deccolm(),
+ ansi::Mode::ColumnMode => self.deccolm(),
ansi::Mode::Insert => self.mode.insert(TermMode::INSERT),
ansi::Mode::BlinkingCursor => {
let style =
self.cursor_style.get_or_insert(self.default_cursor_style);
@@ -1803,7 +1803,7 @@
ansi::Mode::LineWrap => self.mode.remove(TermMode::LINE_WRAP),
ansi::Mode::LineFeedNewLine =>
self.mode.remove(TermMode::LINE_FEED_NEW_LINE),
ansi::Mode::Origin => self.mode.remove(TermMode::ORIGIN),
- ansi::Mode::DECCOLM => self.deccolm(),
+ ansi::Mode::ColumnMode => self.deccolm(),
ansi::Mode::Insert => self.mode.remove(TermMode::INSERT),
ansi::Mode::BlinkingCursor => {
let style =
self.cursor_style.get_or_insert(self.default_cursor_style);
@@ -2429,7 +2429,7 @@
mem::swap(&mut terminal.grid, &mut grid);
b.iter(|| {
- let iter = terminal.renderable_cells(&config, true);
+ let iter = terminal.renderable_content(&config, true);
for cell in iter {
test::black_box(cell);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/extra/alacritty.man
new/alacritty-0.7.2/extra/alacritty.man
--- old/alacritty-0.7.1/extra/alacritty.man 2021-01-09 12:39:35.000000000
+0100
+++ new/alacritty-0.7.2/extra/alacritty.man 2021-02-20 00:59:48.000000000
+0100
@@ -1,4 +1,4 @@
-.TH ALACRITTY "1" "August 2018" "alacritty 0.7.1" "User Commands"
+.TH ALACRITTY "1" "August 2018" "alacritty 0.7.2" "User Commands"
.SH NAME
Alacritty \- A fast, cross-platform, OpenGL terminal emulator
.SH "SYNOPSIS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/extra/completions/_alacritty
new/alacritty-0.7.2/extra/completions/_alacritty
--- old/alacritty-0.7.1/extra/completions/_alacritty 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/extra/completions/_alacritty 2021-02-20
00:59:48.000000000 +0100
@@ -5,9 +5,6 @@
(( $#words > 2 )) && ign='!'
_arguments \
"$ign(-)"{-h,--help}"[print help information]" \
- "(--no-live-config-reload)--live-config-reload[enable automatic config
reloading]" \
- "(--live-config-reload)--no-live-config-reload[disable automatic config
reloading]" \
- "(--persistent-logging)--persistent-logging[keep the log file after quitting
Alacritty]" \
"--print-events[print all events to stdout]" \
'(-v)'{-q,-qq}"[reduce the level of verbosity (min is -qq)]" \
"--ref-test[generate ref test]" \
@@ -18,7 +15,6 @@
"--embed=[define the X11 window ID (as a decimal integer) to embed Alacritty
within]:windowId" \
"(-e --command)"{-e,--command}"[execute command (must be last arg)]:program:
_command_names -e:*::program arguments: _normal" \
"--config-file=[specify an alternative config file]:file:_files" \
- "(-d --dimensions)"{-d,--dimensions}"[specify window dimensions]:columns:
:lines" \
- "--position[specify window position]:x position: :y position" \
- "(-t --title)"{-t+,--title=}"[define the window title]:title" \
+ "*"{-o=,--option=}"[override config file options]:option" \
+ "(-t --title)"{-t=,--title=}"[define the window title]:title" \
"--working-directory=[start shell in specified
directory]:directory:_directories"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/extra/completions/alacritty.bash
new/alacritty-0.7.2/extra/completions/alacritty.bash
--- old/alacritty-0.7.1/extra/completions/alacritty.bash 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/extra/completions/alacritty.bash 2021-02-20
00:59:48.000000000 +0100
@@ -11,7 +11,7 @@
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
prevprev="${COMP_WORDS[COMP_CWORD-2]}"
- opts="-h --help -V --version --live-config-reload --no-live-config-reload
--persistent-logging --print-events -q -qq -v -vv -vvv --ref-test --hold -e
--command --config-file -d --dimensions --position -t --title --embed --class
--working-directory"
+ opts="-h --help -V --version --print-events -q -qq -v -vv -vvv --ref-test
--hold -e --command --config-file -o --option -t --title --embed --class
--working-directory"
# If `--command` or `-e` is used, stop completing
for i in "${!COMP_WORDS[@]}"; do
@@ -23,11 +23,6 @@
fi
done
- # Make sure the Y dimension isn't completed
- if [[ "${prevprev}" == "--dimensions" ]] || [[ "${prevprev}" == "-d" ]];
then
- return 0
- fi
-
# Match the previous word
case "${prev}" in
--command | -e)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alacritty-0.7.1/extra/completions/alacritty.fish
new/alacritty-0.7.2/extra/completions/alacritty.fish
--- old/alacritty-0.7.1/extra/completions/alacritty.fish 2021-01-09
12:39:35.000000000 +0100
+++ new/alacritty-0.7.2/extra/completions/alacritty.fish 2021-02-20
00:59:48.000000000 +0100
@@ -10,15 +10,6 @@
# Config
complete -c alacritty \
- -l "live-config-reload" \
- -d "Enable automatic config reloading"
-complete -c alacritty \
- -l "no-live-config-reload" \
- -d "Disable automatic config reloading"
-complete -c alacritty \
- -l "persistent-logging" \
- -d "Keep the log file after quitting Alacritty"
-complete -c alacritty \
-f \
-l "config-file" \
-d "Specify an alternative config file"
@@ -40,6 +31,10 @@
complete -c alacritty \
-l "hold" \
-d "Remain open after child process exits"
+complete -c alacritty \
+ -s "o" \
+ -l "option" \
+ -d "Override config file options"
# Output
complete \
@@ -74,17 +69,6 @@
complete \
-c alacritty \
- -s "d" \
- -l "dimensions" \
- -d "Window dimensions <columns> <lines>"
-
-complete \
- -c alacritty \
- -l "position" \
- -d "Window position <x-pos> <y-pos>"
-
-complete \
- -c alacritty \
-s "e" \
-l "command" \
-d "Execute command (must be last arg)"
++++++ vendor.tar.xz ++++++
/work/SRC/openSUSE:Factory/alacritty/vendor.tar.xz
/work/SRC/openSUSE:Factory/.alacritty.new.28504/vendor.tar.xz differ: char 13,
line 1
