mirror of
https://codeberg.org/dnkl/yambar.git
synced 2025-04-19 19:25:41 +02:00
This patch adds an inheritable option, “font-shaping”, that controls whether a particle that renders text should enable font-shaping or not. The option works similar to the ‘font’ option: one can set it at the top-level, and it gets inherited down through all modules and to their particles. Or, you can set it on a module and it gets inherited to all its particles, but not to other modules’ particles. Finally, you can set it on individual particles, in which case it only applies to them (or “child” particles). When font-shaping is enabled (the default), the string particle shapes full text runs using the fcft_rasterize_text_run_utf32() API. In fcft, this results in HarfBuzz being used to shape the string. When disabled, the string particle instead uses the simpler fcft_rasterize_char_utf32() API, which rasterizes individual characters. This gives user greater control over the font rendering. One example is bitmap fonts, which HarfBuzz often doesn’t get right. Closes #159
492 lines
16 KiB
C
492 lines
16 KiB
C
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
#include <ctype.h>
|
|
|
|
#include <dlfcn.h>
|
|
|
|
#include "bar/bar.h"
|
|
#include "color.h"
|
|
#include "config-verify.h"
|
|
#include "module.h"
|
|
#include "plugin.h"
|
|
|
|
#define LOG_MODULE "config"
|
|
#define LOG_ENABLE_DBG 0
|
|
#include "log.h"
|
|
|
|
static uint8_t
|
|
hex_nibble(char hex)
|
|
{
|
|
assert((hex >= '0' && hex <= '9') ||
|
|
(hex >= 'a' && hex <= 'f') ||
|
|
(hex >= 'A' && hex <= 'F'));
|
|
|
|
if (hex >= '0' && hex <= '9')
|
|
return hex - '0';
|
|
else if (hex >= 'a' && hex <= 'f')
|
|
return hex - 'a' + 10;
|
|
else
|
|
return hex - 'A' + 10;
|
|
}
|
|
|
|
static uint8_t
|
|
hex_byte(const char hex[2])
|
|
{
|
|
uint8_t upper = hex_nibble(hex[0]);
|
|
uint8_t lower = hex_nibble(hex[1]);
|
|
return upper << 4 | lower;
|
|
}
|
|
|
|
pixman_color_t
|
|
conf_to_color(const struct yml_node *node)
|
|
{
|
|
const char *hex = yml_value_as_string(node);
|
|
|
|
assert(hex != NULL);
|
|
assert(strlen(hex) == 8);
|
|
|
|
uint16_t red = hex_byte(&hex[0]);
|
|
uint16_t green = hex_byte(&hex[2]);
|
|
uint16_t blue = hex_byte(&hex[4]);
|
|
uint16_t alpha = hex_byte(&hex[6]);
|
|
|
|
alpha |= alpha << 8;
|
|
|
|
return (pixman_color_t){
|
|
.red = (uint32_t)(red << 8 | red) * alpha / 0xffff,
|
|
.green = (uint32_t)(green << 8 | green) * alpha / 0xffff,
|
|
.blue = (uint32_t)(blue << 8 | blue) * alpha / 0xffff,
|
|
.alpha = alpha,
|
|
};
|
|
}
|
|
|
|
struct fcft_font *
|
|
conf_to_font(const struct yml_node *node)
|
|
{
|
|
const char *font_spec = yml_value_as_string(node);
|
|
|
|
size_t count = 0;
|
|
size_t size = 0;
|
|
const char **fonts = NULL;
|
|
|
|
char *copy = strdup(font_spec);
|
|
for (const char *font = strtok(copy, ",");
|
|
font != NULL;
|
|
font = strtok(NULL, ","))
|
|
{
|
|
/* Trim spaces, strictly speaking not necessary, but looks nice :) */
|
|
while (isspace(font[0]))
|
|
font++;
|
|
|
|
if (font[0] == '\0')
|
|
continue;
|
|
|
|
if (count + 1 > size) {
|
|
size += 4;
|
|
fonts = realloc(fonts, size * sizeof(fonts[0]));
|
|
}
|
|
|
|
assert(count + 1 <= size);
|
|
fonts[count++] = font;
|
|
}
|
|
|
|
struct fcft_font *ret = fcft_from_name(count, fonts, NULL);
|
|
|
|
free(fonts);
|
|
free(copy);
|
|
return ret;
|
|
}
|
|
|
|
enum font_shaping
|
|
conf_to_font_shaping(const struct yml_node *node)
|
|
{
|
|
const char *v = yml_value_as_string(node);
|
|
|
|
if (strcmp(v, "none") == 0)
|
|
return FONT_SHAPE_NONE;
|
|
|
|
else if (strcmp(v, "graphemes") == 0) {
|
|
static bool have_warned = false;
|
|
|
|
if (!have_warned &&
|
|
!(fcft_capabilities() & FCFT_CAPABILITY_GRAPHEME_SHAPING))
|
|
{
|
|
have_warned = true;
|
|
LOG_WARN("cannot enable grapheme shaping; no support in fcft");
|
|
}
|
|
return FONT_SHAPE_GRAPHEMES;
|
|
}
|
|
|
|
else if (strcmp(v, "full") == 0) {
|
|
static bool have_warned = false;
|
|
|
|
if (!have_warned &&
|
|
!(fcft_capabilities() & FCFT_CAPABILITY_TEXT_RUN_SHAPING))
|
|
{
|
|
have_warned = true;
|
|
LOG_WARN("cannot enable full text shaping; no support in fcft");
|
|
}
|
|
return FONT_SHAPE_FULL;
|
|
}
|
|
|
|
else {
|
|
assert(false);
|
|
return FONT_SHAPE_NONE;
|
|
}
|
|
}
|
|
|
|
struct deco *
|
|
conf_to_deco(const struct yml_node *node)
|
|
{
|
|
struct yml_dict_iter it = yml_dict_iter(node);
|
|
const struct yml_node *deco_type = it.key;
|
|
const struct yml_node *deco_data = it.value;
|
|
|
|
const char *type = yml_value_as_string(deco_type);
|
|
const struct deco_iface *iface = plugin_load_deco(type);
|
|
|
|
assert(iface != NULL);
|
|
return iface->from_conf(deco_data);
|
|
}
|
|
|
|
static struct particle *
|
|
particle_simple_list_from_config(const struct yml_node *node,
|
|
struct conf_inherit inherited)
|
|
{
|
|
size_t count = yml_list_length(node);
|
|
struct particle *parts[count];
|
|
|
|
size_t idx = 0;
|
|
for (struct yml_list_iter it = yml_list_iter(node);
|
|
it.node != NULL;
|
|
yml_list_next(&it), idx++)
|
|
{
|
|
parts[idx] = conf_to_particle(it.node, inherited);
|
|
}
|
|
|
|
/* Lazy-loaded function pointer to particle_list_new() */
|
|
static struct particle *(*particle_list_new)(
|
|
struct particle *common,
|
|
struct particle *particles[], size_t count,
|
|
int left_spacing, int right_spacing) = NULL;
|
|
|
|
if (particle_list_new == NULL) {
|
|
const struct plugin *plug = plugin_load("list", PLUGIN_PARTICLE);
|
|
|
|
particle_list_new = dlsym(plug->lib, "particle_list_new");
|
|
assert(particle_list_new != NULL);
|
|
}
|
|
|
|
struct particle *common = particle_common_new(
|
|
0, 0, NULL, fcft_clone(inherited.font), inherited.font_shaping,
|
|
inherited.foreground, NULL);
|
|
|
|
return particle_list_new(common, parts, count, 0, 2);
|
|
}
|
|
|
|
struct particle *
|
|
conf_to_particle(const struct yml_node *node, struct conf_inherit inherited)
|
|
{
|
|
if (yml_is_list(node))
|
|
return particle_simple_list_from_config(node, inherited);
|
|
|
|
struct yml_dict_iter pair = yml_dict_iter(node);
|
|
const char *type = yml_value_as_string(pair.key);
|
|
|
|
const struct yml_node *margin = yml_get_value(pair.value, "margin");
|
|
const struct yml_node *left_margin = yml_get_value(pair.value, "left-margin");
|
|
const struct yml_node *right_margin = yml_get_value(pair.value, "right-margin");
|
|
const struct yml_node *on_click = yml_get_value(pair.value, "on-click");
|
|
const struct yml_node *font_node = yml_get_value(pair.value, "font");
|
|
const struct yml_node *font_shaping_node = yml_get_value(pair.value, "font-shaping");
|
|
const struct yml_node *foreground_node = yml_get_value(pair.value, "foreground");
|
|
const struct yml_node *deco_node = yml_get_value(pair.value, "deco");
|
|
|
|
int left = margin != NULL ? yml_value_as_int(margin) :
|
|
left_margin != NULL ? yml_value_as_int(left_margin) : 0;
|
|
int right = margin != NULL ? yml_value_as_int(margin) :
|
|
right_margin != NULL ? yml_value_as_int(right_margin) : 0;
|
|
|
|
const char *on_click_templates[MOUSE_BTN_COUNT] = {NULL};
|
|
if (on_click != NULL) {
|
|
const char *legacy = yml_value_as_string(on_click);
|
|
|
|
if (legacy != NULL)
|
|
on_click_templates[MOUSE_BTN_LEFT] = legacy;
|
|
|
|
if (yml_is_dict(on_click)) {
|
|
for (struct yml_dict_iter it = yml_dict_iter(on_click);
|
|
it.key != NULL;
|
|
yml_dict_next(&it))
|
|
{
|
|
const char *key = yml_value_as_string(it.key);
|
|
const char *template = yml_value_as_string(it.value);
|
|
|
|
if (strcmp(key, "left") == 0)
|
|
on_click_templates[MOUSE_BTN_LEFT] = template;
|
|
else if (strcmp(key, "middle") == 0)
|
|
on_click_templates[MOUSE_BTN_MIDDLE] = template;
|
|
else if (strcmp(key, "right") == 0)
|
|
on_click_templates[MOUSE_BTN_RIGHT] = template;
|
|
else if (strcmp(key, "wheel-up") == 0)
|
|
on_click_templates[MOUSE_BTN_WHEEL_UP] = template;
|
|
else if (strcmp(key, "wheel-down") == 0)
|
|
on_click_templates[MOUSE_BTN_WHEEL_DOWN] = template;
|
|
else
|
|
assert(false);
|
|
}
|
|
}
|
|
}
|
|
|
|
struct deco *deco = deco_node != NULL ? conf_to_deco(deco_node) : NULL;
|
|
|
|
/*
|
|
* Font and foreground are inheritable attributes. Each particle
|
|
* may specify its own font/foreground values, which will then be
|
|
* used by itself, and all its sub-particles. If *not* specified,
|
|
* we inherit the values from our parent. Note that since
|
|
* particles actually *use* the font/foreground values, we must
|
|
* clone the font, since each particle takes ownership of its own
|
|
* font.
|
|
*/
|
|
struct fcft_font *font = font_node != NULL
|
|
? conf_to_font(font_node) : fcft_clone(inherited.font);
|
|
enum font_shaping font_shaping = font_shaping_node != NULL
|
|
? conf_to_font_shaping(font_shaping_node) : inherited.font_shaping;
|
|
pixman_color_t foreground = foreground_node != NULL
|
|
? conf_to_color(foreground_node) : inherited.foreground;
|
|
|
|
/* Instantiate base/common particle */
|
|
struct particle *common = particle_common_new(
|
|
left, right, on_click_templates, font, font_shaping, foreground, deco);
|
|
|
|
const struct particle_iface *iface = plugin_load_particle(type);
|
|
|
|
assert(iface != NULL);
|
|
return iface->from_conf(pair.value, common);
|
|
}
|
|
|
|
struct bar *
|
|
conf_to_bar(const struct yml_node *bar, enum bar_backend backend)
|
|
{
|
|
if (!conf_verify_bar(bar))
|
|
return NULL;
|
|
|
|
struct bar_config conf = {
|
|
.backend = backend,
|
|
.layer = BAR_LAYER_BOTTOM,
|
|
.font_shaping = FONT_SHAPE_FULL,
|
|
};
|
|
|
|
/*
|
|
* Required attributes
|
|
*/
|
|
|
|
const struct yml_node *height = yml_get_value(bar, "height");
|
|
conf.height = yml_value_as_int(height);
|
|
|
|
const struct yml_node *location = yml_get_value(bar, "location");
|
|
conf.location = strcmp(yml_value_as_string(location), "top") == 0
|
|
? BAR_TOP : BAR_BOTTOM;
|
|
|
|
const struct yml_node *background = yml_get_value(bar, "background");
|
|
conf.background = conf_to_color(background);
|
|
|
|
/*
|
|
* Optional attributes
|
|
*/
|
|
|
|
const struct yml_node *monitor = yml_get_value(bar, "monitor");
|
|
if (monitor != NULL)
|
|
conf.monitor = yml_value_as_string(monitor);
|
|
|
|
const struct yml_node *layer = yml_get_value(bar, "layer");
|
|
if (layer != NULL) {
|
|
const char *tmp = yml_value_as_string(layer);
|
|
if (strcmp(tmp, "top") == 0)
|
|
conf.layer = BAR_LAYER_TOP;
|
|
else if (strcmp(tmp, "bottom") == 0)
|
|
conf.layer = BAR_LAYER_BOTTOM;
|
|
else
|
|
assert(false);
|
|
}
|
|
|
|
|
|
const struct yml_node *spacing = yml_get_value(bar, "spacing");
|
|
if (spacing != NULL)
|
|
conf.left_spacing = conf.right_spacing = yml_value_as_int(spacing);
|
|
|
|
const struct yml_node *left_spacing = yml_get_value(bar, "left-spacing");
|
|
if (left_spacing != NULL)
|
|
conf.left_spacing = yml_value_as_int(left_spacing);
|
|
|
|
const struct yml_node *right_spacing = yml_get_value(bar, "right-spacing");
|
|
if (right_spacing != NULL)
|
|
conf.right_spacing = yml_value_as_int(right_spacing);
|
|
|
|
const struct yml_node *margin = yml_get_value(bar, "margin");
|
|
if (margin != NULL)
|
|
conf.left_margin = conf.right_margin = yml_value_as_int(margin);
|
|
|
|
const struct yml_node *left_margin = yml_get_value(bar, "left-margin");
|
|
if (left_margin != NULL)
|
|
conf.left_margin = yml_value_as_int(left_margin);
|
|
|
|
const struct yml_node *right_margin = yml_get_value(bar, "right-margin");
|
|
if (right_margin != NULL)
|
|
conf.right_margin = yml_value_as_int(right_margin);
|
|
|
|
const struct yml_node *trackpad_sensitivity =
|
|
yml_get_value(bar, "trackpad-sensitivity");
|
|
conf.trackpad_sensitivity = trackpad_sensitivity != NULL
|
|
? yml_value_as_int(trackpad_sensitivity)
|
|
: 30;
|
|
|
|
const struct yml_node *border = yml_get_value(bar, "border");
|
|
if (border != NULL) {
|
|
const struct yml_node *width = yml_get_value(border, "width");
|
|
const struct yml_node *left_width = yml_get_value(border, "left-width");
|
|
const struct yml_node *right_width = yml_get_value(border, "right-width");
|
|
const struct yml_node *top_width = yml_get_value(border, "top-width");
|
|
const struct yml_node *bottom_width = yml_get_value(border, "bottom-width");
|
|
const struct yml_node *color = yml_get_value(border, "color");
|
|
const struct yml_node *margin = yml_get_value(border, "margin");
|
|
const struct yml_node *left_margin = yml_get_value(border, "left-margin");
|
|
const struct yml_node *right_margin = yml_get_value(border, "right-margin");
|
|
const struct yml_node *top_margin = yml_get_value(border, "top-margin");
|
|
const struct yml_node *bottom_margin = yml_get_value(border, "bottom-margin");
|
|
|
|
if (width != NULL)
|
|
conf.border.left_width =
|
|
conf.border.right_width =
|
|
conf.border.top_width =
|
|
conf.border.bottom_width = yml_value_as_int(width);
|
|
|
|
if (left_width != NULL)
|
|
conf.border.left_width = yml_value_as_int(left_width);
|
|
if (right_width != NULL)
|
|
conf.border.right_width = yml_value_as_int(right_width);
|
|
if (top_width != NULL)
|
|
conf.border.top_width = yml_value_as_int(top_width);
|
|
if (bottom_width != NULL)
|
|
conf.border.bottom_width = yml_value_as_int(bottom_width);
|
|
|
|
if (color != NULL)
|
|
conf.border.color = conf_to_color(color);
|
|
|
|
if (margin != NULL)
|
|
conf.border.left_margin =
|
|
conf.border.right_margin =
|
|
conf.border.top_margin =
|
|
conf.border.bottom_margin = yml_value_as_int(margin);
|
|
|
|
if (left_margin != NULL)
|
|
conf.border.left_margin = yml_value_as_int(left_margin);
|
|
if (right_margin != NULL)
|
|
conf.border.right_margin = yml_value_as_int(right_margin);
|
|
if (top_margin != NULL)
|
|
conf.border.top_margin = yml_value_as_int(top_margin);
|
|
if (bottom_margin != NULL)
|
|
conf.border.bottom_margin = yml_value_as_int(bottom_margin);
|
|
}
|
|
|
|
/*
|
|
* Create a default font and foreground
|
|
*
|
|
* These aren't used by the bar itself, but passed down to modules
|
|
* and particles. This allows us to specify a default font and
|
|
* foreground color at top-level.
|
|
*/
|
|
struct fcft_font *font = fcft_from_name(1, &(const char *){"sans"}, NULL);
|
|
enum font_shaping font_shaping = FONT_SHAPE_FULL;
|
|
pixman_color_t foreground = {0xffff, 0xffff, 0xffff, 0xffff}; /* White */
|
|
|
|
const struct yml_node *font_node = yml_get_value(bar, "font");
|
|
if (font_node != NULL) {
|
|
fcft_destroy(font);
|
|
font = conf_to_font(font_node);
|
|
}
|
|
|
|
const struct yml_node *font_shaping_node = yml_get_value(bar, "font-shaping");
|
|
if (font_shaping_node != NULL)
|
|
font_shaping = conf_to_font_shaping(font_shaping_node);
|
|
|
|
const struct yml_node *foreground_node = yml_get_value(bar, "foreground");
|
|
if (foreground_node != NULL)
|
|
foreground = conf_to_color(foreground_node);
|
|
|
|
struct conf_inherit inherited = {
|
|
.font = font,
|
|
.font_shaping = font_shaping,
|
|
.foreground = foreground,
|
|
};
|
|
|
|
const struct yml_node *left = yml_get_value(bar, "left");
|
|
const struct yml_node *center = yml_get_value(bar, "center");
|
|
const struct yml_node *right = yml_get_value(bar, "right");
|
|
|
|
for (size_t i = 0; i < 3; i++) {
|
|
const struct yml_node *node = i == 0 ? left : i == 1 ? center : right;
|
|
|
|
if (node != NULL) {
|
|
const size_t count = yml_list_length(node);
|
|
struct module **mods = calloc(count, sizeof(*mods));
|
|
|
|
size_t idx = 0;
|
|
for (struct yml_list_iter it = yml_list_iter(node);
|
|
it.node != NULL;
|
|
yml_list_next(&it), idx++)
|
|
{
|
|
struct yml_dict_iter m = yml_dict_iter(it.node);
|
|
const char *mod_name = yml_value_as_string(m.key);
|
|
|
|
/*
|
|
* These aren't used by the modules, but passed down
|
|
* to particles. This allows us to specify a default
|
|
* font and foreground for each module, and having it
|
|
* applied to all its particles.
|
|
*/
|
|
const struct yml_node *mod_font = yml_get_value(m.value, "font");
|
|
const struct yml_node *mod_font_shaping = yml_get_value(m.value, "font-shaping");
|
|
const struct yml_node *mod_foreground = yml_get_value(
|
|
m.value, "foreground");
|
|
|
|
struct conf_inherit mod_inherit = {
|
|
.font = mod_font != NULL
|
|
? conf_to_font(mod_font) : inherited.font,
|
|
.font_shaping = mod_font_shaping != NULL
|
|
? conf_to_font_shaping(mod_font_shaping) : inherited.font_shaping,
|
|
.foreground = mod_foreground != NULL
|
|
? conf_to_color(mod_foreground) : inherited.foreground,
|
|
};
|
|
|
|
const struct module_iface *iface = plugin_load_module(mod_name);
|
|
mods[idx] = iface->from_conf(m.value, mod_inherit);
|
|
}
|
|
|
|
if (i == 0) {
|
|
conf.left.mods = mods;
|
|
conf.left.count = count;
|
|
} else if (i == 1) {
|
|
conf.center.mods = mods;
|
|
conf.center.count = count;
|
|
} else {
|
|
conf.right.mods = mods;
|
|
conf.right.count = count;
|
|
}
|
|
}
|
|
}
|
|
|
|
struct bar *ret = bar_new(&conf);
|
|
|
|
free(conf.left.mods);
|
|
free(conf.center.mods);
|
|
free(conf.right.mods);
|
|
fcft_destroy(font);
|
|
|
|
return ret;
|
|
}
|