1
1
mirror of https://github.com/wez/wezterm.git synced 2024-12-25 14:22:37 +03:00
Commit Graph

1650 Commits

Author SHA1 Message Date
Wez Furlong
dab667ffc4 fonts: locator that only uses wezterm font_dirs config
This is useful when checking to make sure that your config works
independent of the system fonts.
2019-12-15 15:43:41 -08:00
Wez Furlong
d4fcd9432a remove unused rayon dep 2019-12-15 15:32:22 -08:00
Wez Furlong
ff4f0add98 clippy 2019-12-15 08:50:12 -08:00
Wez Furlong
0accf24181 finess some dead/unused code annotations 2019-12-15 08:38:52 -08:00
Wez Furlong
a465378dc4 fonts: readjust the glyph scaling code
As mentioned in f204ad9a82, this has
gone back and forth a few times.

This version avoids some artifacts by avoiding scaling in most cases.
The test scenario for this is to tab complete a directory name in
zsh; that causes a bold `/` glyph to be rendered which selects a
typeface with different metrics and would render a horizontal line
at either the top of bottom of the glyph.

Similarly, a `/` in italics (eg: comments in vim) would select a
third different font and have different artifact properties.

Now both of those artifacts are eliminated.
2019-12-15 08:07:13 -08:00
Wez Furlong
52dfce6c4e more mac + windows build tweaks 2019-12-14 22:38:24 -08:00
Wez Furlong
4fdee2baf0 maybe fix the windows build for anyhow changes 2019-12-14 22:27:37 -08:00
Wez Furlong
c6e4d31e47 maybe fix mac build for real 2019-12-14 22:20:50 -08:00
Wez Furlong
c87a1c3b03 maybe fixup compilation on macos and windows 2019-12-14 22:10:08 -08:00
Wez Furlong
9a2c7a1485 failure -> anyhow + thiserror 2019-12-14 21:43:05 -08:00
Wez Furlong
16cfe58d50 clippy 2019-12-14 16:41:17 -08:00
Wez Furlong
f7bc9d536a font: teach rasterizer to load a font only on demand 2019-12-14 15:36:50 -08:00
Wez Furlong
50f72c43b3 fonts: manage fontconfig and freetype associated files better
I noticed a lot of things bleeding into the process and its children,
so work a bit harder to trim the resource usage back
2019-12-14 15:22:47 -08:00
Wez Furlong
990d12fdf4 fonts: defer loading and setting font size
There's a lot of overhead for doing the size setting on each shaper
call!
2019-12-14 14:00:15 -08:00
Wez Furlong
21ab0887db fonts: freetype: metrics: skip sizing an undefined glyph 2019-12-14 13:16:57 -08:00
Wez Furlong
51c2646eee fonts: remove some unused code and fixup some warnings 2019-12-14 12:29:38 -08:00
Wez Furlong
f204ad9a82 fonts: fixed up shaping using allsorts
The issue mentioned from the prior commit was due to not breaking
out of the inner fallback loop, so we'd stack up multiple glyphs
with the same cluster value, causing the earlier versions to be
obscured by the later versions.

Adjust glyph width calculation: the metrics we were getting from
harfbuzz were synchronized with the font render size.  When we're
configured to use allsorts, the shaper metrics are not connected
to the render metrics and we can end up with the raw emoji glyph
width being much larger than the font advance metric value and
then render a giant heart emoji.   The revised calculations trigger
scaling if the glyph width is too wide.  I've gone back and forth
on that particular line a couple of times in the past: hopefully
this time we've got the right calculation?

I "fixed" the font metrics we compute and return from allsorts
by rounding them to the nearest integer value.  That makes the
spacing look better at my normal font size (8.3 -> 8) and makes
things look tighter.  It feels a bit magical IMO.
2019-12-14 10:17:31 -08:00
Wez Furlong
a9b0197075 fonts: add an Allsorts shaper
Adds the ability to specify `--font-shaper Allsorts` and use that
for metrics and shaping.

It is sufficient to expand things like ligatures, but there's something
slightly off about how the metrics are computed and they differ slightly
from the freetype renderer, which leads to some artifacts when rendering
with opengl.

One of my tests is to `grep message src/main.rs` to pull out the line
that has a selection of emoji.  The heart emoji is missing from that
line currently.

Refs: https://github.com/wez/wezterm/issues/66
2019-12-14 08:46:06 -08:00
Wez Furlong
72f4ec58e4 font: allsorts add helpers for shaping 2019-12-11 23:05:57 -08:00
Wez Furlong
414d465208 font: load more font metadata using allsorts 2019-12-11 22:20:46 -08:00
Wez Furlong
6ef899ddba fonts: simplify obtaining and stash the otf table 2019-12-11 22:05:11 -08:00
Wez Furlong
ad72362cbc eliminate dep on rental
Trading a lot of gross for a single line of gross
2019-12-11 21:40:07 -08:00
Wez Furlong
5696ce6304 fonts: add types for various font units
The idea is that this will make it easier to deal with alternate
rasterizers and shapers in later commits.
2019-12-10 09:01:55 -08:00
Wez Furlong
232555fd6c fonts: fix dpi scaling for hidpi displays 2019-12-09 22:15:58 -08:00
Wez Furlong
10b903afd8 fonts: fixup compilation on mac+windows 2019-12-09 22:10:55 -08:00
Wez Furlong
61776aa5a3 fonts: general implementation for config.font_dirs
This commit makes use of the allsorts font parser to
parse out matching fonts found under the `font_dirs`
locations.

The matching is imperfect but sufficient for my ad-hoc
local tests.

Using allsorts for this parsing/matching means that we
can implement font_dirs on all platforms; previously it
was only available when using some plumbing from font-kit.

Refs: https://github.com/wez/wezterm/issues/74
2019-12-09 21:59:34 -08:00
Wez Furlong
9a653ca663 fix subtraction underflow in debug mode 2019-12-09 21:52:36 -08:00
Wez Furlong
aed75850c5 fonts: remove references to long-dead fontconfig feature name 2019-12-09 20:26:58 -08:00
Wez Furlong
2d024845a7 fonts: rename font loader to locator 2019-12-09 20:06:12 -08:00
Wez Furlong
f89b52e53e fonts: add a basic font parse using allsorts
Refs: https://github.com/wez/wezterm/issues/66
2019-12-09 18:08:02 -08:00
Wez Furlong
e01fed8120 fonts: remove some dead code 2019-12-09 13:56:34 -08:00
Wez Furlong
0a0a895a5b fonts: remove fontconfigandfreetype.rs 2019-12-09 13:43:48 -08:00
Wez Furlong
988e996a76 fonts: remove font_system selection type
This simplifies things a bit by removing some boiler plate.
We can now control locator, shaper and rasterizer independently.
2019-12-09 13:35:38 -08:00
Wez Furlong
108942960f fonts: migrate default_font over to new stuff 2019-12-09 13:24:09 -08:00
Wez Furlong
6fdb693f2c fonts: cut raster and shaper over to new stuff 2019-12-09 13:17:40 -08:00
Wez Furlong
d4f0eb40f7 fonts: add a metics method to the shaper 2019-12-09 12:58:03 -08:00
Wez Furlong
c91345cbd6 fonts: FontConfiguration::resolve_font
Can now create a LoadedFont that ties together the new abstractions.
It's not yet sufficient to use in wezterm though.
2019-12-09 12:46:58 -08:00
Wez Furlong
cd07a31d84 fonts: start adding new stuff to FontConfiguration 2019-12-09 12:12:54 -08:00
Wez Furlong
accfc9b09c font: adjust interfaces to pass size information down 2019-12-09 08:33:11 -08:00
Wez Furlong
a05612960e font: fontkit: add missing fallback in font locator 2019-12-09 08:06:02 -08:00
Wez Furlong
5891277d1f fonts: move ft size computation into lower layer
This allows it to be shared between separated ft and harfbuzz code
2019-12-09 08:00:55 -08:00
Wez Furlong
17101b182e fix build on linux 2019-12-09 00:50:19 -08:00
Wez Furlong
b5a59a18fa fonts: extract the shaper concept 2019-12-09 00:06:47 -08:00
Wez Furlong
41d10811a6 fonts: break out the rasterizer concept 2019-12-08 23:27:10 -08:00
Wez Furlong
6f867ac3e2 fonts: start breaking out the loader/locator concept 2019-12-08 22:48:47 -08:00
Wez Furlong
151a915128 Improve FontKit rendering, but it is still bad
I don't think font-kit has enough data available for to make things
work the way we're used to.  In addition, the implementation of
the loader for core text has a lot of TODO's.

The state of the FontKit variant is that it basically renders glyphs
and they are aligned to the same baseline, but both the vert and
horz metrics are off; for example, `-` doesn't render.  The glyphs
are also under-sized.
2019-12-08 21:35:37 -08:00
Wez Furlong
ab86eb1c75 font-kit: enable its use on macos
FontKit is still broken, but FontKitAndFreeType works
2019-12-08 17:51:01 -08:00
Wez Furlong
55f2016683 fix subtraction underflow 2019-12-08 17:49:27 -08:00
Wez Furlong
6ea837fc14 TODONE 2019-12-08 16:41:28 -08:00
Wez Furlong
1e9d3571ba font-kit: add font_dirs configuration option
This is another option to help with the portable wezterm on a flash
drive use case.

When the font system is set to FontKitAndFreeType, the set of
directories specified by the `font_dirs` configuration option will
be scanned for fonts and used as a source for fonts.

In addition, any relative paths in the the `font_dirs` list will
be expanded relative to the configuration file path.

That allows deploying the following set of files to the root of
a flash drive:

* wezterm.exe
* wezterm.toml
* fonts/myfont.ttf

and with this config snippet:

```
font_system = "FontKitAndFreeType"
font_dir = ["fonts"]
```

wezterm will now consider myfont.ttf when loading fonts.

Refs: https://github.com/wez/wezterm/issues/73
2019-12-08 16:34:17 -08:00