aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-06-17 16:15:29 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-06-18 13:35:57 +0000
commit495c7304878bdd010dc5d25620dc68f41ac4cd36 (patch)
treecf2c04fafcea5396778f3063efd0df3c042ace0a /terminal.c
parentMerge branch 'footclient-dont-copy-conf-unless-necessary' (diff)
config: don’t use tllist where it isn’t necessary
tllists are great when dealing with dynamically changing lists. They are also very easy to use when building lists/arrays where the final size is unknown. However, this ease of use comes at a price: code size. tll-macros expand to a lot of code. Since things in the config are static, once the config has been loaded, using tllists for configuration data structures doesn’t make much sense. This patch replaces nearly all tllists used by the configuration, with dynamically allocated arrays.
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c52
1 files changed, 32 insertions, 20 deletions
diff --git a/terminal.c b/terminal.c
index d949388d..e689f4f6 100644
--- a/terminal.c
+++ b/terminal.c
@@ -808,11 +808,13 @@ font_loader_thread(void *_data)
static bool
reload_fonts(struct terminal *term)
{
+ const struct config *conf = term->conf;
+
const size_t counts[4] = {
- tll_length(term->conf->fonts[0]),
- tll_length(term->conf->fonts[1]),
- tll_length(term->conf->fonts[2]),
- tll_length(term->conf->fonts[3]),
+ conf->fonts[0].count,
+ conf->fonts[1].count,
+ conf->fonts[2].count,
+ conf->fonts[3].count,
};
/* Configure size (which may have been changed run-time) */
@@ -820,8 +822,10 @@ reload_fonts(struct terminal *term)
for (size_t i = 0; i < 4; i++) {
names[i] = xmalloc(counts[i] * sizeof(names[i][0]));
- size_t j = 0;
- tll_foreach(term->conf->fonts[i], it) {
+ const struct config_font_list *font_list = &conf->fonts[i];
+
+ for (size_t j = 0; j < font_list->count; j++) {
+ const struct config_font *font = &font_list->arr[j];
bool use_px_size = term->font_sizes[i][j].px_size > 0;
char size[64];
@@ -835,12 +839,11 @@ reload_fonts(struct terminal *term)
snprintf(size, sizeof(size), ":size=%.2f",
term->font_sizes[i][j].pt_size * (double)scale);
- size_t len = strlen(it->item.pattern) + strlen(size) + 1;
+ size_t len = strlen(font->pattern) + strlen(size) + 1;
names[i][j] = xmalloc(len);
- strcpy(names[i][j], it->item.pattern);
+ strcpy(names[i][j], font->pattern);
strcat(names[i][j], size);
- j++;
}
}
@@ -937,11 +940,15 @@ reload_fonts(struct terminal *term)
static bool
load_fonts_from_conf(struct terminal *term)
{
+ const struct config *conf = term->conf;
+
for (size_t i = 0; i < 4; i++) {
- size_t j = 0;
- tll_foreach(term->conf->fonts[i], it) {
+ const struct config_font_list *font_list = &conf->fonts[i];
+
+ for (size_t j = 0; i < font_list->count; j++) {
+ const struct config_font *font = &font_list->arr[j];
term->font_sizes[i][j++] = (struct config_font){
- .pt_size = it->item.pt_size, .px_size = it->item.px_size};
+ .pt_size = font->pt_size, .px_size = font->px_size};
}
}
@@ -1039,10 +1046,10 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
.ptmx_buffers = tll_init(),
.ptmx_paste_buffers = tll_init(),
.font_sizes = {
- xmalloc(sizeof(term->font_sizes[0][0]) * tll_length(conf->fonts[0])),
- xmalloc(sizeof(term->font_sizes[1][0]) * tll_length(conf->fonts[1])),
- xmalloc(sizeof(term->font_sizes[2][0]) * tll_length(conf->fonts[2])),
- xmalloc(sizeof(term->font_sizes[3][0]) * tll_length(conf->fonts[3])),
+ xmalloc(sizeof(term->font_sizes[0][0]) * conf->fonts[0].count),
+ xmalloc(sizeof(term->font_sizes[1][0]) * conf->fonts[1].count),
+ xmalloc(sizeof(term->font_sizes[2][0]) * conf->fonts[2].count),
+ xmalloc(sizeof(term->font_sizes[3][0]) * conf->fonts[3].count),
},
.font_dpi = 0.,
.font_subpixel = (conf->colors.alpha == 0xffff /* Can't do subpixel rendering on transparent background */
@@ -1136,10 +1143,11 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
term_update_ascii_printer(term);
for (size_t i = 0; i < 4; i++) {
- size_t j = 0;
- tll_foreach(conf->fonts[i], it) {
+ const struct config_font_list *font_list = &conf->fonts[i];
+ for (size_t j = 0; j < font_list->count; j++) {
+ const struct config_font *font = &font_list->arr[j];
term->font_sizes[i][j++] = (struct config_font){
- .pt_size = it->item.pt_size, .px_size = it->item.px_size};
+ .pt_size = font->pt_size, .px_size = font->px_size};
}
}
term->font_line_height = conf->line_height;
@@ -1716,8 +1724,12 @@ term_reset(struct terminal *term, bool hard)
static bool
term_font_size_adjust(struct terminal *term, double amount)
{
+ const struct config *conf = term->conf;
+
for (size_t i = 0; i < 4; i++) {
- for (size_t j = 0; j < tll_length(term->conf->fonts[i]); j++) {
+ const struct config_font_list *font_list = &conf->fonts[i];
+
+ for (size_t j = 0; j < font_list->count; j++) {
double old_pt_size = term->font_sizes[i][j].pt_size;
/*