From bfaab101af6d26fb9737ca7b574ccde3c6abaddb Mon Sep 17 00:00:00 2001 From: tokyo4j Date: Mon, 4 Aug 2025 12:54:29 +0900 Subject: [PATCH] Make append_actions() public Also rename it to append_parsed_actions() --- include/config/rcxml.h | 7 +++++++ src/config/rcxml.c | 18 ++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/include/config/rcxml.h b/include/config/rcxml.h index a96b6620..65107440 100644 --- a/include/config/rcxml.h +++ b/include/config/rcxml.h @@ -5,6 +5,7 @@ #include #include #include +#include #include "common/border.h" #include "common/buf.h" @@ -196,4 +197,10 @@ void rcxml_parse_xml(struct buf *b); void rcxml_read(const char *filename); void rcxml_finish(void); +/* + * Parse the child nodes and append them to the list. + * FIXME: move this function to somewhere else. + */ +void append_parsed_actions(xmlNode *node, struct wl_list *list); + #endif /* LABWC_RCXML_H */ diff --git a/src/config/rcxml.c b/src/config/rcxml.c index 92878491..b913f0c4 100644 --- a/src/config/rcxml.c +++ b/src/config/rcxml.c @@ -253,8 +253,6 @@ set_property(const char *str, enum property *variable) *variable = ret ? LAB_PROP_TRUE : LAB_PROP_FALSE; } -static void append_actions(xmlNode *node, struct wl_list *list); - static void fill_window_rule(xmlNode *node) { @@ -315,7 +313,7 @@ fill_window_rule(xmlNode *node) } } - append_actions(node, &window_rule->actions); + append_parsed_actions(node, &window_rule->actions); } static void @@ -482,7 +480,7 @@ parse_action_args(xmlNode *node, struct action *action) action_arg_add_actionlist(action, "then"); actions = action_get_actionlist(action, "then"); } - append_actions(child, actions); + append_parsed_actions(child, actions); } else if (!strcasecmp(key, "else")) { struct wl_list *actions = action_get_actionlist(action, "else"); @@ -490,7 +488,7 @@ parse_action_args(xmlNode *node, struct action *action) action_arg_add_actionlist(action, "else"); actions = action_get_actionlist(action, "else"); } - append_actions(child, actions); + append_parsed_actions(child, actions); } else if (!strcasecmp(key, "none")) { struct wl_list *actions = action_get_actionlist(action, "none"); @@ -498,7 +496,7 @@ parse_action_args(xmlNode *node, struct action *action) action_arg_add_actionlist(action, "none"); actions = action_get_actionlist(action, "none"); } - append_actions(child, actions); + append_parsed_actions(child, actions); } else if (!strcasecmp(key, "name")) { /* Ignore */ } else if (lab_xml_node_is_leaf(child)) { @@ -530,8 +528,8 @@ parse_action(xmlNode *node) return action; } -static void -append_actions(xmlNode *node, struct wl_list *list) +void +append_parsed_actions(xmlNode *node, struct wl_list *list) { xmlNode *child; char *key, *content; @@ -576,7 +574,7 @@ fill_keybind(xmlNode *node) lab_xml_get_bool(node, "layoutDependent", &keybind->use_syms_only); lab_xml_get_bool(node, "allowWhenLocked", &keybind->allow_when_locked); - append_actions(node, &keybind->actions); + append_parsed_actions(node, &keybind->actions); } static void @@ -608,7 +606,7 @@ fill_mousebind(xmlNode *node, const char *context) mousebind->mouse_event = mousebind_event_from_str(buf); } - append_actions(node, &mousebind->actions); + append_parsed_actions(node, &mousebind->actions); } static void