mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-31 22:25:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rcxml: rewrite <mousebind> parser

Browse source
This commit is contained in:
tokyo4j 2025-04-12 03:41:27 +09:00 • committed by Johan Malm
parent 433168457f
commit be31df097c
1 changed files with 34 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/config/rcxml.c
View file

@ -594,7 +594,7 @@ fill_keybind(xmlNode *node)
} }
static void static void
fill_mousebind(char *nodename, char *content, struct parser_state *state) fill_mousebind(xmlNode *node, const char *context)
{ {
/* /*
* Example of what we are parsing: * Example of what we are parsing:
@ -605,46 +605,40 @@ fill_mousebind(char *nodename, char *content, struct parser_state *state)
* </mousebind> * </mousebind>
*/ */
if (!state->current_mouse_context) { wlr_log(WLR_INFO, "create mousebind for %s", context);
wlr_log(WLR_ERROR, "expect <context name=\"\"> element first. " struct mousebind *mousebind = mousebind_create(context);
"nodename: '%s' content: '%s'", nodename, content);
return; char buf[256];
} else if (!strcmp(nodename, "mousebind.context.mouse")) { if (lab_xml_get_string(node, "button", buf, sizeof(buf))) {
wlr_log(WLR_INFO, "create mousebind for %s", mousebind->button = mousebind_button_from_str(
state->current_mouse_context); buf, &mousebind->modifiers);
state->current_mousebind = mousebind_create(state->current_mouse_context); }
state->current_mousebind_action = NULL; if (lab_xml_get_string(node, "direction", buf, sizeof(buf))) {
return; mousebind->direction = mousebind_direction_from_str(
} else if (!content) { buf, &mousebind->modifiers);
}
if (lab_xml_get_string(node, "action", buf, sizeof(buf))) {
/* <mousebind button="" action="EVENT"> */
mousebind->mouse_event = mousebind_event_from_str(buf);
}
append_actions(node, &mousebind->actions);
}
static void
fill_mouse_context(xmlNode *node)
{
char context_name[256];
if (!lab_xml_get_string(node, "name", context_name, sizeof(context_name))) {
return; return;
} }
string_truncate_at_pattern(nodename, ".mousebind.context.mouse"); xmlNode *child;
if (!state->current_mousebind) { char *key, *content;
wlr_log(WLR_ERROR, LAB_XML_FOR_EACH(node, child, key, content) {
"expect <mousebind button=\"\" action=\"\"> element first. " if (!strcasecmp(key, "mousebind")) {
"nodename: '%s' content: '%s'", nodename, content); fill_mousebind(child, context_name);
} else if (!strcmp(nodename, "button")) {
state->current_mousebind->button = mousebind_button_from_str(content,
&state->current_mousebind->modifiers);
} else if (!strcmp(nodename, "direction")) {
state->current_mousebind->direction = mousebind_direction_from_str(content,
&state->current_mousebind->modifiers);
} else if (!strcmp(nodename, "action")) {
/* <mousebind button="" action="EVENT"> */
state->current_mousebind->mouse_event =
mousebind_event_from_str(content);
} else if (!strcmp(nodename, "name.action")) {
state->current_mousebind_action = action_create(content);
if (state->current_mousebind_action) {
wl_list_append(&state->current_mousebind->actions,
&state->current_mousebind_action->link);
} }
} else if (!state->current_mousebind_action) {
wlr_log(WLR_ERROR, "expect <action name=\"\"> element first. "
"nodename: '%s' content: '%s'", nodename, content);
} else {
action_arg_from_xml_node(state->current_mousebind_action, nodename, content);
} }
} }
@ -1064,8 +1058,9 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
fill_keybind(node); fill_keybind(node);
return; return;
} }
if (state->in_mousebind) { if (!strcasecmp(nodename, "context.mouse")) {
fill_mousebind(nodename, content, state); fill_mouse_context(node);
return;
} }
if (state->in_touch) { if (state->in_touch) {
fill_touch(nodename, content, state); fill_touch(nodename, content, state);
@ -1203,9 +1198,6 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
} else if (!strcasecmp(nodename, "scrollFactor.mouse")) { } else if (!strcasecmp(nodename, "scrollFactor.mouse")) {
/* This is deprecated. Show an error message in post_processing() */ /* This is deprecated. Show an error message in post_processing() */
set_double(content, &mouse_scroll_factor); set_double(content, &mouse_scroll_factor);
} else if (!strcasecmp(nodename, "name.context.mouse")) {
state->current_mouse_context = content;
state->current_mousebind = NULL;
} else if (!strcasecmp(nodename, "repeatRate.keyboard")) { } else if (!strcasecmp(nodename, "repeatRate.keyboard")) {
rc.repeat_rate = atoi(content); rc.repeat_rate = atoi(content);