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

src/action.c: relax argument checks when running actions

Browse source
This commit is contained in:
Consolatis 2023-05-15 18:50:13 +02:00
parent 65b441a0ba
commit fe8cdd7f8b
1 changed files with 34 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

94
src/action.c
View file

@ -77,8 +77,8 @@ enum action_type {
ACTION_TYPE_RESIZE_RELATIVE, ACTION_TYPE_RESIZE_RELATIVE,
ACTION_TYPE_MOVETO, ACTION_TYPE_MOVETO,
ACTION_TYPE_MOVE_RELATIVE, ACTION_TYPE_MOVE_RELATIVE,
ACTION_TYPE_GO_TO_DESKTOP,
ACTION_TYPE_SEND_TO_DESKTOP, ACTION_TYPE_SEND_TO_DESKTOP,
ACTION_TYPE_GO_TO_DESKTOP,
ACTION_TYPE_SNAP_TO_REGION, ACTION_TYPE_SNAP_TO_REGION,
ACTION_TYPE_TOGGLE_KEYBINDS, ACTION_TYPE_TOGGLE_KEYBINDS,
ACTION_TYPE_FOCUS_OUTPUT, ACTION_TYPE_FOCUS_OUTPUT,
@ -113,8 +113,8 @@ const char *action_names[] = {
"ResizeRelative", "ResizeRelative",
"MoveTo", "MoveTo",
"MoveRelative", "MoveRelative",
"GoToDesktop",
"SendToDesktop", "SendToDesktop",
"GoToDesktop",
"SnapToRegion", "SnapToRegion",
"ToggleKeybinds", "ToggleKeybinds",
"FocusOutput", "FocusOutput",
@ -225,7 +225,7 @@ action_arg_from_xml_node(struct action *action, char *nodename, char *content)
if (!strcmp(argument, "region")) { if (!strcmp(argument, "region")) {
action_arg_add_str(action, argument, content); action_arg_add_str(action, argument, content);
goto cleanup; goto cleanup;
}; }
break; break;
case ACTION_TYPE_FOCUS_OUTPUT: case ACTION_TYPE_FOCUS_OUTPUT:
if (!strcmp(argument, "output")) { if (!strcmp(argument, "output")) {
@ -550,34 +550,24 @@ actions_run(struct view *activator, struct server *server,
debug_dump_scene(server); debug_dump_scene(server);
break; break;
case ACTION_TYPE_EXECUTE: case ACTION_TYPE_EXECUTE:
if (!arg) { {
wlr_log(WLR_ERROR, "Missing argument for Execute"); struct buf cmd;
break; buf_init(&cmd);
buf_add(&cmd, action_str_from_arg(arg));
buf_expand_shell_variables(&cmd);
spawn_async_no_shell(cmd.buf);
free(cmd.buf);
} }
struct buf cmd;
buf_init(&cmd);
buf_add(&cmd, action_str_from_arg(arg));
buf_expand_shell_variables(&cmd);
spawn_async_no_shell(cmd.buf);
free(cmd.buf);
break; break;
case ACTION_TYPE_EXIT: case ACTION_TYPE_EXIT:
wl_display_terminate(server->wl_display); wl_display_terminate(server->wl_display);
break; break;
case ACTION_TYPE_MOVE_TO_EDGE: case ACTION_TYPE_MOVE_TO_EDGE:
if (!arg) {
wlr_log(WLR_ERROR, "Missing argument for MoveToEdge");
break;
}
if (view) { if (view) {
view_move_to_edge(view, action_str_from_arg(arg)); view_move_to_edge(view, action_str_from_arg(arg));
} }
break; break;
case ACTION_TYPE_SNAP_TO_EDGE: case ACTION_TYPE_SNAP_TO_EDGE:
if (!arg) {
wlr_log(WLR_ERROR, "Missing argument for SnapToEdge");
break;
}
if (view) { if (view) {
view_snap_to_edge(view, action_str_from_arg(arg), view_snap_to_edge(view, action_str_from_arg(arg),
/*store_natural_geometry*/ true); /*store_natural_geometry*/ true);
@ -597,11 +587,7 @@ actions_run(struct view *activator, struct server *server,
kill(getpid(), SIGHUP); kill(getpid(), SIGHUP);
break; break;
case ACTION_TYPE_SHOW_MENU: case ACTION_TYPE_SHOW_MENU:
if (arg) { show_menu(server, view, action_str_from_arg(arg));
show_menu(server, view, action_str_from_arg(arg));
} else {
wlr_log(WLR_ERROR, "Missing argument for ShowMenu");
}
break; break;
case ACTION_TYPE_TOGGLE_MAXIMIZE: case ACTION_TYPE_TOGGLE_MAXIMIZE:
if (view) { if (view) {
@ -688,46 +674,36 @@ actions_run(struct view *activator, struct server *server,
view_move(view, view->pending.x + x, view->pending.y + y); view_move(view, view->pending.x + x, view->pending.y + y);
} }
break; break;
case ACTION_TYPE_GO_TO_DESKTOP: { case ACTION_TYPE_SEND_TO_DESKTOP:
const char *to = get_arg_value_str(action, "to", NULL); if (!view) {
if (!to) {
wlr_log(WLR_ERROR,
"Missing 'to' argument for GoToDesktop");
break; break;
} }
bool wrap = get_arg_value_bool(action, "wrap", true); /* Falls through to GoToDesktop */
struct workspace *target; case ACTION_TYPE_GO_TO_DESKTOP:
target = workspaces_find(server->workspace_current, to, wrap); {
if (target) { bool follow = true;
workspaces_switch_to(target); bool wrap = get_arg_value_bool(action, "wrap", true);
}
break;
}
case ACTION_TYPE_SEND_TO_DESKTOP:
if (view) {
const char *to = get_arg_value_str(action, "to", NULL); const char *to = get_arg_value_str(action, "to", NULL);
if (!to) { /*
wlr_log(WLR_ERROR, * `to` is always != NULL here because otherwise we would have
"Missing 'to' argument for SendToDesktop"); * removed the action during the initial parsing step as it is
* a required argument for both SendToDesktop and GoToDesktop.
*/
struct workspace *target = workspaces_find(
server->workspace_current, to, wrap);
if (!target) {
break; break;
} }
bool follow = get_arg_value_bool(action, "follow", true); if (action->type == ACTION_TYPE_SEND_TO_DESKTOP) {
bool wrap = get_arg_value_bool(action, "wrap", true);
struct workspace *target;
target = workspaces_find(view->workspace, to, wrap);
if (target) {
view_move_to_workspace(view, target); view_move_to_workspace(view, target);
if (follow) { follow = get_arg_value_bool(action, "follow", true);
workspaces_switch_to(target); }
} if (follow) {
workspaces_switch_to(target);
} }
} }
break; break;
case ACTION_TYPE_SNAP_TO_REGION: case ACTION_TYPE_SNAP_TO_REGION:
if (!arg) {
wlr_log(WLR_ERROR, "Missing argument for SnapToRegion");
break;
}
if (!view) { if (!view) {
break; break;
} }
@ -750,12 +726,10 @@ actions_run(struct view *activator, struct server *server,
server->seat.inhibit_keybinds ? "Disabled" : "Enabled"); server->seat.inhibit_keybinds ? "Disabled" : "Enabled");
break; break;
case ACTION_TYPE_FOCUS_OUTPUT: case ACTION_TYPE_FOCUS_OUTPUT:
if (!arg) { {
wlr_log(WLR_ERROR, "Missing argument for FocusOutput"); const char *output_name = action_str_from_arg(arg);
break; desktop_focus_output(output_from_name(server, output_name));
} }
const char *output_name = action_str_from_arg(arg);
desktop_focus_output(output_from_name(server, output_name));
break; break;
case ACTION_TYPE_INVALID: case ACTION_TYPE_INVALID:
wlr_log(WLR_ERROR, "Not executing unknown action"); wlr_log(WLR_ERROR, "Not executing unknown action");