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

action: gracefully handle argument without key

Browse source 
Fixes: issue #894
This commit is contained in:
Johan Malm 2023-04-25 21:28:47 +01:00 • committed by Johan Malm
parent fa50149525
commit 86cb62ed12
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/action.c
View file

@ -177,6 +177,9 @@ get_arg_value_str(struct action *action, const char *key, const char *default_va
assert(key);
struct action_arg *arg;
wl_list_for_each(arg, &action->args, link) {
if (!arg->key) {
continue;
}
if (!strcasecmp(key, arg->key)) {
return action_str_from_arg(arg);
}
@ -190,6 +193,9 @@ get_arg_value_bool(struct action *action, const char *key, bool default_value)
assert(key);
struct action_arg *arg;
wl_list_for_each(arg, &action->args, link) {
if (!arg->key) {
continue;
}
if (!strcasecmp(key, arg->key)) {
assert(arg->type == LAB_ACTION_ARG_BOOL);
return ((struct action_arg_bool *)arg)->value;
@ -513,6 +519,11 @@ actions_run(struct view *activator, struct server *server,
case ACTION_TYPE_SEND_TO_DESKTOP:
if (view) {
const char *to = get_arg_value_str(action, "to", NULL);
if (!to) {
wlr_log(WLR_ERROR,
"Missing 'to' argument for SendToDesktop");
break;
}
bool follow = get_arg_value_bool(action, "follow", true);
struct workspace *target = workspaces_find(view->workspace, to);
if (target) {