ags keybinds: allow multiple binds, make modifiers case-insensitive

This commit is contained in:
end-4 2025-04-05 23:29:55 +02:00
parent 5591e59680
commit 8fddaf2a3b
2 changed files with 21 additions and 10 deletions

View file

@ -200,9 +200,11 @@
]
},
"keybinds": {
// Format: Mod1+Mod2+key. CaSe SeNsItIvE!
// Format: "Modifier_1+...+Modifier_n+key". The key is CaSe SeNsItIvE!
// Modifiers: Shift Ctrl Alt Hyper Meta
// See https://docs.gtk.org/gdk3/index.html#constants for the other keys (they are listed as KEY_key)
// See https://docs.gtk.org/gdk3/index.html#constants for keys (listed as KEY_key)
// You can assign multiple keybinds for the same action. Just split them with a comma
// Example: "Ctrl+Page_Down, ctrl+Tab"
"overview": {
"altMoveLeft": "Ctrl+B",
"altMoveRight": "Ctrl+F",

View file

@ -1,20 +1,20 @@
const { Gdk } = imports.gi;
const MODS = {
'Shift': Gdk.ModifierType.SHIFT_MASK,
'Ctrl': Gdk.ModifierType.CONTROL_MASK,
'Alt': Gdk.ModifierType.ALT_MASK,
'Hyper': Gdk.ModifierType.HYPER_MASK,
'Meta': Gdk.ModifierType.META_MASK
'shift': Gdk.ModifierType.SHIFT_MASK,
'ctrl': Gdk.ModifierType.CONTROL_MASK,
'alt': Gdk.ModifierType.ALT_MASK,
'hyper': Gdk.ModifierType.HYPER_MASK,
'meta': Gdk.ModifierType.META_MASK
}
export const checkKeybind = (event, keybind) => {
const checkSingleKeybind = (event, keybind) => {
const pressedModMask = event.get_state()[1];
const pressedKey = event.get_keyval()[1];
const keys = keybind.split('+');
for (let i = 0; i < keys.length; i++) {
if (keys[i] in MODS) {
if (!(pressedModMask & MODS[keys[i]])) {
if (keys[i].toLowerCase() in MODS) {
if (!(pressedModMask & MODS[keys[i].toLowerCase()])) {
return false;
}
} else if (pressedKey !== Gdk[`KEY_${keys[i]}`] && pressedKey !== Gdk[`KEY_${keys[i].toLowerCase()}`]) {
@ -23,3 +23,12 @@ export const checkKeybind = (event, keybind) => {
}
return true;
}
export const checkKeybind = (event, keybind) => {
const keybinds = keybind.replace(' ', '').split(',');
for (let i = 0; i < keybinds.length; i++) {
if (checkSingleKeybind(event, keybinds[i])) {
return true;
}
}
}