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

config: validate keybind, mousebind and menu actions

Browse source
This commit is contained in:
Consolatis 2023-05-13 16:27:46 +02:00
parent 665d31c1c7
commit 65b441a0ba
4 changed files with 89 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/config/rcxml.c
View file

@ -1121,6 +1121,45 @@ rule_destroy(struct window_rule *rule)
zfree(rule);
}
static void
validate_actions(void)
{
struct action *action, *action_tmp;
struct keybind *keybind;
wl_list_for_each(keybind, &rc.keybinds, link) {
wl_list_for_each_safe(action, action_tmp, &keybind->actions, link) {
if (!action_is_valid(action)) {
wl_list_remove(&action->link);
action_free(action);
wlr_log(WLR_ERROR, "Removed invalid keybind action");
}
}
}
struct mousebind *mousebind;
wl_list_for_each(mousebind, &rc.mousebinds, link) {
wl_list_for_each_safe(action, action_tmp, &mousebind->actions, link) {
if (!action_is_valid(action)) {
wl_list_remove(&action->link);
action_free(action);
wlr_log(WLR_ERROR, "Removed invalid mousebind action");
}
}
}
struct window_rule *rule;
wl_list_for_each(rule, &rc.window_rules, link) {
wl_list_for_each_safe(action, action_tmp, &rule->actions, link) {
if (!action_is_valid(action)) {
wl_list_remove(&action->link);
action_free(action);
wlr_log(WLR_ERROR, "Removed invalid window rule action");
}
}
}
}
static void
validate(void)
{
@ -1144,13 +1183,15 @@ validate(void)
}
/* Window-rule criteria */
struct window_rule *rule, *next;
wl_list_for_each_safe(rule, next, &rc.window_rules, link) {
struct window_rule *rule, *rule_tmp;
wl_list_for_each_safe(rule, rule_tmp, &rc.window_rules, link) {
if (!rule->identifier && !rule->title) {
wlr_log(WLR_ERROR, "Deleting rule %p as it has no criteria", rule);
rule_destroy(rule);
}
}
validate_actions();
}
static void