Use default desktop font (Gtk/FontName from XSettings) when the font is not specified in the config file

src/taskbar/task.h

@@ -44,6 +44,7 @@ typedef struct GlobalTask {
 	// starting position for text ~ task_padding + task_border + icon_size
 	double text_posx, text_height;
 
+	gboolean has_font;
 	PangoFontDescription *font_desc;
 	Color font[TASK_STATE_COUNT];
 	int config_font_mask;

src/taskbar/taskbar.c

@@ -48,6 +48,8 @@ gboolean hide_task_diff_monitor;
 TaskbarSortMethod taskbar_sort_method;
 Alignment taskbar_alignment;
 
+void taskbar_init_fonts();
+
 guint win_hash(gconstpointer key)
 {
 	return *((const Window *)key);
@@ -139,10 +141,9 @@ void init_taskbar_panel(void *p)
 		panel->g_taskbar.background_name[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, 0);
 		panel->g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, 0);
 	}
-	if (!panel->g_task.font_desc)
-		panel->g_task.font_desc = pango_font_description_from_string(DEFAULT_FONT);
 	if (!panel->g_task.area.bg)
 		panel->g_task.area.bg = &g_array_index(backgrounds, Background, 0);
+	taskbar_init_fonts();
 
 	// taskbar name
 	panel->g_taskbar.area_name.panel = panel;
@@ -285,6 +286,46 @@ void init_taskbar_panel(void *p)
 	init_taskbarname_panel(panel);
 }
 
+void taskbar_init_fonts()
+{
+	for (int i = 0; i < num_panels; i++) {
+		if (!panels[i].g_task.font_desc) {
+			panels[i].g_task.font_desc = pango_font_description_from_string(get_default_font());
+			pango_font_description_set_size(panels[i].g_task.font_desc,
+			                                pango_font_description_get_size(panels[i].g_task.font_desc) - PANGO_SCALE);
+		}
+	}
+}
+
+void taskbar_default_font_changed()
+{
+	if (!taskbar_enabled)
+		return;
+
+	gboolean needs_update = FALSE;
+	for (int i = 0; i < num_panels; i++) {
+		if (!panels[i].g_task.has_font) {
+			pango_font_description_free(panels[i].g_task.font_desc);
+			panels[i].g_task.font_desc = NULL;
+			needs_update = TRUE;
+		}
+	}
+	if (!needs_update)
+		return;
+	taskbar_init_fonts();
+	for (int i = 0; i < num_panels; i++) {
+		for (int j = 0; j < panels[i].num_desktops; j++) {
+			Taskbar *taskbar = &panels[i].taskbar[j];
+			for (GList *c = taskbar->area.children; c; c = c->next) {
+				Task *t = c->data;
+				t->area.resize_needed = TRUE;
+				t->area.redraw_needed = TRUE;
+			}
+		}
+	}
+	panel_refresh = TRUE;
+}
+
 void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data)
 {
 	remove_task(task_get_task(*(Window *)key));
@@ -317,8 +358,7 @@ void task_refresh_tasklist()
 		return;
 
 	GList *win_list = g_hash_table_get_keys(win_to_task);
-	GList *it;
-	for (it = win_list; it; it = it->next) {
+	for (GList *it = win_list; it; it = it->next) {
 		int i;
 		for (i = 0; i < num_results; i++)
 			if (*((Window *)it->data) == win[i])

src/taskbar/taskbar.h

@@ -84,4 +84,6 @@ void visible_taskbar(void *p);
 void sort_taskbar_for_win(Window win);
 void sort_tasks(Taskbar *taskbar);
 
+void taskbar_default_font_changed();
+
 #endif

src/taskbar/taskbarname.c

@@ -33,14 +33,14 @@
 #include "taskbarname.h"
 
 int taskbarname_enabled;
-PangoFontDescription *taskbarname_font_desc;
 Color taskbarname_font;
 Color taskbarname_active_font;
 
+void taskbarname_init_fonts();
+
 void default_taskbarname()
 {
 	taskbarname_enabled = 0;
-	taskbarname_font_desc = NULL;
 }
 
 void init_taskbarname_panel(void *p)
@@ -52,8 +52,7 @@ void init_taskbarname_panel(void *p)
 	if (!taskbarname_enabled)
 		return;
 
-	if (!panel_config.taskbarname_font_desc)
-		panel_config.taskbarname_font_desc = pango_font_description_from_string(DEFAULT_FONT);
+	taskbarname_init_fonts();
 
 	GSList *l, *list = get_desktop_names();
 	for (j = 0, l = list; j < panel->num_desktops; j++) {
@@ -83,6 +82,34 @@ void init_taskbarname_panel(void *p)
 	g_slist_free(list);
 }
 
+void taskbarname_init_fonts()
+{
+	if (!panel_config.taskbarname_font_desc)
+		panel_config.taskbarname_font_desc = pango_font_description_from_string(get_default_font());
+}
+
+void taskbarname_default_font_changed()
+{
+	if (!taskbar_enabled)
+		return;
+	if (!taskbarname_enabled)
+		return;
+	if (panel_config.taskbarname_has_font)
+		return;
+
+	pango_font_description_free(panel_config.taskbarname_font_desc);
+	panel_config.taskbarname_font_desc = NULL;
+	taskbarname_init_fonts();
+	for (int i = 0; i < num_panels; i++) {
+		for (int j = 0; j < panels[i].num_desktops; j++) {
+			Taskbar *taskbar = &panels[i].taskbar[j];
+			taskbar->bar_name.area.resize_needed = TRUE;
+			taskbar->bar_name.area.redraw_needed = TRUE;
+		}
+	}
+	panel_refresh = TRUE;
+}
+
 void cleanup_taskbarname()
 {
 	int i, j, k;

src/taskbar/taskbarname.h

@@ -21,4 +21,6 @@ void draw_taskbarname(void *obj, cairo_t *c);
 
 gboolean resize_taskbarname(void *obj);
 
+void taskbarname_default_font_changed();
+
 #endif