mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-17 06:46:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add overrideInhibition to keyboard.keybind
Some checks failed
labwc.github.io / notify (push) Has been cancelled
Details

Browse source
This commit is contained in:
Yannis Drougas 2025-04-09 08:26:59 +01:00 • committed by Johan Malm
parent 4c7a9960a4
commit c5ea41e876
4 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/labwc-config.5.scd
View file

@ -760,7 +760,8 @@ References:
Stores the keyboard layout either globally or per window and restores Stores the keyboard layout either globally or per window and restores
it when switching back to the window. Default is global. it when switching back to the window. Default is global.
*<keyboard><keybind key="" layoutDependent="" onRelease="" allowWhenLocked="">* *<keyboard><keybind key="" layoutDependent="" onRelease="" allowWhenLocked=""
overrideInhibition="">*
Define a *key* binding in the format *modifier-key*, where supported Define a *key* binding in the format *modifier-key*, where supported
modifiers are: modifiers are:
- S (shift) - S (shift)
@ -808,6 +809,11 @@ References:
*allowWhenLocked* [yes|no] *allowWhenLocked* [yes|no]
Make this keybind work even if the screen is locked. Default is no. Make this keybind work even if the screen is locked. Default is no.
*overrideInhibition* [yes|no]
Make this keybind work even if the view inhibits keybinds. Default is no.
This can be used to prevent W-Tab and similar keybinds from being
delivered to Virtual Machines, VNC clients or nested compositors.
*onRelease* [yes|no] *onRelease* [yes|no]
When yes, fires the keybind action when the key or key When yes, fires the keybind action when the key or key
combination is released, rather than first pressed. This is useful to combination is released, rather than first pressed. This is useful to

1
include/config/keybind.h
View file

@ -23,6 +23,7 @@ struct keybind {
struct wl_list actions; /* struct action.link */ struct wl_list actions; /* struct action.link */
struct wl_list link; /* struct rcxml.keybinds */ struct wl_list link; /* struct rcxml.keybinds */
bool on_release; bool on_release;
bool override_inhibition;
}; };
/** /**

3
src/config/rcxml.c
View file

@ -602,6 +602,7 @@ fill_keybind(xmlNode *node)
lab_xml_get_bool(node, "onRelease", &keybind->on_release); lab_xml_get_bool(node, "onRelease", &keybind->on_release);
lab_xml_get_bool(node, "layoutDependent", &keybind->use_syms_only); lab_xml_get_bool(node, "layoutDependent", &keybind->use_syms_only);
lab_xml_get_bool(node, "allowWhenLocked", &keybind->allow_when_locked); lab_xml_get_bool(node, "allowWhenLocked", &keybind->allow_when_locked);
lab_xml_get_bool(node, "overrideInhibition", &keybind->override_inhibition);
append_parsed_actions(node, &keybind->actions); append_parsed_actions(node, &keybind->actions);
} }
@ -1706,6 +1707,8 @@ deduplicate_key_bindings(void)
wl_list_remove(&current->link); wl_list_remove(&current->link);
keybind_destroy(current); keybind_destroy(current);
cleared++; cleared++;
} else if (actions_contain_toggle_keybinds(&current->actions)) {
current->override_inhibition = true;
} }
} }
if (replaced) { if (replaced) {

6
src/input/keyboard.c
View file

@ -203,8 +203,10 @@ match_keybinding_for_sym(uint32_t modifiers,
if (modifiers ^ keybind->modifiers) { if (modifiers ^ keybind->modifiers) {
continue; continue;
} }
if (view_inhibits_actions(server.active_view, &keybind->actions)) { if (!(keybind->override_inhibition)) {
continue; if (view_inhibits_actions(server.active_view, &keybind->actions)) {
continue;
}
} }
if (sym == XKB_KEY_NoSymbol) { if (sym == XKB_KEY_NoSymbol) {
/* Use keycodes */ /* Use keycodes */