mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-24 09:06:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rcxml: rewrite <theme><font> parser

Browse source
This commit is contained in:
tokyo4j 2025-04-12 03:09:14 +09:00 • committed by Johan Malm
parent a865cc0777
commit 619cae67fa
1 changed files with 43 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

94
src/config/rcxml.c
View file

@ -965,45 +965,50 @@ enum_font_place(const char *place)
} }
static void static void
fill_font(char *nodename, char *content, enum font_place place) fill_font(xmlNode *node)
{ {
if (!content) { enum font_place font_place = FONT_PLACE_NONE;
return; char buf[256];
if (lab_xml_get_string(node, "place", buf, sizeof(buf))) {
font_place = enum_font_place(buf);
} }
string_truncate_at_pattern(nodename, ".font.theme");
switch (place) { xmlNode *child;
case FONT_PLACE_NONE: char *key, *content;
/* LAB_XML_FOR_EACH(node, child, key, content) {
* If <theme><font></font></theme> is used without a place="" switch (font_place) {
* attribute, we set all font variables case FONT_PLACE_NONE:
*/ /*
set_font_attr(&rc.font_activewindow, nodename, content); * If <theme><font></font></theme> is used without a
set_font_attr(&rc.font_inactivewindow, nodename, content); * place="" attribute, we set all font variables
set_font_attr(&rc.font_menuheader, nodename, content); */
set_font_attr(&rc.font_menuitem, nodename, content); set_font_attr(&rc.font_activewindow, key, content);
set_font_attr(&rc.font_osd, nodename, content); set_font_attr(&rc.font_inactivewindow, key, content);
break; set_font_attr(&rc.font_menuheader, key, content);
case FONT_PLACE_ACTIVEWINDOW: set_font_attr(&rc.font_menuitem, key, content);
set_font_attr(&rc.font_activewindow, nodename, content); set_font_attr(&rc.font_osd, key, content);
break; break;
case FONT_PLACE_INACTIVEWINDOW: case FONT_PLACE_ACTIVEWINDOW:
set_font_attr(&rc.font_inactivewindow, nodename, content); set_font_attr(&rc.font_activewindow, key, content);
break; break;
case FONT_PLACE_MENUHEADER: case FONT_PLACE_INACTIVEWINDOW:
set_font_attr(&rc.font_menuheader, nodename, content); set_font_attr(&rc.font_inactivewindow, key, content);
break; break;
case FONT_PLACE_MENUITEM: case FONT_PLACE_MENUHEADER:
set_font_attr(&rc.font_menuitem, nodename, content); set_font_attr(&rc.font_menuheader, key, content);
break; break;
case FONT_PLACE_OSD: case FONT_PLACE_MENUITEM:
set_font_attr(&rc.font_osd, nodename, content); set_font_attr(&rc.font_menuitem, key, content);
break; break;
case FONT_PLACE_OSD:
set_font_attr(&rc.font_osd, key, content);
break;
/* TODO: implement for all font places */ /* TODO: implement for all font places */
default: default:
break; break;
}
} }
} }
@ -1039,9 +1044,6 @@ set_tearing_mode(const char *str, enum tearing_mode *variable)
static void static void
entry(xmlNode *node, char *nodename, char *content, struct parser_state *state) entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
{ {
/* current <theme><font place=""></font></theme> */
static enum font_place font_place = FONT_PLACE_NONE;
static uint32_t button_map_from; static uint32_t button_map_from;
if (!nodename) { if (!nodename) {
@ -1086,6 +1088,10 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
fill_window_rules(node); fill_window_rules(node);
return; return;
} }
if (!strcasecmp(nodename, "font.theme")) {
fill_font(node);
return;
}
/* handle nodes without content, e.g. <keyboard><default /> */ /* handle nodes without content, e.g. <keyboard><default /> */
if (!strcmp(nodename, "default.keyboard")) { if (!strcmp(nodename, "default.keyboard")) {
@ -1124,12 +1130,6 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
if (!content) { if (!content) {
return; return;
} }
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")) { if (!strcmp(nodename, "decoration.core")) {
if (!strcmp(content, "client")) { if (!strcmp(content, "client")) {
@ -1178,14 +1178,6 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
set_bool(content, &rc.shadows_enabled); set_bool(content, &rc.shadows_enabled);
} else if (!strcasecmp(nodename, "dropShadowsOnTiled.theme")) { } else if (!strcasecmp(nodename, "dropShadowsOnTiled.theme")) {
set_bool(content, &rc.shadows_on_tiled); set_bool(content, &rc.shadows_on_tiled);
} else if (!strcmp(nodename, "name.font.theme")) {
fill_font(nodename, content, font_place);
} else if (!strcmp(nodename, "size.font.theme")) {
fill_font(nodename, content, font_place);
} else if (!strcmp(nodename, "slant.font.theme")) {
fill_font(nodename, content, font_place);
} else if (!strcmp(nodename, "weight.font.theme")) {
fill_font(nodename, content, font_place);
} else if (!strcasecmp(nodename, "followMouse.focus")) { } else if (!strcasecmp(nodename, "followMouse.focus")) {
set_bool(content, &rc.focus_follow_mouse); set_bool(content, &rc.focus_follow_mouse);
} else if (!strcasecmp(nodename, "followMouseRequiresMovement.focus")) { } else if (!strcasecmp(nodename, "followMouseRequiresMovement.focus")) {