Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-15 18:22:08 -04:00
Code Packages Releases Activity

niri/keybinds: expose when-locked, inhibitied, repeat through GUI editor

Browse Source 
fixes #1437
This commit is contained in:
bbedward
2026-02-05 11:55:25 -05:00
parent a103b93583
commit 2583dbd3f2
7 changed files with 513 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/cmd/dms/commands_keybinds.go
View File

@@ -63,6 +63,7 @@ func init() {
keybindsSetCmd.Flags().Bool("allow-when-locked", false, "Allow when screen is locked")
keybindsSetCmd.Flags().Int("cooldown-ms", 0, "Cooldown in milliseconds")
keybindsSetCmd.Flags().Bool("no-repeat", false, "Disable key repeat")
keybindsSetCmd.Flags().Bool("no-inhibiting", false, "Keep bind active when shortcuts are inhibited (allow-inhibiting=false)")
keybindsSetCmd.Flags().String("replace-key", "", "Original key to replace (removes old key)")
keybindsSetCmd.Flags().String("flags", "", "Hyprland bind flags (e.g., 'e' for repeat, 'l' for locked, 'r' for release)")
@@ -212,6 +213,9 @@ func runKeybindsSet(cmd *cobra.Command, args []string) {
if v, _ := cmd.Flags().GetBool("no-repeat"); v {
options["repeat"] = false
}
if v, _ := cmd.Flags().GetBool("no-inhibiting"); v {
options["allow-inhibiting"] = false
}
if v, _ := cmd.Flags().GetString("flags"); v != "" {
options["flags"] = v
}

22
core/internal/keybinds/providers/niri.go
View File

@@ -118,6 +118,9 @@ func (n *NiriProvider) categorizeByAction(action string) string {
return "Overview"
case action == "quit" ||
action == "power-off-monitors" ||
action == "power-on-monitors" ||
action == "suspend" ||
action == "do-screen-transition" ||
action == "toggle-keyboard-shortcuts-inhibit" ||
strings.Contains(action, "dpms"):
return "System"
@@ -158,6 +161,9 @@ func (n *NiriProvider) convertKeybind(kb *NiriKeyBinding, subcategory string, co
Source: source,
HideOnOverlay: kb.HideOnOverlay,
CooldownMs: kb.CooldownMs,
AllowWhenLocked: kb.AllowWhenLocked,
AllowInhibiting: kb.AllowInhibiting,
Repeat: kb.Repeat,
}
if source == "dms" && conflicts != nil {
@@ -341,14 +347,10 @@ func (n *NiriProvider) buildActionFromNode(bindNode *document.Node) string {
}
if actionNode.Properties != nil {
if val, ok := actionNode.Properties.Get("focus"); ok {
parts = append(parts, "focus="+val.String())
for _, propName := range []string{"focus", "show-pointer", "write-to-disk", "skip-confirmation", "delay-ms"} {
if val, ok := actionNode.Properties.Get(propName); ok {
parts = append(parts, propName+"="+val.String())
}
if val, ok := actionNode.Properties.Get("show-pointer"); ok {
parts = append(parts, "show-pointer="+val.String())
}
if val, ok := actionNode.Properties.Get("write-to-disk"); ok {
parts = append(parts, "write-to-disk="+val.String())
}
}
@@ -372,6 +374,9 @@ func (n *NiriProvider) extractOptions(node *document.Node) map[string]any {
if val, ok := node.Properties.Get("allow-when-locked"); ok {
opts["allow-when-locked"] = val.String() == "true"
}
if val, ok := node.Properties.Get("allow-inhibiting"); ok {
opts["allow-inhibiting"] = val.String() == "true"
}
return opts
}
@@ -405,6 +410,9 @@ func (n *NiriProvider) buildBindNode(bind *overrideBind) *document.Node {
if v, ok := bind.Options["allow-when-locked"]; ok && v == true {
node.AddProperty("allow-when-locked", true, "")
}
if v, ok := bind.Options["allow-inhibiting"]; ok && v == false {
node.AddProperty("allow-inhibiting", false, "")
}
}
if bind.Description != "" {

26
core/internal/keybinds/providers/niri_parser.go
View File

@@ -19,6 +19,9 @@ type NiriKeyBinding struct {
Description string
HideOnOverlay bool
CooldownMs int
AllowWhenLocked bool
AllowInhibiting *bool
Repeat *bool
Source string
}
@@ -269,8 +272,10 @@ func (p *NiriParser) parseKeybindNode(node *document.Node, _ string) *NiriKeyBin
args = append(args, arg.ValueString())
}
if actionNode.Properties != nil {
if val, ok := actionNode.Properties.Get("focus"); ok {
args = append(args, "focus="+val.String())
for _, propName := range []string{"focus", "show-pointer", "write-to-disk", "skip-confirmation", "delay-ms"} {
if val, ok := actionNode.Properties.Get(propName); ok {
args = append(args, propName+"="+val.String())
}
}
}
}
@@ -278,6 +283,9 @@ func (p *NiriParser) parseKeybindNode(node *document.Node, _ string) *NiriKeyBin
var description string
var hideOnOverlay bool
var cooldownMs int
var allowWhenLocked bool
var allowInhibiting *bool
var repeat *bool
if node.Properties != nil {
if val, ok := node.Properties.Get("hotkey-overlay-title"); ok {
switch val.ValueString() {
@@ -290,6 +298,17 @@ func (p *NiriParser) parseKeybindNode(node *document.Node, _ string) *NiriKeyBin
if val, ok := node.Properties.Get("cooldown-ms"); ok {
cooldownMs, _ = strconv.Atoi(val.String())
}
if val, ok := node.Properties.Get("allow-when-locked"); ok {
allowWhenLocked = val.String() == "true"
}
if val, ok := node.Properties.Get("allow-inhibiting"); ok {
v := val.String() == "true"
allowInhibiting = &v
}
if val, ok := node.Properties.Get("repeat"); ok {
v := val.String() == "true"
repeat = &v
}
}
return &NiriKeyBinding{
@@ -300,6 +319,9 @@ func (p *NiriParser) parseKeybindNode(node *document.Node, _ string) *NiriKeyBin
Description: description,
HideOnOverlay: hideOnOverlay,
CooldownMs: cooldownMs,
AllowWhenLocked: allowWhenLocked,
AllowInhibiting: allowInhibiting,
Repeat: repeat,
Source: p.currentSource,
}
}

3
core/internal/keybinds/types.go
View File

@@ -9,6 +9,9 @@ type Keybind struct {
HideOnOverlay bool `json:"hideOnOverlay,omitempty"`
CooldownMs int `json:"cooldownMs,omitempty"`
Flags string `json:"flags,omitempty"` // Hyprland bind flags: e=repeat, l=locked, r=release, o=long-press
AllowWhenLocked bool `json:"allowWhenLocked,omitempty"`
AllowInhibiting *bool `json:"allowInhibiting,omitempty"` // nil=default(true), false=explicitly disabled
Repeat *bool `json:"repeat,omitempty"` // nil=default(true), false=explicitly disabled
Conflict *Keybind `json:"conflict,omitempty"`
}

65
quickshell/Common/KeybindActions.js
View File

@@ -121,7 +121,8 @@ const NIRI_ACTIONS = {
{ id: "expand-column-to-available-width", label: "Expand to Available Width" },
{ id: "consume-or-expel-window-left", label: "Consume/Expel Left" },
{ id: "consume-or-expel-window-right", label: "Consume/Expel Right" },
{ id: "toggle-column-tabbed-display", label: "Toggle Tabbed" }
{ id: "toggle-column-tabbed-display", label: "Toggle Tabbed" },
{ id: "toggle-window-rule-opacity", label: "Toggle Window Opacity" }
],
"Focus": [
{ id: "focus-column-left", label: "Focus Left" },
@@ -168,6 +169,7 @@ const NIRI_ACTIONS = {
"System": [
{ id: "toggle-overview", label: "Toggle Overview" },
{ id: "show-hotkey-overlay", label: "Show Hotkey Overlay" },
{ id: "do-screen-transition", label: "Screen Transition" },
{ id: "power-off-monitors", label: "Power Off Monitors" },
{ id: "power-on-monitors", label: "Power On Monitors" },
{ id: "toggle-keyboard-shortcuts-inhibit", label: "Toggle Shortcuts Inhibit" },
@@ -420,6 +422,12 @@ const COMPOSITOR_ACTIONS = {
const CATEGORY_ORDER = ["DMS", "Execute", "Workspace", "Tags", "Window", "Move/Resize", "Focus", "Move", "Layout", "Groups", "Monitor", "Scratchpad", "Screenshot", "System", "Pass-through", "Overview", "Alt-Tab", "Other"];
const NIRI_ACTION_ARGS = {
"quit": {
args: [{ name: "skip-confirmation", type: "bool", label: "Skip confirmation" }]
},
"do-screen-transition": {
args: [{ name: "delay-ms", type: "number", label: "Delay (ms)", placeholder: "250" }]
},
"set-column-width": {
args: [{ name: "value", type: "text", label: "Width", placeholder: "+10%, -10%, 50%" }]
},
@@ -980,14 +988,22 @@ function parseCompositorActionArgs(compositor, action) {
}
break;
default:
if (base.startsWith("screenshot")) {
for (var j = 0; j < argParts.length; j++) {
var kv = argParts[j].split("=");
if (kv.length === 2)
args[kv[0]] = kv[1] === "true";
if (kv.length === 2) {
switch (kv[1]) {
case "true":
args[kv[0]] = true;
break;
case "false":
args[kv[0]] = false;
break;
default:
args[kv[0]] = kv[1];
}
} else {
args.value = args.value ? (args.value + " " + argParts[j]) : argParts[j];
}
} else if (argParts.length > 0) {
args.value = argParts.join(" ");
}
}
break;
@@ -1114,30 +1130,23 @@ function buildCompositorAction(compositor, base, args) {
parts.push("focus=false");
break;
default:
switch (base) {
case "screenshot":
if (args["show-pointer"] === true)
parts.push("show-pointer=true");
else if (args["show-pointer"] === false)
parts.push("show-pointer=false");
break;
case "screenshot-screen":
if (args["show-pointer"] === true)
parts.push("show-pointer=true");
else if (args["show-pointer"] === false)
parts.push("show-pointer=false");
if (args["write-to-disk"] === true)
parts.push("write-to-disk=true");
break;
case "screenshot-window":
if (args["write-to-disk"] === true)
parts.push("write-to-disk=true");
break;
}
if (args.value) {
if (args.value)
parts.push(args.value);
} else if (args.index) {
else if (args.index)
parts.push(args.index);
for (var prop in args) {
switch (prop) {
case "value":
case "index":
continue;
}
var val = args[prop];
if (val === true)
parts.push(prop + "=true");
else if (val === false)
parts.push(prop + "=false");
else if (val !== undefined && val !== null && val !== "")
parts.push(prop + "=" + val);
}
}
break;

11
quickshell/Services/KeybindsService.qml
View File

@@ -384,7 +384,10 @@ Singleton {
"source": bind.source || "config",
"isOverride": bind.source === "dms",
"cooldownMs": bind.cooldownMs || 0,
"flags": bind.flags || ""
"flags": bind.flags || "",
"allowWhenLocked": bind.allowWhenLocked || false,
"allowInhibiting": bind.allowInhibiting,
"repeat": bind.repeat
};
if (actionMap[action]) {
actionMap[action].keys.push(keyData);
@@ -454,6 +457,12 @@ Singleton {
cmd.push("--replace-key", originalKey);
if (bindData.cooldownMs > 0)
cmd.push("--cooldown-ms", String(bindData.cooldownMs));
if (bindData.allowWhenLocked)
cmd.push("--allow-when-locked");
if (bindData.repeat === false)
cmd.push("--no-repeat");
if (bindData.allowInhibiting === false)
cmd.push("--no-inhibiting");
if (bindData.flags)
cmd.push("--flags", bindData.flags);
saveProcess.command = cmd;

155
quickshell/Widgets/KeybindItem.qml
View File

@@ -28,8 +28,14 @@ Item {
property string editDesc: ""
property int editCooldownMs: 0
property string editFlags: ""
property bool editAllowWhenLocked: false
property var editRepeat: undefined
property var editAllowInhibiting: undefined
property int _savedCooldownMs: -1
property string _savedFlags: ""
property var _savedAllowWhenLocked: undefined
property var _savedRepeat: undefined
property var _savedAllowInhibiting: undefined
property bool hasChanges: false
property string _actionType: ""
property bool addingNewKey: false
@@ -115,6 +121,24 @@ Item {
} else {
editFlags = keys[i].flags || "";
}
if (_savedAllowWhenLocked !== undefined) {
editAllowWhenLocked = _savedAllowWhenLocked;
_savedAllowWhenLocked = undefined;
} else {
editAllowWhenLocked = keys[i].allowWhenLocked || false;
}
if (_savedRepeat !== undefined) {
editRepeat = _savedRepeat;
_savedRepeat = undefined;
} else {
editRepeat = keys[i].repeat;
}
if (_savedAllowInhibiting !== undefined) {
editAllowInhibiting = _savedAllowInhibiting;
_savedAllowInhibiting = undefined;
} else {
editAllowInhibiting = keys[i].allowInhibiting;
}
hasChanges = false;
_actionType = Actions.getActionType(editAction);
useCustomCompositor = _actionType === "compositor" && editAction && !Actions.isKnownCompositorAction(KeybindsService.currentProvider, editAction);
@@ -136,6 +160,9 @@ Item {
editDesc = bindData.desc || "";
editCooldownMs = editingKeyIndex >= 0 ? (keys[editingKeyIndex].cooldownMs || 0) : 0;
editFlags = editingKeyIndex >= 0 ? (keys[editingKeyIndex].flags || "") : "";
editAllowWhenLocked = editingKeyIndex >= 0 ? (keys[editingKeyIndex].allowWhenLocked || false) : false;
editRepeat = editingKeyIndex >= 0 ? keys[editingKeyIndex].repeat : undefined;
editAllowInhibiting = editingKeyIndex >= 0 ? keys[editingKeyIndex].allowInhibiting : undefined;
hasChanges = false;
_actionType = Actions.getActionType(editAction);
useCustomCompositor = _actionType === "compositor" && editAction && !Actions.isKnownCompositorAction(KeybindsService.currentProvider, editAction);
@@ -156,6 +183,9 @@ Item {
editKey = keys[index].key;
editCooldownMs = keys[index].cooldownMs || 0;
editFlags = keys[index].flags || "";
editAllowWhenLocked = keys[index].allowWhenLocked || false;
editRepeat = keys[index].repeat;
editAllowInhibiting = keys[index].allowInhibiting;
hasChanges = false;
}
@@ -170,10 +200,20 @@ Item {
editCooldownMs = changes.cooldownMs;
if (changes.flags !== undefined)
editFlags = changes.flags;
const origKey = editingKeyIndex >= 0 && editingKeyIndex < keys.length ? keys[editingKeyIndex].key : "";
const origCooldown = editingKeyIndex >= 0 && editingKeyIndex < keys.length ? (keys[editingKeyIndex].cooldownMs || 0) : 0;
const origFlags = editingKeyIndex >= 0 && editingKeyIndex < keys.length ? (keys[editingKeyIndex].flags || "") : "";
hasChanges = editKey !== origKey || editAction !== (bindData.action || "") || editDesc !== (bindData.desc || "") || editCooldownMs !== origCooldown || editFlags !== origFlags;
if (changes.allowWhenLocked !== undefined)
editAllowWhenLocked = changes.allowWhenLocked;
if (changes.repeat !== undefined)
editRepeat = changes.repeat;
if (changes.allowInhibiting !== undefined)
editAllowInhibiting = changes.allowInhibiting;
const hasKey = editingKeyIndex >= 0 && editingKeyIndex < keys.length;
const origKey = hasKey ? keys[editingKeyIndex].key : "";
const origCooldown = hasKey ? (keys[editingKeyIndex].cooldownMs || 0) : 0;
const origFlags = hasKey ? (keys[editingKeyIndex].flags || "") : "";
const origAllowWhenLocked = hasKey ? (keys[editingKeyIndex].allowWhenLocked || false) : false;
const origRepeat = hasKey ? keys[editingKeyIndex].repeat : undefined;
const origAllowInhibiting = hasKey ? keys[editingKeyIndex].allowInhibiting : undefined;
hasChanges = editKey !== origKey || editAction !== (bindData.action || "") || editDesc !== (bindData.desc || "") || editCooldownMs !== origCooldown || editFlags !== origFlags || editAllowWhenLocked !== origAllowWhenLocked || editRepeat !== origRepeat || editAllowInhibiting !== origAllowInhibiting;
}
function canSave() {
@@ -193,12 +233,18 @@ Item {
desc = expandedLoader.item.currentTitle;
_savedCooldownMs = editCooldownMs;
_savedFlags = editFlags;
_savedAllowWhenLocked = editAllowWhenLocked;
_savedRepeat = editRepeat;
_savedAllowInhibiting = editAllowInhibiting;
saveBind(origKey, {
"key": editKey,
"action": editAction,
"desc": desc,
"cooldownMs": editCooldownMs,
"flags": editFlags
"flags": editFlags,
"allowWhenLocked": editAllowWhenLocked,
"repeat": editRepeat,
"allowInhibiting": editAllowInhibiting
});
hasChanges = false;
addingNewKey = false;
@@ -1322,6 +1368,29 @@ Item {
}
}
}
RowLayout {
visible: optionsRow.argConfig?.base === "quit"
spacing: Theme.spacingXS
DankToggle {
checked: optionsRow.parsedArgs?.args["skip-confirmation"] === true
onToggled: newChecked => {
const args = newChecked ? {
"skip-confirmation": true
} : {};
root.updateEdit({
"action": Actions.buildCompositorAction(KeybindsService.currentProvider, "quit", args)
});
}
}
StyledText {
text: I18n.tr("Skip confirmation")
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
}
}
}
}
@@ -1633,6 +1702,82 @@ Item {
}
}
RowLayout {
Layout.fillWidth: true
spacing: Theme.spacingM
visible: KeybindsService.currentProvider === "niri"
StyledText {
text: I18n.tr("Options")
font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium
color: Theme.surfaceVariantText
Layout.preferredWidth: root._labelWidth
}
Flow {
Layout.fillWidth: true
spacing: Theme.spacingM
RowLayout {
spacing: Theme.spacingXS
DankToggle {
checked: root.editRepeat !== false
onToggled: newChecked => {
root.updateEdit({
"repeat": newChecked ? undefined : false
});
}
}
StyledText {
text: I18n.tr("Repeat")
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
}
}
RowLayout {
spacing: Theme.spacingXS
DankToggle {
checked: root.editAllowWhenLocked
onToggled: newChecked => {
root.updateEdit({
"allowWhenLocked": newChecked
});
}
}
StyledText {
text: I18n.tr("When locked")
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
}
}
RowLayout {
spacing: Theme.spacingXS
DankToggle {
checked: root.editAllowInhibiting !== false
onToggled: newChecked => {
root.updateEdit({
"allowInhibiting": newChecked ? undefined : false
});
}
}
StyledText {
text: I18n.tr("Inhibitable")
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
}
}
}
}
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: 1