mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-22 05:33:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rcxml: rewrite <keybind> parser

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

62
src/config/rcxml.c
View file

@ -571,49 +571,26 @@ append_actions(xmlNode *node, struct wl_list *list)
} }
static void static void
fill_keybind(char *nodename, char *content, struct parser_state *state) fill_keybind(xmlNode *node)
{ {
if (!content) { struct keybind *keybind = NULL;
char keyname[256];
if (lab_xml_get_string(node, "key", keyname, sizeof(keyname))) {
keybind = keybind_create(keyname);
if (!keybind) {
wlr_log(WLR_ERROR, "Invalid keybind: %s", keyname);
}
}
if (!keybind) {
return; return;
} }
string_truncate_at_pattern(nodename, ".keybind.keyboard");
if (!strcmp(nodename, "key")) { lab_xml_get_bool(node, "onRelease", &keybind->on_release);
state->current_keybind = keybind_create(content); lab_xml_get_bool(node, "layoutDependent", &keybind->use_syms_only);
state->current_keybind_action = NULL; lab_xml_get_bool(node, "allowWhenLocked", &keybind->allow_when_locked);
/*
* If an invalid keybind has been provided, append_actions(node, &keybind->actions);
* keybind_create() complains.
*/
if (!state->current_keybind) {
wlr_log(WLR_ERROR, "Invalid keybind: %s", content);
return;
}
} else if (!state->current_keybind) {
wlr_log(WLR_ERROR, "expect <keybind key=\"\"> element first. "
"nodename: '%s' content: '%s'", nodename, content);
} else if (!strcasecmp(nodename, "onRelease")) {
set_bool(content, &state->current_keybind->on_release);
} else if (!strcasecmp(nodename, "layoutDependent")) {
set_bool(content, &state->current_keybind->use_syms_only);
} else if (!strcasecmp(nodename, "allowWhenLocked")) {
set_bool(content, &state->current_keybind->allow_when_locked);
} else if (!strcmp(nodename, "name.action")) {
state->current_keybind_action = action_create(content);
if (state->current_keybind_action) {
wl_list_append(&state->current_keybind->actions,
&state->current_keybind_action->link);
}
} else if (!state->current_keybind_action) {
wlr_log(WLR_ERROR, "expect <action name=\"\"> element first. "
"nodename: '%s' content: '%s'", nodename, content);
} else {
/*
* Here we deal with action sub-elements such as <to>, <output>,
* <region>, <direction> and so on. This is common to key- and
* mousebinds.
*/
action_arg_from_xml_node(state->current_keybind_action, nodename, content);
}
} }
static void static void
@ -1083,8 +1060,9 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
if (state->in_usable_area_override) { if (state->in_usable_area_override) {
fill_usable_area_override(nodename, content, state); fill_usable_area_override(nodename, content, state);
} }
if (state->in_keybind) { if (!strcasecmp(nodename, "keybind.keyboard")) {
fill_keybind(nodename, content, state); fill_keybind(node);
return;
} }
if (state->in_mousebind) { if (state->in_mousebind) {
fill_mousebind(nodename, content, state); fill_mousebind(nodename, content, state);