mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rcxml: rewrite <tablet><map> parser

Browse source
This commit is contained in:
tokyo4j 2025-04-12 03:21:13 +09:00 • committed by Johan Malm
parent 619cae67fa
commit 67f36d9e13
1 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/config/rcxml.c
View file

@ -678,6 +678,30 @@ fill_touch(xmlNode *node)
}
}
static void
fill_tablet_button_map(xmlNode *node)
{
uint32_t map_from;
uint32_t map_to;
char buf[256];
if (lab_xml_get_string(node, "button", buf, sizeof(buf))) {
map_from = tablet_button_from_str(buf);
} else {
wlr_log(WLR_ERROR, "Invalid 'button' argument for tablet button mapping");
return;
}
if (lab_xml_get_string(node, "to", buf, sizeof(buf))) {
map_to = mousebind_button_from_str(buf, NULL);
} else {
wlr_log(WLR_ERROR, "Invalid 'to' argument for tablet button mapping");
return;
}
tablet_button_mapping_add(map_from, map_to);
}
static int
get_accel_profile(const char *s)
{
@ -1044,8 +1068,6 @@ set_tearing_mode(const char *str, enum tearing_mode *variable)
static void
entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
{
static uint32_t button_map_from;
if (!nodename) {
return;
}
@ -1092,6 +1114,10 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
fill_font(node);
return;
}
if (!strcasecmp(nodename, "map.tablet")) {
fill_tablet_button_map(node);
return;
}
/* handle nodes without content, e.g. <keyboard><default /> */
if (!strcmp(nodename, "default.keyboard")) {
@ -1104,11 +1130,6 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
return;
}
if (!strcasecmp(nodename, "map.tablet")) {
button_map_from = UINT32_MAX;
return;
}
if (!strcasecmp(nodename, "prefix.desktops")) {
xstrdup_replace(rc.workspace_config.prefix, content ? content : "");
return;
@ -1318,17 +1339,6 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
rc.tablet.box.width = tablet_get_dbl_if_positive(content, "width");
} else if (!strcasecmp(nodename, "height.area.tablet")) {
rc.tablet.box.height = tablet_get_dbl_if_positive(content, "height");
} else if (!strcasecmp(nodename, "button.map.tablet")) {
button_map_from = tablet_button_from_str(content);
} else if (!strcasecmp(nodename, "to.map.tablet")) {
if (button_map_from != UINT32_MAX) {
uint32_t button_map_to = mousebind_button_from_str(content, NULL);
if (button_map_to != UINT32_MAX) {
tablet_button_mapping_add(button_map_from, button_map_to);
}
} else {
wlr_log(WLR_ERROR, "Missing 'button' argument for tablet button mapping");
}
} else if (!strcasecmp(nodename, "motion.tabletTool")) {
rc.tablet_tool.motion = tablet_parse_motion(content);
} else if (!strcasecmp(nodename, "relativeMotionSensitivity.tabletTool")) {