mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make append_actions() public

Browse source 
Also rename it to append_parsed_actions()
This commit is contained in:
tokyo4j 2025-08-04 12:54:29 +09:00 • committed by Johan Malm
parent 2f183cdcb6
commit bfaab101af
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/config/rcxml.h
View file

@ -5,6 +5,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include <libxml/tree.h>
#include "common/border.h" #include "common/border.h"
#include "common/buf.h" #include "common/buf.h"
@ -196,4 +197,10 @@ void rcxml_parse_xml(struct buf *b);
void rcxml_read(const char *filename); void rcxml_read(const char *filename);
void rcxml_finish(void); void rcxml_finish(void);
/*
* Parse the child <action> 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 */ #endif /* LABWC_RCXML_H */

18
src/config/rcxml.c
View file

@ -253,8 +253,6 @@ set_property(const char *str, enum property *variable)
*variable = ret ? LAB_PROP_TRUE : LAB_PROP_FALSE; *variable = ret ? LAB_PROP_TRUE : LAB_PROP_FALSE;
} }
static void append_actions(xmlNode *node, struct wl_list *list);
static void static void
fill_window_rule(xmlNode *node) 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 static void
@ -482,7 +480,7 @@ parse_action_args(xmlNode *node, struct action *action)
action_arg_add_actionlist(action, "then"); action_arg_add_actionlist(action, "then");
actions = action_get_actionlist(action, "then"); actions = action_get_actionlist(action, "then");
} }
append_actions(child, actions); append_parsed_actions(child, actions);
} else if (!strcasecmp(key, "else")) { } else if (!strcasecmp(key, "else")) {
struct wl_list *actions = struct wl_list *actions =
action_get_actionlist(action, "else"); action_get_actionlist(action, "else");
@ -490,7 +488,7 @@ parse_action_args(xmlNode *node, struct action *action)
action_arg_add_actionlist(action, "else"); action_arg_add_actionlist(action, "else");
actions = action_get_actionlist(action, "else"); actions = action_get_actionlist(action, "else");
} }
append_actions(child, actions); append_parsed_actions(child, actions);
} else if (!strcasecmp(key, "none")) { } else if (!strcasecmp(key, "none")) {
struct wl_list *actions = struct wl_list *actions =
action_get_actionlist(action, "none"); action_get_actionlist(action, "none");
@ -498,7 +496,7 @@ parse_action_args(xmlNode *node, struct action *action)
action_arg_add_actionlist(action, "none"); action_arg_add_actionlist(action, "none");
actions = action_get_actionlist(action, "none"); actions = action_get_actionlist(action, "none");
} }
append_actions(child, actions); append_parsed_actions(child, actions);
} else if (!strcasecmp(key, "name")) { } else if (!strcasecmp(key, "name")) {
/* Ignore <action name=""> */ /* Ignore <action name=""> */
} else if (lab_xml_node_is_leaf(child)) { } else if (lab_xml_node_is_leaf(child)) {
@ -530,8 +528,8 @@ parse_action(xmlNode *node)
return action; return action;
} }
static void void
append_actions(xmlNode *node, struct wl_list *list) append_parsed_actions(xmlNode *node, struct wl_list *list)
{ {
xmlNode *child; xmlNode *child;
char *key, *content; 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, "layoutDependent", &keybind->use_syms_only);
lab_xml_get_bool(node, "allowWhenLocked", &keybind->allow_when_locked); lab_xml_get_bool(node, "allowWhenLocked", &keybind->allow_when_locked);
append_actions(node, &keybind->actions); append_parsed_actions(node, &keybind->actions);
} }
static void static void
@ -608,7 +606,7 @@ fill_mousebind(xmlNode *node, const char *context)
mousebind->mouse_event = mousebind_event_from_str(buf); mousebind->mouse_event = mousebind_event_from_str(buf);
} }
append_actions(node, &mousebind->actions); append_parsed_actions(node, &mousebind->actions);
} }
static void static void