Add ToggleKeybinds action

This can be used to better control Virtual Machines, VNC clients, nested
compositors or similar. All keybinds other than ToggleKeybinds itself are
disabled when first called, a 2nd call will restore handling of all keybinds.

Fixes #738
Fixes #810
This commit is contained in:
Consolatis 2023-03-03 18:16:46 +01:00 committed by Johan Malm
parent d571b0b28a
commit c33a404dc1
5 changed files with 35 additions and 1 deletions

View file

@ -59,7 +59,8 @@ enum action_type {
ACTION_TYPE_RESIZE,
ACTION_TYPE_GO_TO_DESKTOP,
ACTION_TYPE_SEND_TO_DESKTOP,
ACTION_TYPE_SNAP_TO_REGION
ACTION_TYPE_SNAP_TO_REGION,
ACTION_TYPE_TOGGLE_KEYBINDS,
};
const char *action_names[] = {
@ -88,6 +89,7 @@ const char *action_names[] = {
"GoToDesktop",
"SendToDesktop",
"SnapToRegion",
"ToggleKeybinds",
NULL
};
@ -169,6 +171,18 @@ action_create(const char *action_name)
return action;
}
bool
actions_contain_toggle_keybinds(struct wl_list *action_list)
{
struct action *action;
wl_list_for_each(action, action_list, link) {
if (action->type == ACTION_TYPE_TOGGLE_KEYBINDS) {
return true;
}
}
return false;
}
void action_list_free(struct wl_list *action_list)
{
struct action_arg *arg, *arg_tmp;
@ -451,6 +465,11 @@ actions_run(struct view *activator, struct server *server,
wlr_log(WLR_ERROR, "Invalid SnapToRegion id: '%s'", region_name);
}
break;
case ACTION_TYPE_TOGGLE_KEYBINDS:
server->seat.inhibit_keybinds = !server->seat.inhibit_keybinds;
wlr_log(WLR_DEBUG, "%s keybinds",
server->seat.inhibit_keybinds ? "Disabled" : "Enabled");
break;
case ACTION_TYPE_INVALID:
wlr_log(WLR_ERROR, "Not executing unknown action");
break;

View file

@ -86,6 +86,10 @@ handle_keybinding(struct server *server, uint32_t modifiers, xkb_keysym_t sym)
if (modifiers ^ keybind->modifiers) {
continue;
}
if (server->seat.inhibit_keybinds
&& !actions_contain_toggle_keybinds(&keybind->actions)) {
continue;
}
for (size_t i = 0; i < keybind->keysyms_len; i++) {
if (xkb_keysym_to_lower(sym) == keybind->keysyms[i]) {
key_state_store_pressed_keys_as_bound();