Move font config to ouput level & fix output configuration (was always broken)

Author: francma

meson.build

@@ -45,11 +45,10 @@ if not fs.is_absolute(sysconfdir)
   sysconfdir = prefix / sysconfdir
 endif
 
-global_configuration_h = configuration_data({
-  'WOB_VERSION': '"@0@"'.format(meson.project_version()),
-  'WOB_ETC_CONFIG_FOLDER_PATH': '"@0@"'.format(sysconfdir),
-})
-configure_file(output: 'global_configuration.h', configuration: global_configuration_h)
+global_configuration_h = configuration_data()
+
+global_configuration_h.set_quoted('WOB_VERSION', meson.project_version())
+global_configuration_h.set_quoted('WOB_ETC_CONFIG_FOLDER_PATH', sysconfdir)
 
 wayland_scanner_code = generator(
   wayland_scanner,
@@ -92,15 +91,19 @@ wob_dependencies = [wayland_client, rt, inih, libm]
 if seccomp.found()
   wob_dependencies += seccomp
   wob_sources += 'src/pledge_seccomp.c'
+  global_configuration_h.set('WOB_PLEDGE_ENABLED', 'true')
 else
   wob_sources += 'src/pledge.c'
+  global_configuration_h.set('WOB_PLEDGE_ENABLED', 'false')
 endif
 
 if freetype2.found()
   wob_dependencies += freetype2
   wob_sources += 'src/font_freetype.c'
+  global_configuration_h.set('WOB_TEXT_ENABLED', 'true')
 else
   wob_sources += 'src/font_stub.c'
+  global_configuration_h.set('WOB_TEXT_ENABLED', 'false')
 endif
 
 executable(
@@ -155,3 +158,5 @@ if get_option('systemd-unit-files').enabled()
   )
   install_data('etc/systemd/wob.socket', install_dir: systemd_unit_dir)
 endif
+
+configure_file(output: 'global_configuration.h', configuration: global_configuration_h)

src/color.c

@@ -89,22 +89,36 @@ bool
 wob_color_from_rgba_string(const char *str, struct wob_color *color)
 {
 	unsigned long length = strlen(str);
-	for (const char *c = str; *c != '\0'; ++c) {
-		if (!isxdigit(*c)) {
-			return false;
-		}
-	}
 
 	uint8_t parts[4];
 	parts[3] = 0xFF;
 	switch (length) {
 		case 8:
-			parts[3] = hex_to_int(str[6]) * 16 + hex_to_int(str[7]);
+			int p6 = hex_to_int(str[6]);
+			int p7 = hex_to_int(str[7]);
+
+			if (p6 < 0 || p7 < 0) {
+				return false;
+			}
+
+			parts[3] = p6 * 16 + p7;
 			// fallthrough
 		case 6:
-			parts[0] = hex_to_int(str[0]) * 16 + hex_to_int(str[1]);
-			parts[1] = hex_to_int(str[2]) * 16 + hex_to_int(str[3]);
-			parts[2] = hex_to_int(str[4]) * 16 + hex_to_int(str[5]);
+			int p0 = hex_to_int(str[0]);
+			int p1 = hex_to_int(str[1]);
+			int p2 = hex_to_int(str[2]);
+			int p3 = hex_to_int(str[3]);
+			int p4 = hex_to_int(str[4]);
+			int p5 = hex_to_int(str[5]);
+
+			if (p0 < 0 || p1 < 0 || p2 < 0 || p3 < 0 || p4 < 0 || p5 < 0) {
+				return false;
+			}
+
+			parts[0] = p0 * 16 + p1;
+			parts[1] = p2 * 16 + p3;
+			parts[2] = p4 * 16 + p5;
+
 			break;
 		default:
 			return false;

src/config.c

@@ -307,7 +307,15 @@ handler(void *user, const char *section, const char *name, const char *value)
 			return 1;
 		}
 		if (strcmp(name, "font") == 0) {
-			config->default_style.font_path = strdup(value);
+			config->font_path = strdup(value);
+			return 1;
+		}
+		if (strcmp(name, "font_size") == 0) {
+			if (parse_number(value, &ul) == false) {
+				wob_log_error("Font size must be a positive value.");
+				return 0;
+			}
+			config->font_size = ul;
 			return 1;
 		}
 
@@ -393,6 +401,14 @@ handler(void *user, const char *section, const char *name, const char *value)
 			output_config->dimensions.bar_padding = ul;
 			return 1;
 		}
+		if (strcmp(name, "font_size") == 0) {
+			if (parse_number(value, &ul) == false) {
+				wob_log_error("Font size must be a positive value.");
+				return 0;
+			}
+			output_config->font_size = ul;
+			return 1;
+		}
 
 		wob_log_warn("Unknown config key %s", name);
 		return 1;
@@ -457,10 +473,6 @@ handler(void *user, const char *section, const char *name, const char *value)
 			}
 			return 1;
 		}
-		if (strcmp(name, "font") == 0) {
-			style->font_path = strdup(value);
-			return 1;
-		}
 
 		wob_log_warn("Unknown config key %s", name);
 		return 1;
@@ -520,13 +532,14 @@ wob_config_create()
 	config->margin = (struct wob_margin) {.top = 0, .left = 0, .bottom = 0, .right = 0};
 	config->anchor = WOB_ANCHOR_CENTER;
 	config->overflow_mode = WOB_OVERFLOW_MODE_WRAP;
+	config->font_path = NULL;
+	config->font_size = 16;
 	config->default_style.colors.background = (struct wob_color) {.a = 1.0f, .r = 0.0f, .g = 0.0f, .b = 0.0f};
 	config->default_style.colors.value = (struct wob_color) {.a = 1.0f, .r = 1.0f, .g = 1.0f, .b = 1.0f};
 	config->default_style.colors.border = (struct wob_color) {.a = 1.0f, .r = 1.0f, .g = 1.0f, .b = 1.0f};
 	config->default_style.overflow_colors.background = (struct wob_color) {.a = 1.0f, .r = 0.0f, .g = 0.0f, .b = 0.0f};
 	config->default_style.overflow_colors.value = (struct wob_color) {.a = 1.0f, .r = 1.0f, .g = 0.0f, .b = 0.0f};
 	config->default_style.overflow_colors.border = (struct wob_color) {.a = 1.0f, .r = 1.0f, .g = 1.0f, .b = 1.0f};
-	config->default_style.font_path = NULL;
 
 	return config;
 }
@@ -594,7 +607,8 @@ wob_config_debug(struct wob_config *config)
 	wob_log_debug("config.overflow_colors.background = " WOB_COLOR_PRINTF_FORMAT, WOB_COLOR_PRINTF_RGBA(config->default_style.overflow_colors.background));
 	wob_log_debug("config.overflow_colors.value = " WOB_COLOR_PRINTF_FORMAT, WOB_COLOR_PRINTF_RGBA(config->default_style.overflow_colors.value));
 	wob_log_debug("config.overflow_colors.border = " WOB_COLOR_PRINTF_FORMAT, WOB_COLOR_PRINTF_RGBA(config->default_style.overflow_colors.border));
-	wob_log_debug("config.font = %s", config->default_style.font_path != NULL ? config->default_style.font_path : "<empty>");
+	wob_log_debug("config.font = %s", config->font_path != NULL ? config->font_path : "<empty>");
+	wob_log_debug("config.font_size = %d", config->font_size);
 
 	struct wob_style *style;
 	wl_list_for_each (style, &config->styles, link) {
@@ -604,7 +618,6 @@ wob_config_debug(struct wob_config *config)
 		wob_log_debug("config.style.%s.overflow_colors.background = " WOB_COLOR_PRINTF_FORMAT, style->name, WOB_COLOR_PRINTF_RGBA(style->overflow_colors.background));
 		wob_log_debug("config.style.%s.overflow_colors.value = " WOB_COLOR_PRINTF_FORMAT, style->name, WOB_COLOR_PRINTF_RGBA(style->overflow_colors.value));
 		wob_log_debug("config.style.%s.overflow_colors.border = " WOB_COLOR_PRINTF_FORMAT, style->name, WOB_COLOR_PRINTF_RGBA(style->overflow_colors.border));
-		wob_log_debug("config.style.%s.font = %s", style->name, style->font_path != NULL ? style->font_path : "<empty>");
 	}
 
 	struct wob_output_config *output_config;
@@ -626,6 +639,7 @@ wob_config_debug(struct wob_config *config)
 			WOB_ORIENTATION_HORIZONTAL,
 			WOB_ORIENTATION_VERTICAL
 		);
+		wob_log_debug("config.output.%s.font_size = %d", output_config->id, output_config->font_size);
 	}
 }
 
@@ -642,12 +656,11 @@ wob_config_destroy(struct wob_config *config)
 	struct wob_style *style, *style_tmp;
 	wl_list_for_each_safe (style, style_tmp, &config->styles, link) {
 		free(style->name);
-		free(style->font_path);
 		free(style);
 	}
 
-	if (config->default_style.font_path != NULL) {
-		free(config->default_style.font_path);
+	if (config->font_path != NULL) {
+		free(config->font_path);
 	}
 
 	free(config);
@@ -699,7 +712,8 @@ wob_config_match_output(struct wob_config *config, const char *match)
 	struct wob_output_config *output_config = NULL;
 	bool output_found = false;
 	wl_list_for_each (output_config, &config->outputs, link) {
-		if (strstr(output_config->match, match) == 0) {
+		wob_log_debug("%s = %s?", output_config->match, match);
+		if (strstr(match, output_config->match) != NULL) {
 			output_found = true;
 			break;
 		}

src/config.h

@@ -53,6 +53,7 @@ struct wob_output_config {
 	struct wob_dimensions dimensions;
 	struct wob_margin margin;
 	unsigned long anchor;
+	unsigned long font_size;
 };
 
 struct wob_colors {
@@ -63,7 +64,6 @@ struct wob_colors {
 
 struct wob_style {
 	char *name;
-	char *font_path;
 	struct wob_colors colors;
 	struct wob_colors overflow_colors;
 	struct wl_list link;
@@ -80,6 +80,8 @@ struct wob_config {
 	struct wl_list styles;
 	struct wl_list outputs;
 	bool sandbox;
+	char *font_path;
+	unsigned long font_size;
 };
 
 struct wob_config *wob_config_create();

src/font.h

@@ -4,6 +4,7 @@
 #include <stddef.h>
 
 #include "color.h"
+#include "config.h"
 
 struct wob_font_manager;
 
@@ -20,6 +21,8 @@ void wob_font_manager_destroy(struct wob_font_manager *);
 
 void wob_font_manager_load_font(struct wob_font_manager *, const char *fpath);
 
+void wob_font_manager_load_fonts_from_config(struct wob_font_manager *, struct wob_config *);
+
 struct wob_font *wob_font_manager_get(struct wob_font_manager *, const char *fpath);
 
 void wob_font_render_text(struct wob_font *font, char *text, int font_size, struct wob_color font_color, uint32_t *argb8888_buffer, size_t argb8888_buffer_size);

src/font_freetype.c

@@ -3,8 +3,8 @@
 #include "font.h"
 #include "log.h"
 
-#include <wayland-util.h>
 #include <ft2build.h>
+#include <wayland-util.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
@@ -77,6 +77,14 @@ wob_font_manager_load_font(struct wob_font_manager *manager, const char *fpath)
 	wl_list_insert(&manager->fonts, &font->link);
 }
 
+void
+wob_font_manager_load_fonts_from_config(struct wob_font_manager *manager, struct wob_config *config)
+{
+	if (config->font_path != NULL) {
+		wob_font_manager_load_font(manager, config->font_path);
+	}
+}
+
 struct wob_font *
 wob_font_manager_get(struct wob_font_manager *manager, const char *fpath)
 {
@@ -116,7 +124,7 @@ wob_font_render_text_dimensions(struct wob_font *font, char *text, int font_size
 		dimensions.w += glyph_bbox.xMax;
 
 		if (has_kerning && previous != 0) {
-			FT_Get_Kerning( ft_face, previous, glyph_index, FT_KERNING_DEFAULT, &delta);
+			FT_Get_Kerning(ft_face, previous, glyph_index, FT_KERNING_DEFAULT, &delta);
 			dimensions.w += delta.x / 64;
 		}
 
@@ -136,7 +144,7 @@ wob_font_render_text(struct wob_font *font, char *text, int font_size, struct wo
 	bool has_kerning = FT_HAS_KERNING(ft_face);
 
 	for (const char *c = text; *c != '\0'; c += 1) {
-		FT_Vector  delta;
+		FT_Vector delta;
 		FT_UInt glyph_index = FT_Get_Char_Index(ft_face, *c);
 		FT_Load_Glyph(ft_face, glyph_index, FT_LOAD_DEFAULT);
 		FT_Render_Glyph(ft_face->glyph, FT_RENDER_MODE_NORMAL);
@@ -145,7 +153,7 @@ wob_font_render_text(struct wob_font *font, char *text, int font_size, struct wo
 
 		argb8888_buffer += ft_face->glyph->advance.x / 64;
 		if (has_kerning && previous != 0) {
-			FT_Get_Kerning( ft_face, previous, glyph_index, FT_KERNING_DEFAULT, &delta);
+			FT_Get_Kerning(ft_face, previous, glyph_index, FT_KERNING_DEFAULT, &delta);
 			argb8888_buffer += delta.x / 64;
 		}
 

src/font_stub.c

@@ -21,21 +21,29 @@ wob_font_manager_destroy(struct wob_font_manager *manager)
 void
 wob_font_manager_load_font(struct wob_font_manager *manager, const char *fpath)
 {
-	wob_log_error("STUB!");
+	wob_log_error("STUB wob_font_manager_load_font!");
+}
+
+void
+wob_font_manager_load_fonts_from_config(struct wob_font_manager *manager, struct wob_config *config)
+{
+	if (config->font_path != NULL) {
+		wob_font_manager_load_font(manager, config->font_path);
+	}
 }
 
 struct wob_font *
 wob_font_manager_get(struct wob_font_manager *manager, const char *fpath)
 {
-	wob_log_error("STUB!");
+	wob_log_error("STUB wob_font_manager_get!");
 
 	return NULL;
 }
 
 struct wob_font_text_dimensions
 wob_font_render_text_dimensions(struct wob_font *font, char *text, int font_size)
 {
-	wob_log_error("STUB!");
+	wob_log_error("STUB wob_font_render_text_dimensions!");
 
 	struct wob_font_text_dimensions d = {.h = 0, .w = 0};
 
@@ -45,5 +53,5 @@ wob_font_render_text_dimensions(struct wob_font *font, char *text, int font_size
 void
 wob_font_render_text(struct wob_font *font, char *text, int font_size, struct wob_color font_color, uint32_t *argb8888_buffer, size_t argb8888_buffer_size)
 {
-	wob_log_error("STUB!");
+	wob_log_error("STUB wob_font_render_text!");
 }