mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-13 04:27:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fcft: update to 1.0.0

Browse source 
Allow/disallow subpixel antialiasing in font_glyph_for_wc(), not using
font_enable_subpixel_antialias().
This commit is contained in:
Daniel Eklöf 2020-01-19 12:44:21 +01:00
parent 15ef3ecfad
commit 767a0ec232
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PKGBUILD
View file

@ -5,7 +5,7 @@ arch=('x86_64')
url=https://codeberg.org/dnkl/foot
license=(mit)
makedepends=('meson' 'ninja' 'scdoc' 'python' 'ncurses' 'wayland-protocols' 'tllist>=1.0.0')
depends=('libxkbcommon' 'wayland' 'pixman' 'fcft>=0.4.3')
depends=('libxkbcommon' 'wayland' 'pixman' 'fcft>=1.0.0')
source=()
pkgver() {

2
meson.build
View file

@ -25,7 +25,7 @@ wayland_cursor = dependency('wayland-cursor')
xkb = dependency('xkbcommon')
tllist = dependency('tllist', version: '>=1.0.0', fallback: ['tllist', 'tllist'])
fcft = dependency('fcft', version: ['>=0.4.3', '<0.5.0'], fallback: ['fcft', 'fcft'])
fcft = dependency('fcft', version: ['>=1.0.0', '<2.0.0'], fallback: ['fcft', 'fcft'])
wayland_protocols_datadir = wayland_protocols.get_pkgconfig_variable('pkgdatadir')

5
render.c
View file

@ -418,7 +418,8 @@ render_cell(struct terminal *term, pixman_image_t *pix,
struct font *font = attrs_to_font(term, &cell->attrs);
const struct glyph *glyph = cell->wc != 0
? font_glyph_for_wc(font, cell->wc) : NULL;
? font_glyph_for_wc(font, cell->wc, term->colors.alpha == 0xffff)
: NULL;
int cell_cols = glyph != NULL ? max(1, glyph->cols) : 1;
@ -934,7 +935,7 @@ render_search_box(struct terminal *term)
if (i == term->search.cursor)
draw_bar(term, buf->pix, font, &fg, x, y);
const struct glyph *glyph = font_glyph_for_wc(font, term->search.buf[i]);
const struct glyph *glyph = font_glyph_for_wc(font, term->search.buf[i], true);
if (glyph == NULL)
continue;

14
terminal.c
View file

@ -515,23 +515,11 @@ initialize_fonts(struct terminal *term, const struct config *conf)
snprintf(attrs2, sizeof(attrs2), "dpi=%u:slant=italic", dpi);
snprintf(attrs3, sizeof(attrs3), "dpi=%u:weight=bold:slant=italic", dpi);
bool ret = (
return (
(term->fonts[0] = font_from_name(names, count, attrs0)) != NULL &&
(term->fonts[1] = font_from_name(names, count, attrs1)) != NULL &&
(term->fonts[2] = font_from_name(names, count, attrs2)) != NULL &&
(term->fonts[3] = font_from_name(names, count, attrs3)) != NULL);
LOG_DBG("%s subpixel antialiasing", conf->colors.alpha == 0xffff
? "enabling" : "disabling");
if (conf->colors.alpha == 0xffff) {
font_enable_subpixel_antialias(term->fonts[0]);
font_enable_subpixel_antialias(term->fonts[1]);
font_enable_subpixel_antialias(term->fonts[2]);
font_enable_subpixel_antialias(term->fonts[3]);
}
return ret;
}
struct terminal *