pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

Merge branch 'fcft-0.2.0'

Browse source
This commit is contained in:
Daniel Eklöf 2019-12-01 19:30:23 +01:00
commit b3f1694cb9
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
6 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PKGBUILD
View file

@ -5,7 +5,7 @@ pkgdesc="Simplistic and highly configurable status panel for X and Wayland"
arch=('x86_64')
url=https://codeberg.org/dnkl/yambar
license=(mit)
makedepends=('meson' 'ninja' 'scdoc')
makedepends=('meson' 'ninja' 'scdoc' 'tllist>=1.0.0')
depends=(
'libxcb' 'xcb-util' 'xcb-util-cursor' 'xcb-util-wm'
'wayland' 'wlroots'
@ -15,7 +15,7 @@ depends=(
'libudev.so'
'json-c'
'libmpdclient'
'tllist>=1.0.0' 'fcft>=0.1.0')
'fcft>=0.2.0')
optdepends=('xcb-util-errors: better X error messages')
source=()

4
PKGBUILD.wayland-only
View file

@ -7,7 +7,7 @@ url=https://codeberg.org/dnkl/yambar
license=(mit)
conflicts=('yambar')
provides=('yambar')
makedepends=('meson' 'ninja' 'scdoc')
makedepends=('meson' 'ninja' 'scdoc' 'tllist>=1.0.0')
depends=(
'wayland' 'wlroots'
'pixman'
@ -16,7 +16,7 @@ depends=(
'libudev.so'
'json-c'
'libmpdclient'
'tllist>=1.0.0' 'fcft>=0.1.0')
'fcft>=0.2.0')
source=()
pkgver() {

14
config.c
View file

@ -67,13 +67,7 @@ conf_to_color(const struct yml_node *node)
struct font *
conf_to_font(const struct yml_node *node)
{
font_list_t font_list = tll_init();
tll_push_back(font_list, yml_value_as_string(node));
struct font *font = font_from_name(font_list, NULL);
tll_free(font_list);
return font;
return font_from_name(&(const char *){yml_value_as_string(node)}, 1, NULL);
}
struct deco *
@ -269,11 +263,7 @@ conf_to_bar(const struct yml_node *bar, enum bar_backend backend)
* and particles. This allows us to specify a default font and
* foreground color at top-level.
*/
font_list_t font_list = tll_init();
tll_push_back(font_list, "sans");
struct font *font = font_from_name(font_list, NULL);
tll_free(font_list);
struct font *font = font_from_name(&(const char *){"sans"}, 1, NULL);
pixman_color_t foreground = {0xffff, 0xffff, 0xffff, 0xffff}; /* White */
const struct yml_node *font_node = yml_get_value(bar, "font");

2
meson.build
View file

@ -36,7 +36,7 @@ backend_wayland = wayland_client.found() and wayland_cursor.found() and wlroots.
# "My" dependencies, fallback to subproject
tllist = dependency('tllist', version: '>=1.0.0', fallback: ['tllist', 'tllist'])
fcft = dependency('fcft', version: ['>=0.1.0', '<0.2.0'], fallback: ['fcft', 'fcft'])
fcft = dependency('fcft', version: ['>=0.2.0', '<0.3.0'], fallback: ['fcft', 'fcft'])
add_project_arguments(
['-D_GNU_SOURCE'] +

5
particles/string.c
View file

@ -38,13 +38,8 @@ static int
begin_expose(struct exposable *exposable)
{
struct eprivate *e = exposable->private;
struct font *font = exposable->particle->font;
LOG_DBG("%s: ascent=%f, descent=%f, height=%f",
font->name, font->fextents.ascent,
font->fextents.descent, font->fextents.height);
e->glyphs = NULL;
e->num_glyphs = 0;

2
subprojects/fcft

@ -1 +1 @@
Subproject commit 97ded50d8f14e1fd55aac1f2ff1b46bc56c6fd8b
Subproject commit e4352f2c4c6b301b42c15e13ef34f1d734598ce7