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

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

31
src/action.c
View file

@ -401,23 +401,30 @@ action_is_valid(struct action *action)
return false;
}
void action_list_free(struct wl_list *action_list)
void
action_free(struct action *action)
{
/* Free args */
struct action_arg *arg, *arg_tmp;
wl_list_for_each_safe(arg, arg_tmp, &action->args, link) {
wl_list_remove(&arg->link);
zfree(arg->key);
if (arg->type == LAB_ACTION_ARG_STR) {
struct action_arg_str *str_arg = (struct action_arg_str *)arg;
zfree(str_arg->value);
}
zfree(arg);
}
zfree(action);
}
void
action_list_free(struct wl_list *action_list)
{
struct action *action, *action_tmp;
/* Free actions */
wl_list_for_each_safe(action, action_tmp, action_list, link) {
wl_list_remove(&action->link);
/* Free args */
wl_list_for_each_safe(arg, arg_tmp, &action->args, link) {
wl_list_remove(&arg->link);
zfree(arg->key);
if (arg->type == LAB_ACTION_ARG_STR) {
free((void *)action_str_from_arg(arg));
}
zfree(arg);
}
zfree(action);
action_free(action);
}
}

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

25
src/menu/menu.c
View file

@ -128,6 +128,30 @@ post_processing(struct server *server)
}
}
static void
validate_menu(struct menu *menu)
{
struct menuitem *item;
struct action *action, *action_tmp;
wl_list_for_each(item, &menu->menuitems, link) {
wl_list_for_each_safe(action, action_tmp, &item->actions, link) {
if (!action_is_valid(action)) {
wl_list_remove(&action->link);
action_free(action);
wlr_log(WLR_ERROR, "Removed invalid menu action");
}
}
}
}
static void
validate(struct server *server)
{
for (int i = 0; i < nr_menus; ++i) {
validate_menu(menus + i);
}
}
static struct menuitem *
item_create(struct menu *menu, const char *text, bool show_arrow)
{
@ -730,6 +754,7 @@ menu_init(struct server *server)
init_rootmenu(server);
init_windowmenu(server);
post_processing(server);
validate(server);
}
void