From 92a98164c3539b04bcee1adc9fd4041ef18c0fe3 Mon Sep 17 00:00:00 2001
From: bi4k8 <bi4k8@github>
Date: Wed, 9 Nov 2022 22:41:31 +0000
Subject: [PATCH] src/config/rcxml.c: distinguish no and unknown font places

Currently, the `rc.xml` parser applies font settings in a `<font>` tag with an
unknown value for its `place` attribute to all fonts. This means that whatever
the final unknown-`place` `<font>` tag is in a user's `rc.xml` applies to all
text drawn by labwc.

Instead, only treat `<font>` tags with an empty or missing `place` attribute as
applying globally, and warn when encountering unknown `place` attribute values
(which will help us find font places to support).
---
 src/config/rcxml.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 7bf511be..01d35e4f 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -35,7 +35,8 @@ static struct action *current_keybind_action;
 static struct action *current_mousebind_action;
 
 enum font_place {
-	FONT_PLACE_UNKNOWN = 0,
+	FONT_PLACE_NONE = 0,
+	FONT_PLACE_UNKNOWN,
 	FONT_PLACE_ACTIVEWINDOW,
 	FONT_PLACE_MENUITEM,
 	FONT_PLACE_OSD,
@@ -267,7 +268,7 @@ fill_font(char *nodename, char *content, enum font_place place)
 	string_truncate_at_pattern(nodename, ".font.theme");
 
 	switch (place) {
-	case FONT_PLACE_UNKNOWN:
+	case FONT_PLACE_NONE:
 		/*
 		 * If <theme><font></font></theme> is used without a place=""
 		 * attribute, we set all font variables
@@ -296,8 +297,8 @@ fill_font(char *nodename, char *content, enum font_place place)
 static enum font_place
 enum_font_place(const char *place)
 {
-	if (!place) {
-		return FONT_PLACE_UNKNOWN;
+	if (!place || place[0] == '\0') {
+		return FONT_PLACE_NONE;
 	}
 	if (!strcasecmp(place, "ActiveWindow")) {
 		return FONT_PLACE_ACTIVEWINDOW;
@@ -314,7 +315,7 @@ static void
 entry(xmlNode *node, char *nodename, char *content)
 {
 	/* current <theme><font place=""></font></theme> */
-	static enum font_place font_place = FONT_PLACE_UNKNOWN;
+	static enum font_place font_place = FONT_PLACE_NONE;
 
 	if (!nodename) {
 		return;
@@ -353,6 +354,9 @@ entry(xmlNode *node, char *nodename, char *content)
 	}
 	if (!strcmp(nodename, "place.font.theme")) {
 		font_place = enum_font_place(content);
+		if (font_place == FONT_PLACE_UNKNOWN) {
+			wlr_log(WLR_ERROR, "invalid font place %s", content);
+		}
 	}
 
 	if (!strcmp(nodename, "decoration.core")) {