STRLCPY/alacritty

Update winit to 0.28

Fixes #6644.
Fixes #6615.
Fixes #6558.
Fixes #6515.
Fixes #3187.
Fixes #62.

Kirill Chibisov committed with GitHub 1 year ago

1c878a04

1 parent 246ec894

Total 23 files Show one by one

■ ■ ■ ■ ■ ■

CHANGELOG.md

		skipped 10 lines
11	11
12	12		- Uppercase `-T` short form for `--title`
13	13		- Support for horizontal scrolling in mouse mode and alternative scrolling modes
	14	+	- Support for fractional scaling on Wayland with wp-fractional-scale protocol
14	15
15	16		### Changed
16	17
		skipped 1 lines
18	19		- Always use sRGB color space on macOS
19	20		- Erase in line after the last column will no longer clear the last column
20	21		- Open new windows by default with macOS `Cmd`+`N` binding
	22	+	- The hint about window transparency is now properly issued on Wayland and macOS
	23	+	- `window.decorations_theme_variant` could now control theme on macOS and Windows
	24	+	- The IME purpose is now set to `Terminal` which could help with OSK
	25	+	- `window.decorations_theme_variant` is now using `Dark`, `Light`, and `None` values
21	26
22	27		### Fixed
23	28
		skipped 13 lines
37	42		- Reduced GPU memory usage
38	43		- Low frame rate when multiple windows render at the same time
39	44		- Redraw hanging until a keypress on X11 in rare cases
	45	+	- Window clipping when maximizing a window without decorations on Windows
	46	+
	47	+	### Removed
	48	+
	49	+	- `window.gtk_theme_variant` config field; use `window.decorations_theme_variant` instead
	50	+	- `alt_send_esc` is now always set to `true`
40	51
41	52		## 0.11.0
42	53
		skipped 1064 lines

■ ■ ■ ■ ■ ■

Cargo.lock

		skipped 32 lines
33	33		"once_cell",
34	34		"parking_lot 0.12.1",
35	35		"png",
36		-	"raw-window-handle 0.5.0",
	36	+	"raw-window-handle",
37	37		"serde",
38	38		"serde_json",
39	39		"serde_yaml",
40	40		"unicode-width",
41	41		"wayland-client",
42		-	"windows-sys",
	42	+	"windows-sys 0.36.1",
43	43		"winit",
44	44		"x11-dl",
45	45		"xdg",
		skipped 6 lines
52	52		"log",
53	53		"serde",
54	54		"serde_yaml",
	55	+	"winit",
55	56		]
56	57
57	58		[[package]]
		skipped 34 lines
92	93		"signal-hook-mio",
93	94		"unicode-width",
94	95		"vte",
95		-	"windows-sys",
	96	+	"windows-sys 0.36.1",
	97	+	]
	98	+
	99	+	[[package]]
	100	+	name = "android-activity"
	101	+	version = "0.4.0"
	102	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	103	+	checksum = "4165a1aef703232031b40a6e8908c2f9e314d495f11aa7f98db75d39a497cc6a"
	104	+	dependencies = [
	105	+	"android-properties",
	106	+	"bitflags",
	107	+	"cc",
	108	+	"jni-sys",
	109	+	"libc",
	110	+	"log",
	111	+	"ndk",
	112	+	"ndk-context",
	113	+	"ndk-sys",
	114	+	"num_enum",
96	115		]
97	116
98	117		[[package]]
	118	+	name = "android-properties"
	119	+	version = "0.2.2"
	120	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	121	+	checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
	122	+
	123	+	[[package]]
99	124		name = "arrayref"
100	125		version = "0.3.6"
101	126		source = "registry+https://github.com/rust-lang/crates.io-index"
		skipped 41 lines
143	168		checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
144	169
145	170		[[package]]
	171	+	name = "block-sys"
	172	+	version = "0.1.0-beta.1"
	173	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	174	+	checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
	175	+	dependencies = [
	176	+	"objc-sys",
	177	+	]
	178	+
	179	+	[[package]]
	180	+	name = "block2"
	181	+	version = "0.2.0-alpha.6"
	182	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	183	+	checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
	184	+	dependencies = [
	185	+	"block-sys",
	186	+	"objc2-encode",
	187	+	]
	188	+
	189	+	[[package]]
146	190		name = "bumpalo"
147	191		version = "3.12.0"
148	192		source = "registry+https://github.com/rust-lang/crates.io-index"
		skipped 23 lines
172	216		version = "1.0.73"
173	217		source = "registry+https://github.com/rust-lang/crates.io-index"
174	218		checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
	219	+	dependencies = [
	220	+	"jobserver",
	221	+	]
175	222
176	223		[[package]]
177	224		name = "cfg-if"
		skipped 245 lines
423	470		checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
424	471
425	472		[[package]]
426		-	name = "darling"
427		-	version = "0.13.4"
428		-	source = "registry+https://github.com/rust-lang/crates.io-index"
429		-	checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
430		-	dependencies = [
431		-	"darling_core",
432		-	"darling_macro",
433		-	]
434		-
435		-	[[package]]
436		-	name = "darling_core"
437		-	version = "0.13.4"
438		-	source = "registry+https://github.com/rust-lang/crates.io-index"
439		-	checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
440		-	dependencies = [
441		-	"fnv",
442		-	"ident_case",
443		-	"proc-macro2",
444		-	"quote",
445		-	"strsim",
446		-	"syn",
447		-	]
448		-
449		-	[[package]]
450		-	name = "darling_macro"
451		-	version = "0.13.4"
452		-	source = "registry+https://github.com/rust-lang/crates.io-index"
453		-	checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
454		-	dependencies = [
455		-	"darling_core",
456		-	"quote",
457		-	"syn",
458		-	]
459		-
460		-	[[package]]
461	473		name = "dirs"
462	474		version = "4.0.0"
463	475		source = "registry+https://github.com/rust-lang/crates.io-index"
		skipped 79 lines
543	555		dependencies = [
544	556		"cfg-if 1.0.0",
545	557		"libc",
546		-	"redox_syscall",
547		-	"windows-sys",
	558	+	"redox_syscall 0.2.16",
	559	+	"windows-sys 0.36.1",
548	560		]
549	561
550	562		[[package]]
		skipped 140 lines
691	703		"libloading",
692	704		"objc",
693	705		"once_cell",
694		-	"raw-window-handle 0.5.0",
	706	+	"raw-window-handle",
695	707		"wayland-sys 0.30.0",
696		-	"windows-sys",
	708	+	"windows-sys 0.36.1",
697	709		"x11-dl",
698	710		]
699	711
		skipped 4 lines
704	716		checksum = "3adbb8fec0e18e340f990c78f79f5f0e142d0d83f46b10909aaa7d251c00afdf"
705	717		dependencies = [
706	718		"gl_generator",
707		-	"windows-sys",
	719	+	"windows-sys 0.36.1",
708	720		]
709	721
710	722		[[package]]
		skipped 35 lines
746	758		dependencies = [
747	759		"libc",
748	760		]
749		-
750		-	[[package]]
751		-	name = "ident_case"
752		-	version = "1.0.1"
753		-	source = "registry+https://github.com/rust-lang/crates.io-index"
754		-	checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
755	761
756	762		[[package]]
757	763		name = "indexmap"
		skipped 59 lines
817	823		checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
818	824
819	825		[[package]]
	826	+	name = "jobserver"
	827	+	version = "0.1.25"
	828	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	829	+	checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
	830	+	dependencies = [
	831	+	"libc",
	832	+	]
	833	+
	834	+	[[package]]
820	835		name = "js-sys"
821	836		version = "0.3.60"
822	837		source = "registry+https://github.com/rust-lang/crates.io-index"
		skipped 174 lines
997	1012		"libc",
998	1013		"log",
999	1014		"wasi",
1000		-	"windows-sys",
	1015	+	"windows-sys 0.36.1",
1001	1016		]
1002	1017
1003	1018		[[package]]
		skipped 63 lines
1067	1082		"jni-sys",
1068	1083		"ndk-sys",
1069	1084		"num_enum",
1070		-	"raw-window-handle 0.5.0",
	1085	+	"raw-window-handle",
1071	1086		"thiserror",
1072	1087		]
1073	1088
		skipped 2 lines
1076	1091		version = "0.1.1"
1077	1092		source = "registry+https://github.com/rust-lang/crates.io-index"
1078	1093		checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
1079		-
1080		-	[[package]]
1081		-	name = "ndk-glue"
1082		-	version = "0.7.0"
1083		-	source = "registry+https://github.com/rust-lang/crates.io-index"
1084		-	checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f"
1085		-	dependencies = [
1086		-	"libc",
1087		-	"log",
1088		-	"ndk",
1089		-	"ndk-context",
1090		-	"ndk-macro",
1091		-	"ndk-sys",
1092		-	"once_cell",
1093		-	"parking_lot 0.12.1",
1094		-	]
1095		-
1096		-	[[package]]
1097		-	name = "ndk-macro"
1098		-	version = "0.3.0"
1099		-	source = "registry+https://github.com/rust-lang/crates.io-index"
1100		-	checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
1101		-	dependencies = [
1102		-	"darling",
1103		-	"proc-macro-crate",
1104		-	"proc-macro2",
1105		-	"quote",
1106		-	"syn",
1107		-	]
1108	1094
1109	1095		[[package]]
1110	1096		name = "ndk-sys"
		skipped 119 lines
1230	1216		]
1231	1217
1232	1218		[[package]]
	1219	+	name = "objc-sys"
	1220	+	version = "0.2.0-beta.2"
	1221	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	1222	+	checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
	1223	+
	1224	+	[[package]]
	1225	+	name = "objc2"
	1226	+	version = "0.3.0-beta.3"
	1227	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	1228	+	checksum = "fe31e5425d3d0b89a15982c024392815da40689aceb34bad364d58732bcfd649"
	1229	+	dependencies = [
	1230	+	"block2",
	1231	+	"objc-sys",
	1232	+	"objc2-encode",
	1233	+	]
	1234	+
	1235	+	[[package]]
	1236	+	name = "objc2-encode"
	1237	+	version = "2.0.0-pre.2"
	1238	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	1239	+	checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
	1240	+	dependencies = [
	1241	+	"objc-sys",
	1242	+	]
	1243	+
	1244	+	[[package]]
1233	1245		name = "objc_id"
1234	1246		version = "0.1.1"
1235	1247		source = "registry+https://github.com/rust-lang/crates.io-index"
		skipped 9 lines
1245	1257		checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
1246	1258
1247	1259		[[package]]
	1260	+	name = "orbclient"
	1261	+	version = "0.3.42"
	1262	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	1263	+	checksum = "ba683f1641c11041c59d5d93689187abcab3c1349dc6d9d70c550c9f9360802f"
	1264	+	dependencies = [
	1265	+	"cfg-if 1.0.0",
	1266	+	"redox_syscall 0.2.16",
	1267	+	"wasm-bindgen",
	1268	+	"web-sys",
	1269	+	]
	1270	+
	1271	+	[[package]]
1248	1272		name = "os_str_bytes"
1249	1273		version = "6.3.0"
1250	1274		source = "registry+https://github.com/rust-lang/crates.io-index"
		skipped 29 lines
1280	1304		"cfg-if 1.0.0",
1281	1305		"instant",
1282	1306		"libc",
1283		-	"redox_syscall",
	1307	+	"redox_syscall 0.2.16",
1284	1308		"smallvec",
1285	1309		"winapi 0.3.9",
1286	1310		]
		skipped 6 lines
1293	1317		dependencies = [
1294	1318		"cfg-if 1.0.0",
1295	1319		"libc",
1296		-	"redox_syscall",
	1320	+	"redox_syscall 0.2.16",
1297	1321		"smallvec",
1298		-	"windows-sys",
	1322	+	"windows-sys 0.36.1",
1299	1323		]
1300	1324
1301	1325		[[package]]
		skipped 84 lines
1386	1410
1387	1411		[[package]]
1388	1412		name = "raw-window-handle"
1389		-	version = "0.4.3"
	1413	+	version = "0.5.0"
1390	1414		source = "registry+https://github.com/rust-lang/crates.io-index"
1391		-	checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
	1415	+	checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
1392	1416		dependencies = [
1393	1417		"cty",
1394	1418		]
1395	1419
1396	1420		[[package]]
1397		-	name = "raw-window-handle"
1398		-	version = "0.5.0"
	1421	+	name = "redox_syscall"
	1422	+	version = "0.2.16"
1399	1423		source = "registry+https://github.com/rust-lang/crates.io-index"
1400		-	checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
	1424	+	checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
1401	1425		dependencies = [
1402		-	"cty",
	1426	+	"bitflags",
1403	1427		]
1404	1428
1405	1429		[[package]]
1406	1430		name = "redox_syscall"
1407		-	version = "0.2.16"
	1431	+	version = "0.3.4"
1408	1432		source = "registry+https://github.com/rust-lang/crates.io-index"
1409		-	checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
	1433	+	checksum = "fb02a9aee8e8c7ad8d86890f1e16b49e0bbbffc9961ff3788c31d57c98bcbf03"
1410	1434		dependencies = [
1411	1435		"bitflags",
1412	1436		]
		skipped 5 lines
1418	1442		checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
1419	1443		dependencies = [
1420	1444		"getrandom",
1421		-	"redox_syscall",
	1445	+	"redox_syscall 0.2.16",
1422	1446		"thiserror",
1423	1447		]
1424	1448
		skipped 59 lines
1484	1508
1485	1509		[[package]]
1486	1510		name = "sctk-adwaita"
1487		-	version = "0.4.3"
	1511	+	version = "0.5.2"
1488	1512		source = "registry+https://github.com/rust-lang/crates.io-index"
1489		-	checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339"
	1513	+	checksum = "6be6d8911b40c5f91332ce27d2458d57fffc0b061816bf847df23a16f9d3615f"
1490	1514		dependencies = [
1491	1515		"crossfont",
1492	1516		"log",
		skipped 532 lines
2025	2049		source = "registry+https://github.com/rust-lang/crates.io-index"
2026	2050		checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
2027	2051		dependencies = [
2028		-	"windows_aarch64_msvc",
2029		-	"windows_i686_gnu",
2030		-	"windows_i686_msvc",
2031		-	"windows_x86_64_gnu",
2032		-	"windows_x86_64_msvc",
	2052	+	"windows_aarch64_msvc 0.36.1",
	2053	+	"windows_i686_gnu 0.36.1",
	2054	+	"windows_i686_msvc 0.36.1",
	2055	+	"windows_x86_64_gnu 0.36.1",
	2056	+	"windows_x86_64_msvc 0.36.1",
2033	2057		]
2034	2058
2035	2059		[[package]]
	2060	+	name = "windows-sys"
	2061	+	version = "0.45.0"
	2062	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	2063	+	checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
	2064	+	dependencies = [
	2065	+	"windows-targets",
	2066	+	]
	2067	+
	2068	+	[[package]]
	2069	+	name = "windows-targets"
	2070	+	version = "0.42.1"
	2071	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	2072	+	checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
	2073	+	dependencies = [
	2074	+	"windows_aarch64_gnullvm",
	2075	+	"windows_aarch64_msvc 0.42.1",
	2076	+	"windows_i686_gnu 0.42.1",
	2077	+	"windows_i686_msvc 0.42.1",
	2078	+	"windows_x86_64_gnu 0.42.1",
	2079	+	"windows_x86_64_gnullvm",
	2080	+	"windows_x86_64_msvc 0.42.1",
	2081	+	]
	2082	+
	2083	+	[[package]]
	2084	+	name = "windows_aarch64_gnullvm"
	2085	+	version = "0.42.1"
	2086	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	2087	+	checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
	2088	+
	2089	+	[[package]]
2036	2090		name = "windows_aarch64_msvc"
2037	2091		version = "0.36.1"
2038	2092		source = "registry+https://github.com/rust-lang/crates.io-index"
2039	2093		checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
2040	2094
2041	2095		[[package]]
	2096	+	name = "windows_aarch64_msvc"
	2097	+	version = "0.42.1"
	2098	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	2099	+	checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
	2100	+
	2101	+	[[package]]
2042	2102		name = "windows_i686_gnu"
2043	2103		version = "0.36.1"
2044	2104		source = "registry+https://github.com/rust-lang/crates.io-index"
2045	2105		checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
2046	2106
2047	2107		[[package]]
	2108	+	name = "windows_i686_gnu"
	2109	+	version = "0.42.1"
	2110	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	2111	+	checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
	2112	+
	2113	+	[[package]]
2048	2114		name = "windows_i686_msvc"
2049	2115		version = "0.36.1"
2050	2116		source = "registry+https://github.com/rust-lang/crates.io-index"
2051	2117		checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
2052	2118
2053	2119		[[package]]
	2120	+	name = "windows_i686_msvc"
	2121	+	version = "0.42.1"
	2122	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	2123	+	checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
	2124	+
	2125	+	[[package]]
2054	2126		name = "windows_x86_64_gnu"
2055	2127		version = "0.36.1"
2056	2128		source = "registry+https://github.com/rust-lang/crates.io-index"
2057	2129		checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
2058	2130
2059	2131		[[package]]
	2132	+	name = "windows_x86_64_gnu"
	2133	+	version = "0.42.1"
	2134	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	2135	+	checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
	2136	+
	2137	+	[[package]]
	2138	+	name = "windows_x86_64_gnullvm"
	2139	+	version = "0.42.1"
	2140	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	2141	+	checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
	2142	+
	2143	+	[[package]]
2060	2144		name = "windows_x86_64_msvc"
2061	2145		version = "0.36.1"
2062	2146		source = "registry+https://github.com/rust-lang/crates.io-index"
2063	2147		checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
2064	2148
2065	2149		[[package]]
	2150	+	name = "windows_x86_64_msvc"
	2151	+	version = "0.42.1"
	2152	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	2153	+	checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
	2154	+
	2155	+	[[package]]
2066	2156		name = "winit"
2067		-	version = "0.27.5"
	2157	+	version = "0.28.0"
2068	2158		source = "registry+https://github.com/rust-lang/crates.io-index"
2069		-	checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c"
	2159	+	checksum = "089b2f049a47946f11ea91838a832b303f65d6875d491df2952859eb18287ce8"
2070	2160		dependencies = [
	2161	+	"android-activity",
2071	2162		"bitflags",
2072		-	"cocoa",
	2163	+	"cfg_aliases",
2073	2164		"core-foundation",
2074	2165		"core-graphics",
2075	2166		"dispatch",
		skipped 2 lines
2078	2169		"log",
2079	2170		"mio 0.8.4",
2080	2171		"ndk",
2081		-	"ndk-glue",
2082		-	"objc",
	2172	+	"objc2",
2083	2173		"once_cell",
2084		-	"parking_lot 0.12.1",
	2174	+	"orbclient",
2085	2175		"percent-encoding",
2086		-	"raw-window-handle 0.4.3",
2087		-	"raw-window-handle 0.5.0",
	2176	+	"raw-window-handle",
	2177	+	"redox_syscall 0.3.4",
2088	2178		"sctk-adwaita",
2089	2179		"serde",
2090	2180		"smithay-client-toolkit",
2091	2181		"wasm-bindgen",
2092	2182		"wayland-client",
	2183	+	"wayland-commons",
2093	2184		"wayland-protocols",
	2185	+	"wayland-scanner",
2094	2186		"web-sys",
2095		-	"windows-sys",
	2187	+	"windows-sys 0.45.0",
2096	2188		"x11-dl",
2097	2189		]
2098	2190
		skipped 92 lines

■ ■ ■ ■ ■ ■

alacritty/Cargo.toml

		skipped 29 lines
30	30		serde_yaml = "0.8"
31	31		serde_json = "1"
32	32		glutin = { version = "0.30.3", default-features = false, features = ["egl", "wgl"] }
33		-	winit = { version = "0.27.4", default-features = false, features = ["serde"] }
	33	+	winit = { version = "0.28.0", default-features = false, features = ["serde"] }
34	34		notify-debouncer-mini = { version = "0.2.1", default-features = false }
35	35		parking_lot = "0.12.0"
36	36		crossfont = { version = "0.5.0", features = ["force_system_fontconfig"] }
		skipped 51 lines
88	88		"glutin/wayland",
89	89		"winit/wayland",
90	90		"winit/wayland-dlopen",
91		-	"winit/wayland-csd-adwaita",
	91	+	"winit/wayland-csd-adwaita-crossfont",
92	92		"wayland-client"]
93	93		nightly = []
94	94

■ ■ ■ ■ ■ ■

alacritty/build.rs

		skipped 7 lines
8	8		fn main() {
9	9		let mut version = String::from(env!("CARGO_PKG_VERSION"));
10	10		if let Some(commit_hash) = commit_hash() {
11		-	version = format!("{} ({})", version, commit_hash);
	11	+	version = format!("{version} ({commit_hash})");
12	12		}
13		-	println!("cargo:rustc-env=VERSION={}", version);
	13	+	println!("cargo:rustc-env=VERSION={version}");
14	14
15	15		let dest = env::var("OUT_DIR").unwrap();
16	16		let mut file = File::create(Path::new(&dest).join("gl_bindings.rs")).unwrap();
		skipped 19 lines

■ ■ ■ ■ ■ ■

alacritty/src/config/ui_config.rs

		skipped 43 lines
44	44		pub debug: Debug,
45	45
46	46		/// Send escape sequences using the alt key.
47		-	pub alt_send_esc: bool,
	47	+	#[config(removed = "It's now always set to 'true'. If you're on macOS use \
	48	+	'window.option_as_alt' to alter behavior of Option")]
	49	+	pub alt_send_esc: Option<bool>,
48	50
49	51		/// Live config reload.
50	52		pub live_config_reload: bool,
		skipped 37 lines
88	90		fn default() -> Self {
89	91		Self {
90	92		live_config_reload: true,
91		-	alt_send_esc: true,
	93	+	alt_send_esc: Default::default(),
92	94		#[cfg(unix)]
93	95		ipc_socket: true,
94	96		font: Default::default(),
		skipped 425 lines

■ ■ ■ ■ ■ ■

alacritty/src/config/window.rs

		skipped 3 lines
4	4		use log::{error, warn};
5	5		use serde::de::{self, MapAccess, Visitor};
6	6		use serde::{Deserialize, Deserializer, Serialize};
7		-	use winit::window::Fullscreen;
	7	+	use winit::window::{Fullscreen, Theme};
	8	+
	9	+	#[cfg(target_os = "macos")]
	10	+	use winit::platform::macos::OptionAsAlt;
8	11
9	12		use alacritty_config_derive::{ConfigDeserialize, SerdeReplace};
10	13		use alacritty_terminal::config::{Percentage, LOG_TARGET_CONFIG};
		skipped 19 lines
30	33		#[config(skip)]
31	34		pub embed: Option<c_ulong>,
32	35
33		-	/// GTK theme variant.
34		-	#[config(deprecated = "use window.decorations_theme_variant instead")]
35		-	gtk_theme_variant: Option<String>,
36		-
37	36		/// System decorations theme variant.
38		-	///
39		-	/// Controls GTK theme variant on X11 and winit client side decorations on Wayland.
40		-	decorations_theme_variant: Option<String>,
	37	+	pub decorations_theme_variant: Option<Theme>,
41	38
42	39		/// Spread out additional padding evenly.
43	40		pub dynamic_padding: bool,
		skipped 8 lines
52	49		/// Background opacity from 0.0 to 1.0.
53	50		pub opacity: Percentage,
54	51
	52	+	/// Controls which `Option` key should be treated as `Alt`.
	53	+	#[cfg(target_os = "macos")]
	54	+	pub option_as_alt: OptionAsAlt,
	55	+
55	56		/// Pixel padding.
56	57		padding: Delta<u8>,
57	58
		skipped 10 lines
68	69		startup_mode: Default::default(),
69	70		embed: Default::default(),
70	71		decorations_theme_variant: Default::default(),
71		-	gtk_theme_variant: Default::default(),
72	72		dynamic_padding: Default::default(),
73	73		identity: Identity::default(),
74	74		opacity: Default::default(),
75	75		padding: Default::default(),
76	76		dimensions: Default::default(),
	77	+	#[cfg(target_os = "macos")]
	78	+	option_as_alt: Default::default(),
77	79		}
78	80		}
79	81		}
		skipped 29 lines
109	111		} else {
110	112		None
111	113		}
112		-	}
113		-
114		-	#[cfg(not(any(target_os = "macos", windows)))]
115		-	#[inline]
116		-	pub fn decorations_theme_variant(&self) -> Option<&str> {
117		-	self.gtk_theme_variant
118		-	.as_ref()
119		-	.or(self.decorations_theme_variant.as_ref())
120		-	.map(\|theme\| theme.as_str())
121	114		}
122	115
123	116		#[inline]
		skipped 156 lines

■ ■ ■ ■ ■ ■

alacritty/src/display/window.rs

1		-	#[cfg(not(any(target_os = "macos", windows)))]
2		-	use winit::platform::unix::{WindowBuilderExtUnix, WindowExtUnix};
3		-
4	1		#[rustfmt::skip]
5	2		#[cfg(all(feature = "wayland", not(any(target_os = "macos", windows))))]
6	3		use {
7	4		wayland_client::protocol::wl_surface::WlSurface,
8	5		wayland_client::{Attached, EventQueue, Proxy},
9		-	winit::platform::unix::EventLoopWindowTargetExtUnix,
10		-	winit::window::Theme,
	6	+	winit::platform::wayland::{EventLoopWindowTargetExtWayland, WindowExtWayland},
11	7		};
12	8
	9	+	#[cfg(all(not(feature = "x11"), not(any(target_os = "macos", windows))))]
	10	+	use winit::platform::wayland::WindowBuilderExtWayland;
	11	+
13	12		#[rustfmt::skip]
14	13		#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
15	14		use {
16	15		std::io::Cursor,
17	16
	17	+	winit::platform::x11::{WindowExtX11, WindowBuilderExtX11},
18	18		glutin::platform::x11::X11VisualInfo,
19	19		x11_dl::xlib::{Display as XDisplay, PropModeReplace, XErrorEvent, Xlib},
20	20		winit::window::Icon,
		skipped 9 lines
30	30		cocoa::appkit::NSColorSpace,
31	31		cocoa::base::{id, nil, NO, YES},
32	32		objc::{msg_send, sel, sel_impl},
33		-	winit::platform::macos::{WindowBuilderExtMacOS, WindowExtMacOS},
	33	+	winit::platform::macos::{OptionAsAlt, WindowBuilderExtMacOS, WindowExtMacOS},
34	34		};
35	35
36	36		use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
		skipped 4 lines
41	41		#[cfg(windows)]
42	42		use winit::platform::windows::IconExtWindows;
43	43		use winit::window::{
44		-	CursorIcon, Fullscreen, UserAttentionType, Window as WinitWindow, WindowBuilder, WindowId,
	44	+	CursorIcon, Fullscreen, ImePurpose, UserAttentionType, Window as WinitWindow, WindowBuilder,
	45	+	WindowId,
45	46		};
46	47
47	48		use alacritty_terminal::index::Point;
		skipped 103 lines
151	152		.with_position(PhysicalPosition::<i32>::from((position.x, position.y)));
152	153		}
153	154
154		-	let window = window_builder.build(event_loop)?;
	155	+	let window = window_builder
	156	+	.with_title(&identity.title)
	157	+	.with_theme(config.window.decorations_theme_variant)
	158	+	.with_visible(false)
	159	+	.with_transparent(true)
	160	+	.with_maximized(config.window.maximized())
	161	+	.with_fullscreen(config.window.fullscreen())
	162	+	.build(event_loop)?;
155	163
156	164		// Check if we're running Wayland to disable vsync.
157	165		#[cfg(all(feature = "wayland", not(any(target_os = "macos", windows))))]
		skipped 7 lines
165	173
166	174		// Enable IME.
167	175		window.set_ime_allowed(true);
	176	+	window.set_ime_purpose(ImePurpose::Terminal);
	177	+
	178	+	// Set initial transparency hint.
	179	+	window.set_transparent(config.window_opacity() < 1.);
168	180
169	181		#[cfg(target_os = "macos")]
170	182		use_srgb_color_space(&window);
		skipped 105 lines
276	288		};
277	289
278	290		let builder = WindowBuilder::new()
279		-	.with_title(&identity.title)
280	291		.with_name(&identity.class.general, &identity.class.instance)
281		-	.with_visible(false)
282		-	.with_transparent(true)
283		-	.with_decorations(window_config.decorations != Decorations::None)
284		-	.with_maximized(window_config.maximized())
285		-	.with_fullscreen(window_config.fullscreen());
	292	+	.with_decorations(window_config.decorations != Decorations::None);
286	293
287	294		#[cfg(feature = "x11")]
288	295		let builder = builder.with_window_icon(Some(icon));
289	296
290	297		#[cfg(feature = "x11")]
291		-	let builder = match window_config.decorations_theme_variant() {
292		-	Some(val) => builder.with_gtk_theme_variant(val.to_string()),
293		-	None => builder,
294		-	};
295		-
296		-	#[cfg(feature = "x11")]
297	298		let builder = match x11_visual {
298	299		Some(visual) => builder.with_x11_visual(visual.into_raw()),
299	300		None => builder,
300	301		};
301	302
302		-	#[cfg(feature = "wayland")]
303		-	let builder = match window_config.decorations_theme_variant() {
304		-	Some("light") => builder.with_wayland_csd_theme(Theme::Light),
305		-	// Prefer dark theme by default, since default alacritty theme is dark.
306		-	_ => builder.with_wayland_csd_theme(Theme::Dark),
307		-	};
308		-
309	303		builder
310	304		}
311	305
312	306		#[cfg(windows)]
313		-	pub fn get_platform_window(identity: &Identity, window_config: &WindowConfig) -> WindowBuilder {
	307	+	pub fn get_platform_window(_: &Identity, window_config: &WindowConfig) -> WindowBuilder {
314	308		let icon = winit::window::Icon::from_resource(IDI_ICON, None);
315	309
316	310		WindowBuilder::new()
317		-	.with_title(&identity.title)
318		-	.with_visible(false)
319	311		.with_decorations(window_config.decorations != Decorations::None)
320		-	.with_transparent(true)
321		-	.with_maximized(window_config.maximized())
322		-	.with_fullscreen(window_config.fullscreen())
323	312		.with_window_icon(icon.ok())
324	313		}
325	314
326	315		#[cfg(target_os = "macos")]
327		-	pub fn get_platform_window(identity: &Identity, window_config: &WindowConfig) -> WindowBuilder {
328		-	let window = WindowBuilder::new()
329		-	.with_title(&identity.title)
330		-	.with_visible(false)
331		-	.with_transparent(true)
332		-	.with_maximized(window_config.maximized())
333		-	.with_fullscreen(window_config.fullscreen());
	316	+	pub fn get_platform_window(_: &Identity, window_config: &WindowConfig) -> WindowBuilder {
	317	+	let window = WindowBuilder::new().with_option_as_alt(window_config.option_as_alt);
334	318
335	319		match window_config.decorations {
336	320		Decorations::Full => window,
		skipped 20 lines
357	341		self.window.id()
358	342		}
359	343
	344	+	pub fn set_transparent(&self, transparent: bool) {
	345	+	self.window.set_transparent(transparent);
	346	+	}
	347	+
360	348		pub fn set_maximized(&self, maximized: bool) {
361	349		self.window.set_maximized(maximized);
362	350		}
		skipped 15 lines
378	366		#[cfg(target_os = "macos")]
379	367		pub fn toggle_simple_fullscreen(&self) {
380	368		self.set_simple_fullscreen(!self.window.simple_fullscreen());
	369	+	}
	370	+
	371	+	#[cfg(target_os = "macos")]
	372	+	pub fn set_option_as_alt(&self, option_as_alt: OptionAsAlt) {
	373	+	self.window.set_option_as_alt(option_as_alt);
381	374		}
382	375
383	376		pub fn set_fullscreen(&self, fullscreen: bool) {
		skipped 102 lines

■ ■ ■ ■ ■ ■

alacritty/src/event.rs

		skipped 25 lines
26	26		};
27	27		use winit::platform::run_return::EventLoopExtRunReturn;
28	28		#[cfg(all(feature = "wayland", not(any(target_os = "macos", windows))))]
29		-	use winit::platform::unix::EventLoopWindowTargetExtUnix;
	29	+	use winit::platform::wayland::EventLoopWindowTargetExtWayland;
30	30		use winit::window::WindowId;
31	31
32	32		use crossfont::{self, Size};
		skipped 1247 lines
1280	1280		},
1281	1281		WindowEvent::KeyboardInput { is_synthetic: true, .. }
1282	1282		\| WindowEvent::TouchpadPressure { .. }
	1283	+	\| WindowEvent::TouchpadMagnify { .. }
	1284	+	\| WindowEvent::TouchpadRotate { .. }
	1285	+	\| WindowEvent::SmartMagnify { .. }
1283	1286		\| WindowEvent::ScaleFactorChanged { .. }
1284	1287		\| WindowEvent::CursorEntered { .. }
1285	1288		\| WindowEvent::AxisMotion { .. }
		skipped 341 lines

■ ■ ■ ■ ■ ■

alacritty/src/input.rs

		skipped 867 lines
868	868		let mut bytes = vec![0; utf8_len];
869	869		c.encode_utf8(&mut bytes[..]);
870	870
871		-	if self.ctx.config().alt_send_esc
872		-	&& *self.ctx.received_count() == 0
873		-	&& self.ctx.modifiers().alt()
874		-	&& utf8_len == 1
875		-	{
	871	+	if *self.ctx.received_count() == 0 && self.ctx.modifiers().alt() && utf8_len == 1 {
876	872		bytes.insert(0, b'\x1b');
877	873		}
878	874
		skipped 510 lines

■ ■ ■ ■ ■ ■

alacritty/src/main.rs

		skipped 24 lines
25	25		use windows_sys::Win32::System::Console::{AttachConsole, FreeConsole, ATTACH_PARENT_PROCESS};
26	26		use winit::event_loop::EventLoopBuilder as WinitEventLoopBuilder;
27	27		#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
28		-	use winit::platform::unix::EventLoopWindowTargetExtUnix;
	28	+	use winit::platform::x11::EventLoopWindowTargetExtX11;
29	29
30	30		use alacritty_terminal::tty;
31	31
		skipped 199 lines

■ ■ ■ ■ ■ ■

alacritty/src/renderer/platform.rs

		skipped 13 lines
14	14		use raw_window_handle::{RawDisplayHandle, RawWindowHandle};
15	15		use winit::dpi::PhysicalSize;
16	16		#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
17		-	use winit::platform::unix;
	17	+	use winit::platform::x11;
18	18
19	19		/// Create the GL display.
20	20		pub fn create_gl_display(
		skipped 7 lines
28	28		let preference = DisplayApiPreference::Wgl(Some(_raw_window_handle.unwrap()));
29	29
30	30		#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
31		-	let preference = DisplayApiPreference::GlxThenEgl(Box::new(unix::register_xlib_error_hook));
	31	+	let preference = DisplayApiPreference::GlxThenEgl(Box::new(x11::register_xlib_error_hook));
32	32
33	33		#[cfg(all(not(feature = "x11"), not(any(target_os = "macos", windows))))]
34	34		let preference = DisplayApiPreference::Egl;
		skipped 86 lines

■ ■ ■ ■ ■ ■

alacritty/src/window_context.rs

		skipped 331 lines
332	332		self.display.window.set_title(self.config.window.identity.title.clone());
333	333		}
334	334
	335	+	let opaque = self.config.window_opacity() >= 1.;
	336	+
335	337		// Disable shadows for transparent windows on macOS.
336	338		#[cfg(target_os = "macos")]
337		-	self.display.window.set_has_shadow(self.config.window_opacity() >= 1.0);
	339	+	self.display.window.set_has_shadow(opaque);
	340	+
	341	+	#[cfg(target_os = "macos")]
	342	+	self.display.window.set_option_as_alt(self.config.window.option_as_alt);
	343	+
	344	+	// Change opacity state.
	345	+	self.display.window.set_transparent(!opaque);
338	346
339	347		// Update hint keys.
340	348		self.display.hint_state.update_alphabet(self.config.hints.alphabet());
		skipped 246 lines

■ ■ ■ ■ ■ ■

alacritty.yml

		skipped 93 lines
94	94		# General application class
95	95		#general: Alacritty
96	96
97		-	# Decorations theme variant (Linux/BSD only)
	97	+	# Decorations theme variant
98	98		#
99		-	# Override the variant of the GTK theme/Wayland client side decorations.
100		-	# Commonly supported values are `dark` and `light`. Set this to `None` to use
101		-	# the default theme variant.
	99	+	# Override the variant of the System theme/GTK theme/Wayland client side
	100	+	# decorations. Commonly supported values are `Dark`, `Light`, and `None` for
	101	+	# auto pick-up. Set this to `None` to use the default theme variant.
102	102		#decorations_theme_variant: None
	103	+
	104	+	# Make `Option` key behave as `Alt` (macOS only):
	105	+	# - OnlyLeft
	106	+	# - OnlyRight
	107	+	# - Both
	108	+	# - None (default)
	109	+	#option_as_alt: None
103	110
104	111		#scrolling:
105	112		# Maximum number of lines in the scrollback buffer.
		skipped 342 lines
448	455		# Directory the shell is started in. If this is unset, or `None`, the working
449	456		# directory of the parent process will be used.
450	457		#working_directory: None
451		-
452		-	# Send ESC (\x1b) before characters when alt is pressed.
453		-	#alt_send_esc: true
454	458
455	459		# Offer IPC using `alacritty msg` (unix only)
456	460		#ipc_socket: true
		skipped 446 lines

■ ■ ■ ■ ■ ■

alacritty_config/Cargo.toml

		skipped 12 lines
13	13		serde_yaml = "0.8.24"
14	14		serde = "1.0.137"
15	15
	16	+	[target.'cfg(target_os = "macos")'.dependencies]
	17	+	winit = { version = "0.28.0", default-features = false, features = ["serde"] }
	18	+

■ ■ ■ ■ ■ ■

alacritty_config/src/lib.rs

		skipped 31 lines
32	32		LevelFilter,
33	33		);
34	34
	35	+	#[cfg(target_os = "macos")]
	36	+	impl_replace!(winit::platform::macos::OptionAsAlt,);
	37	+
35	38		fn replace_simple<'de, D>(data: &mut D, key: &str, value: Value) -> Result<(), Box<dyn Error>>
36	39		where
37	40		D: Deserialize<'de>,
38	41		{
39	42		if !key.is_empty() {
40		-	let error = format!("Fields \"{}\" do not exist", key);
	43	+	let error = format!("Fields \"{key}\" do not exist");
41	44		return Err(error.into());
42	45		}
43	46		*data = D::deserialize(value)?;
		skipped 22 lines

■ ■ ■ ■ ■ ■

alacritty_config_derive/src/config_deserialize/de_enum.rs

		skipped 18 lines
19	19		}) {
20	20		let variant_ident = &variant.ident;
21	21		let variant_str = variant_ident.to_string();
22		-	available_values = format!("{}`{}`, ", available_values, variant_str);
	22	+	available_values = format!("{available_values}`{variant_str}`, ");
23	23
24	24		let literal = variant_str.to_lowercase();
25	25
		skipped 47 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/ansi.rs

		skipped 1002 lines
1003	1003		if let Some(c) = xparse_color(chunk[1]) {
1004	1004		self.handler.set_color(index as usize, c);
1005	1005		} else if chunk[1] == b"?" {
1006		-	let prefix = format!("4;{}", index);
	1006	+	let prefix = format!("4;{index}");
1007	1007		self.handler.dynamic_color_sequence(prefix, index as usize, terminator);
1008	1008		} else {
1009	1009		unhandled(params);
		skipped 846 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/config/scrolling.rs

		skipped 48 lines
49	49
50	50		if lines > MAX_SCROLLBACK_LINES {
51	51		Err(SerdeError::custom(format!(
52		-	"exceeded maximum scrolling history ({}/{})",
53		-	lines, MAX_SCROLLBACK_LINES
	52	+	"exceeded maximum scrolling history ({lines}/{MAX_SCROLLBACK_LINES})"
54	53		)))
55	54		} else {
56	55		Ok(Self(lines))
		skipped 4 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/event.rs

		skipped 56 lines
57	57		impl Debug for Event {
58	58		fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
59	59		match self {
60		-	Event::ClipboardStore(ty, text) => write!(f, "ClipboardStore({:?}, {})", ty, text),
61		-	Event::ClipboardLoad(ty, _) => write!(f, "ClipboardLoad({:?})", ty),
	60	+	Event::ClipboardStore(ty, text) => write!(f, "ClipboardStore({ty:?}, {text})"),
	61	+	Event::ClipboardLoad(ty, _) => write!(f, "ClipboardLoad({ty:?})"),
62	62		Event::TextAreaSizeRequest(_) => write!(f, "TextAreaSizeRequest"),
63		-	Event::ColorRequest(index, _) => write!(f, "ColorRequest({})", index),
64		-	Event::PtyWrite(text) => write!(f, "PtyWrite({})", text),
65		-	Event::Title(title) => write!(f, "Title({})", title),
	63	+	Event::ColorRequest(index, _) => write!(f, "ColorRequest({index})"),
	64	+	Event::PtyWrite(text) => write!(f, "PtyWrite({text})"),
	65	+	Event::Title(title) => write!(f, "Title({title})"),
66	66		Event::CursorBlinkingChange => write!(f, "CursorBlinkingChange"),
67	67		Event::MouseCursorDirty => write!(f, "MouseCursorDirty"),
68	68		Event::ResetTitle => write!(f, "ResetTitle"),
		skipped 38 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/event_loop.rs

		skipped 338 lines
339	339		if let Err(err) = self.poll.poll(&mut events, timeout) {
340	340		match err.kind() {
341	341		ErrorKind::Interrupted => continue,
342		-	_ => panic!("EventLoop polling error: {:?}", err),
	342	+	_ => panic!("EventLoop polling error: {err:?}"),
343	343		}
344	344		}
345	345
		skipped 87 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/term/color.rs

		skipped 118 lines
119	119		{
120	120		Rgb::from_str(value).map_err(\|_\| {
121	121		E::custom(format!(
122		-	"failed to parse rgb color {}; expected hex color like #ff00ff",
123		-	value
	122	+	"failed to parse rgb color {value}; expected hex color like #ff00ff"
124	123		))
125	124		})
126	125		}
		skipped 95 lines
222	221		}
223	222
224	223		Rgb::from_str(value).map(CellRgb::Rgb).map_err(\|_\| {
225		-	E::custom(format!("failed to parse color {}; expected {}", value, EXPECTING))
	224	+	E::custom(format!("failed to parse color {value}; expected {EXPECTING}"))
226	225		})
227	226		}
228	227		}
		skipped 82 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/src/term/mod.rs

		skipped 1168 lines
1169	1169		Some('>') => {
1170	1170		trace!("Reporting secondary device attributes");
1171	1171		let version = version_number(env!("CARGO_PKG_VERSION"));
1172		-	let text = format!("\x1b[>0;{};1c", version);
	1172	+	let text = format!("\x1b[>0;{version};1c");
1173	1173		self.event_proxy.send_event(Event::PtyWrite(text));
1174	1174		},
1175	1175		_ => debug!("Unsupported device attributes intermediate"),
		skipped 768 lines
1944	1944		self.event_proxy.send_event(Event::TextAreaSizeRequest(Arc::new(move \|window_size\| {
1945	1945		let height = window_size.num_lines * window_size.cell_height;
1946	1946		let width = window_size.num_cols * window_size.cell_width;
1947		-	format!("\x1b[4;{};{}t", height, width)
	1947	+	format!("\x1b[4;{height};{width}t")
1948	1948		})));
1949	1949		}
1950	1950
		skipped 770 lines
2721	2721		term.reset_damage();
2722	2722		let vi_cursor_point = term.vi_mode_cursor.point;
2723	2723		let line = vi_cursor_point.line.0 as usize;
2724		-	let left = vi_cursor_point.column.0 as usize;
	2724	+	let left = vi_cursor_point.column.0;
2725	2725		let right = left;
2726	2726
2727	2727		let mut damaged_lines = match term.damage(None) {
		skipped 263 lines

■ ■ ■ ■ ■ ■

alacritty_terminal/tests/ref.rs

		skipped 125 lines
126	126		let cell = &term_grid[Line(i as i32)][Column(j)];
127	127		let original_cell = &grid[Line(i as i32)][Column(j)];
128	128		if original_cell != cell {
129		-	println!(
130		-	"[{i}][{j}] {original:?} => {now:?}",
131		-	i = i,
132		-	j = j,
133		-	original = original_cell,
134		-	now = cell,
135		-	);
	129	+	println!("[{i}][{j}] {original_cell:?} => {cell:?}",);
136	130		}
137	131		}
138	132		}
		skipped 7 lines