mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-10 08:21:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[fixup]s/property/attribute/

Browse source
This commit is contained in:
tokyo4j 2025-04-11 17:32:54 +09:00
parent 5510d27904
commit e0993db702
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/common/xml.h
View file

@ -5,7 +5,7 @@
#include <libxml/tree.h> #include <libxml/tree.h>
/* /*
* Converts dotted properties into nested nodes. * Converts dotted attributes into nested nodes.
* For example, the following node: * For example, the following node:
* *
* <keybind name.action="ShowMenu" menu.action="root-menu" * <keybind name.action="ShowMenu" menu.action="root-menu"
@ -24,6 +24,6 @@
* </action> * </action>
* </keybind> * </keybind>
*/ */
void lab_xml_expand_dotted_props(xmlNode *root); void lab_xml_expand_dotted_attributes(xmlNode *root);
#endif /* LABWC_XML_H */ #endif /* LABWC_XML_H */

32
src/common/xml.c
View file

@ -5,16 +5,16 @@
#include "common/xml.h" #include "common/xml.h"
/* /*
* Converts a property A.B.C="X" into <C><B><A>X</A></B></C> * Converts an attribute A.B.C="X" into <C><B><A>X</A></B></C>
*/ */
static xmlNode* static xmlNode*
create_prop_tree(const xmlAttr *prop) create_attribute_tree(const xmlAttr *attr)
{ {
if (!strchr((char *)prop->name, '.')) { if (!strchr((char *)attr->name, '.')) {
return NULL; return NULL;
} }
gchar **parts = g_strsplit((char *)prop->name, ".", -1); gchar **parts = g_strsplit((char *)attr->name, ".", -1);
int length = g_strv_length(parts); int length = g_strv_length(parts);
xmlNode *root_node = NULL; xmlNode *root_node = NULL;
xmlNode *parent_node = NULL; xmlNode *parent_node = NULL;
@ -35,7 +35,7 @@ create_prop_tree(const xmlAttr *prop)
parent_node = current_node; parent_node = current_node;
} }
xmlChar *content = xmlNodeGetContent(prop->children); xmlChar *content = xmlNodeGetContent(attr->children);
xmlNodeSetContent(current_node, content); xmlNodeSetContent(current_node, content);
xmlFree(content); xmlFree(content);
@ -45,7 +45,7 @@ create_prop_tree(const xmlAttr *prop)
/* /*
* Consider <keybind name.action="ShowMenu" x.position.action="1" y.position="2" />. * Consider <keybind name.action="ShowMenu" x.position.action="1" y.position="2" />.
* These three properties are represented by following trees. * These three attributes are represented by following trees.
* action(dst)---name * action(dst)---name
* action(src)---position---x * action(src)---position---x
* action--------position---y * action--------position---y
@ -86,7 +86,7 @@ merge_two_trees(xmlNode *dst, xmlNode *src)
} }
void void
lab_xml_expand_dotted_props(xmlNode *parent) lab_xml_expand_dotted_attributes(xmlNode *parent)
{ {
xmlNode *old_first_child = parent->children; xmlNode *old_first_child = parent->children;
xmlNode *prev_tree = NULL; xmlNode *prev_tree = NULL;
@ -95,13 +95,13 @@ lab_xml_expand_dotted_props(xmlNode *parent)
return; return;
} }
for (xmlAttr *prop = parent->properties; prop;) { for (xmlAttr *attr = parent->properties; attr;) {
/* Convert the property with dots into an xml tree */ /* Convert the attribute with dots into an xml tree */
xmlNode *tree = create_prop_tree(prop); xmlNode *tree = create_attribute_tree(attr);
if (!tree) { if (!tree) {
/* The property doesn't contain dots */ /* The attribute doesn't contain dots */
prev_tree = NULL; prev_tree = NULL;
prop = prop->next; attr = attr->next;
continue; continue;
} }
@ -116,12 +116,12 @@ lab_xml_expand_dotted_props(xmlNode *parent)
prev_tree = tree; prev_tree = tree;
} }
xmlAttr *next_prop = prop->next; xmlAttr *next_attr = attr->next;
xmlRemoveProp(prop); xmlRemoveProp(attr);
prop = next_prop; attr = next_attr;
} }
for (xmlNode *node = parent->children; node; node = node->next) { for (xmlNode *node = parent->children; node; node = node->next) {
lab_xml_expand_dotted_props(node); lab_xml_expand_dotted_attributes(node);
} }
} }

2
src/config/rcxml.c
View file

@ -1416,7 +1416,7 @@ rcxml_parse_xml(struct buf *b)
} }
struct parser_state init_state = {0}; struct parser_state init_state = {0};
xmlNode *root = xmlDocGetRootElement(d); xmlNode *root = xmlDocGetRootElement(d);
lab_xml_expand_dotted_props(root); lab_xml_expand_dotted_attributes(root);
xml_tree_walk(root, &init_state); xml_tree_walk(root, &init_state);
xmlFreeDoc(d); xmlFreeDoc(d);
xmlCleanupParser(); xmlCleanupParser();

6
t/xml.c
View file

@ -90,7 +90,7 @@ struct test_case {
}}; }};
static void static void
test_lab_xml_expand_dotted_props(void **state) test_lab_xml_expand_dotted_attributes(void **state)
{ {
(void)state; (void)state;
@ -99,7 +99,7 @@ test_lab_xml_expand_dotted_props(void **state)
NULL, NULL, 0); NULL, NULL, 0);
xmlNode *root = xmlDocGetRootElement(doc); xmlNode *root = xmlDocGetRootElement(doc);
lab_xml_expand_dotted_props(root); lab_xml_expand_dotted_attributes(root);
xmlBuffer *buf = xmlBufferCreate(); xmlBuffer *buf = xmlBufferCreate();
xmlNodeDump(buf, root->doc, root, 0, 0); xmlNodeDump(buf, root->doc, root, 0, 0);
@ -113,7 +113,7 @@ test_lab_xml_expand_dotted_props(void **state)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
const struct CMUnitTest tests[] = { const struct CMUnitTest tests[] = {
cmocka_unit_test(test_lab_xml_expand_dotted_props), cmocka_unit_test(test_lab_xml_expand_dotted_attributes),
}; };
return cmocka_run_group_tests(tests, NULL, NULL); return cmocka_run_group_tests(tests, NULL, NULL);