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).

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 7bf511bec11887c21e1e410c065cb48c6b9e9be1..01d35e4f6cb5d9bfed4a433b70e289e4d0667ca5 100644 (file)
--- 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")) {