mirror of
https://codeberg.org/dnkl/yambar.git
synced 2025-04-22 12:25:38 +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
259 lines
6.9 KiB
C
259 lines
6.9 KiB
C
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#define LOG_MODULE "map"
|
|
#include "../log.h"
|
|
#include "../config.h"
|
|
#include "../config-verify.h"
|
|
#include "../particle.h"
|
|
#include "../plugin.h"
|
|
#include "dynlist.h"
|
|
|
|
struct particle_map {
|
|
const char *tag_value;
|
|
struct particle *particle;
|
|
};
|
|
|
|
struct private {
|
|
char *tag;
|
|
struct particle *default_particle;
|
|
struct particle_map *map;
|
|
size_t count;
|
|
};
|
|
|
|
struct eprivate {
|
|
struct exposable *exposable;
|
|
};
|
|
|
|
static void
|
|
exposable_destroy(struct exposable *exposable)
|
|
{
|
|
struct eprivate *e = exposable->private;
|
|
e->exposable->destroy(e->exposable);
|
|
|
|
free(e);
|
|
exposable_default_destroy(exposable);
|
|
}
|
|
|
|
static int
|
|
begin_expose(struct exposable *exposable)
|
|
{
|
|
struct eprivate *e = exposable->private;
|
|
|
|
int width = e->exposable->begin_expose(e->exposable);
|
|
assert(width >= 0);
|
|
|
|
if (width > 0)
|
|
width += exposable->particle->left_margin + exposable->particle->right_margin;
|
|
|
|
exposable->width = width;
|
|
return exposable->width;
|
|
}
|
|
|
|
static void
|
|
expose(const struct exposable *exposable, pixman_image_t *pix, int x, int y, int height)
|
|
{
|
|
struct eprivate *e = exposable->private;
|
|
|
|
exposable_render_deco(exposable, pix, x, y, height);
|
|
e->exposable->expose(
|
|
e->exposable, pix, x + exposable->particle->left_margin, y, height);
|
|
}
|
|
|
|
static void
|
|
on_mouse(struct exposable *exposable, struct bar *bar, enum mouse_event event,
|
|
enum mouse_button btn, int x, int y)
|
|
{
|
|
const struct particle *p = exposable->particle;
|
|
const struct eprivate *e = exposable->private;
|
|
|
|
if ((event == ON_MOUSE_MOTION &&
|
|
exposable->particle->have_on_click_template) ||
|
|
exposable->on_click[btn] != NULL)
|
|
{
|
|
/* We have our own handler */
|
|
exposable_default_on_mouse(exposable, bar, event, btn, x, y);
|
|
return;
|
|
}
|
|
|
|
int px = p->left_margin;
|
|
if (x >= px && x < px + e->exposable->width) {
|
|
if (e->exposable->on_mouse != NULL)
|
|
e->exposable->on_mouse(e->exposable, bar, event, btn, x - px, y);
|
|
return;
|
|
}
|
|
|
|
/* In the left- or right margin */
|
|
exposable_default_on_mouse(exposable, bar, event, btn, x, y);
|
|
}
|
|
|
|
static struct exposable *
|
|
instantiate(const struct particle *particle, const struct tag_set *tags)
|
|
{
|
|
const struct private *p = particle->private;
|
|
const struct tag *tag = tag_for_name(tags, p->tag);
|
|
|
|
if (tag == NULL) {
|
|
return p->default_particle != NULL
|
|
? p->default_particle->instantiate(p->default_particle, tags)
|
|
: dynlist_exposable_new(NULL, 0, 0, 0);
|
|
}
|
|
|
|
const char *tag_value = tag->as_string(tag);
|
|
struct particle *pp = NULL;
|
|
|
|
for (size_t i = 0; i < p->count; i++) {
|
|
const struct particle_map *e = &p->map[i];
|
|
|
|
if (strcmp(e->tag_value, tag_value) != 0)
|
|
continue;
|
|
|
|
pp = e->particle;
|
|
break;
|
|
}
|
|
|
|
struct eprivate *e = calloc(1, sizeof(*e));
|
|
|
|
if (pp != NULL)
|
|
e->exposable = pp->instantiate(pp, tags);
|
|
else if (p->default_particle != NULL)
|
|
e->exposable = p->default_particle->instantiate(p->default_particle, tags);
|
|
else
|
|
e->exposable = dynlist_exposable_new(NULL, 0, 0, 0);
|
|
|
|
assert(e->exposable != NULL);
|
|
|
|
struct exposable *exposable = exposable_common_new(particle, tags);
|
|
exposable->private = e;
|
|
exposable->destroy = &exposable_destroy;
|
|
exposable->begin_expose = &begin_expose;
|
|
exposable->expose = &expose;
|
|
exposable->on_mouse = &on_mouse;
|
|
return exposable;
|
|
}
|
|
|
|
static void
|
|
particle_destroy(struct particle *particle)
|
|
{
|
|
struct private *p = particle->private;
|
|
|
|
if (p->default_particle != NULL)
|
|
p->default_particle->destroy(p->default_particle);
|
|
|
|
for (size_t i = 0; i < p->count; i++) {
|
|
struct particle *pp = p->map[i].particle;
|
|
pp->destroy(pp);
|
|
free((char *)p->map[i].tag_value);
|
|
}
|
|
|
|
free(p->map);
|
|
free(p->tag);
|
|
free(p);
|
|
particle_default_destroy(particle);
|
|
}
|
|
|
|
static struct particle *
|
|
map_new(struct particle *common, const char *tag,
|
|
const struct particle_map particle_map[], size_t count,
|
|
struct particle *default_particle)
|
|
{
|
|
struct private *priv = calloc(1, sizeof(*priv));
|
|
priv->tag = strdup(tag);
|
|
priv->default_particle = default_particle;
|
|
priv->count = count;
|
|
priv->map = malloc(count * sizeof(priv->map[0]));
|
|
|
|
for (size_t i = 0; i < count; i++) {
|
|
priv->map[i].tag_value = strdup(particle_map[i].tag_value);
|
|
priv->map[i].particle = particle_map[i].particle;
|
|
}
|
|
|
|
common->private = priv;
|
|
common->destroy = &particle_destroy;
|
|
common->instantiate = &instantiate;
|
|
return common;
|
|
}
|
|
|
|
static bool
|
|
verify_map_values(keychain_t *chain, const struct yml_node *node)
|
|
{
|
|
if (!yml_is_dict(node)) {
|
|
LOG_ERR(
|
|
"%s: must be a dictionary of workspace-name: particle mappings",
|
|
conf_err_prefix(chain, node));
|
|
return false;
|
|
}
|
|
|
|
for (struct yml_dict_iter it = yml_dict_iter(node);
|
|
it.key != NULL;
|
|
yml_dict_next(&it))
|
|
{
|
|
const char *key = yml_value_as_string(it.key);
|
|
if (key == NULL) {
|
|
LOG_ERR("%s: key must be a string", conf_err_prefix(chain, it.key));
|
|
return false;
|
|
}
|
|
|
|
if (!conf_verify_particle(chain_push(chain, key), it.value))
|
|
return false;
|
|
|
|
chain_pop(chain);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
static struct particle *
|
|
from_conf(const struct yml_node *node, struct particle *common)
|
|
{
|
|
const struct yml_node *tag = yml_get_value(node, "tag");
|
|
const struct yml_node *values = yml_get_value(node, "values");
|
|
const struct yml_node *def = yml_get_value(node, "default");
|
|
|
|
struct particle_map particle_map[yml_dict_length(values)];
|
|
|
|
struct conf_inherit inherited = {
|
|
.font = common->font,
|
|
.font_shaping = common->font_shaping,
|
|
.foreground = common->foreground
|
|
};
|
|
|
|
size_t idx = 0;
|
|
for (struct yml_dict_iter it = yml_dict_iter(values);
|
|
it.key != NULL;
|
|
yml_dict_next(&it), idx++)
|
|
{
|
|
particle_map[idx].tag_value = yml_value_as_string(it.key);
|
|
particle_map[idx].particle = conf_to_particle(it.value, inherited);
|
|
}
|
|
|
|
struct particle *default_particle = def != NULL
|
|
? conf_to_particle(def, inherited) : NULL;
|
|
|
|
return map_new(
|
|
common, yml_value_as_string(tag), particle_map, yml_dict_length(values),
|
|
default_particle);
|
|
}
|
|
|
|
static bool
|
|
verify_conf(keychain_t *chain, const struct yml_node *node)
|
|
{
|
|
static const struct attr_info attrs[] = {
|
|
{"tag", true, &conf_verify_string},
|
|
{"values", true, &verify_map_values},
|
|
{"default", false, &conf_verify_particle},
|
|
PARTICLE_COMMON_ATTRS,
|
|
};
|
|
|
|
return conf_verify_dict(chain, node, attrs);
|
|
}
|
|
|
|
const struct particle_iface particle_map_iface = {
|
|
.verify_conf = &verify_conf,
|
|
.from_conf = &from_conf,
|
|
};
|
|
|
|
#if defined(CORE_PLUGINS_AS_SHARED_LIBRARIES)
|
|
extern const struct particle_iface iface __attribute__((weak, alias("particle_map_iface")));
|
|
#endif
|