mirror of
https://github.com/alacritty/alacritty.git
synced 2024-11-18 13:55:23 -05:00
bd8bd26c8b
Alacritty now runs on macOS using CoreText for font rendering. The font rendering subsystems were moved into a separate crate called `font`. The font crate provides a unified (albeit limited) API which wraps CoreText on macOS and FreeType/FontConfig on other platforms. The unified API differed slightly from what the original Rasterizer for freetype implemented, and it was updated accordingly. The cell separation properties (sep_x and sep_y) are now premultiplied into the cell width and height. They were previously passed through as uniforms to the shaders; removing them prevents a lot of redundant work. `libc` has some differences between Linux and macOS. `__errno_location` is not available on macOS, and the `errno` crate was brought in to provide a cross-platform API for dealing with errno. Differences in `openpty` were handled by implementing a macOS specific version. It would be worth investigating a way to unify the implementations at some point. A type mismatch with TIOCSCTTY was resolved with a cast. Differences in libc::passwd struct fields were resolved by using std::mem::uninitialized instead of zeroing the struct ourselves. This has the benefit of being much cleaner. The thread setup had to be changed to support both macOS and Linux. macOS requires that events from the window be handled on the main thread. Failure to do so will prevent the glutin window from even showing up! For this reason, the renderer and parser were moved to their own thread, and the input is received on the main thread. This is essentially reverse the setup prior to this commit. Renderer initialization (and thus font cache initialization) had to be moved to the rendering thread as well since there's no way to make_context(null) with glx on Linux. Trying to just call make_context a second time on the rendering thread had resulted in a panic!.
193 lines
6.1 KiB
TOML
193 lines
6.1 KiB
TOML
[root]
|
|
name = "font"
|
|
version = "0.1.0"
|
|
dependencies = [
|
|
"core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"core-text 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"euclid 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"freetype-rs 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"servo-fontconfig 0.2.0 (git+https://github.com/jwilm/rust-fontconfig)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "bitflags"
|
|
version = "0.6.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "core-foundation"
|
|
version = "0.2.2"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "core-foundation-sys"
|
|
version = "0.2.2"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "core-graphics"
|
|
version = "0.3.2"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"serde 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "core-text"
|
|
version = "1.1.1"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"core-graphics 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "euclid"
|
|
version = "0.6.8"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"serde 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "expat-sys"
|
|
version = "2.1.2"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"make-cmd 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "freetype-rs"
|
|
version = "0.9.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"freetype-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "freetype-sys"
|
|
version = "0.4.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libz-sys 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "gcc"
|
|
version = "0.3.28"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "heapsize"
|
|
version = "0.3.6"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "kernel32-sys"
|
|
version = "0.2.2"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "libc"
|
|
version = "0.2.11"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "libz-sys"
|
|
version = "1.0.4"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "log"
|
|
version = "0.3.6"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "make-cmd"
|
|
version = "0.1.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "num-traits"
|
|
version = "0.1.32"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "pkg-config"
|
|
version = "0.3.8"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "rustc-serialize"
|
|
version = "0.3.19"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "serde"
|
|
version = "0.7.9"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "servo-fontconfig"
|
|
version = "0.2.0"
|
|
source = "git+https://github.com/jwilm/rust-fontconfig#419135e5e1106ec0973dd4923bd9c70d8e438cc8"
|
|
dependencies = [
|
|
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"servo-fontconfig-sys 2.11.3 (git+https://github.com/jwilm/libfontconfig)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "servo-fontconfig-sys"
|
|
version = "2.11.3"
|
|
source = "git+https://github.com/jwilm/libfontconfig#618a52973d46e5cce4f054f6ee3bd2682167eee4"
|
|
dependencies = [
|
|
"expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"freetype-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
name = "winapi"
|
|
version = "0.2.7"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
[[package]]
|
|
name = "winapi-build"
|
|
version = "0.1.1"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|