* Step the volume in the shell instead of a script per keypress Each volume key ran omarchy-audio-output-volume: several pactl calls in bash, then omarchy-osd delivering the OSD over a qs IPC client, ~165ms from keypress to OSD, on keys that repeat while held. The volume up, down and mute keys now dispatch global shortcuts that the media service handles over PipeWire, stepping, clamping, unmuting and debouncing by the script's rules and showing the same OSD. It acts only when the default sink is an ALSA sink, which is its own physical sink. Any other default, a DSP chain or EasyEffects above all, falls back to the script, which resolves the physical sink from the live routing on every press. The precise +1/-1 keys still run the script. Keypress to OSD drops from ~168ms to ~20ms. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Run media and notification keys in the shell without an IPC client The media keys and the notification dismiss, invoke and history keys ran omarchy-shell, starting a qs client for one argument-free IPC call. A new ipc shortcut kind names such a call as target.method. The shell hands it to the service that owns the target, which runs its own IpcHandler function, so the key behaves exactly as the omarchy-shell call did. A call missing from the list binds through omarchy-shell. Dismissing a notification with SUPER+comma clears the popup in ~11ms instead of ~40ms. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
144 lines
6.8 KiB
Bash
144 lines
6.8 KiB
Bash
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
|
|
|
require_command lua
|
|
|
|
shortcuts="$ROOT/default/omarchy/shortcuts"
|
|
|
|
# Load the helpers and every default binding against a stub hl, and print one
|
|
# line per binding: "global <name>" for a global shortcut, "exec <command>" for
|
|
# a command, then its description.
|
|
list_bindings() {
|
|
HOME="$(mktemp -d)" OMARCHY_PATH="$ROOT" lua <<'LUA'
|
|
package.path = os.getenv("OMARCHY_PATH") .. "/?.lua;" .. package.path
|
|
|
|
local function proxy()
|
|
return setmetatable({}, {
|
|
__index = function(self, key)
|
|
local value = proxy()
|
|
rawset(self, key, value)
|
|
return value
|
|
end,
|
|
__call = function()
|
|
return {}
|
|
end,
|
|
})
|
|
end
|
|
|
|
local dsp = proxy()
|
|
rawset(dsp, "global", function(name) return { global = name } end)
|
|
rawset(dsp, "exec_cmd", function(command) return { exec = command } end)
|
|
|
|
hl = setmetatable({
|
|
dsp = dsp,
|
|
bind = function(keys, dispatcher, opts)
|
|
local kind, target = "other", ""
|
|
if type(dispatcher) == "table" and dispatcher.global then
|
|
kind, target = "global", dispatcher.global
|
|
elseif type(dispatcher) == "table" and dispatcher.exec then
|
|
kind, target = "exec", dispatcher.exec
|
|
end
|
|
print(kind .. "\t" .. target .. "\t" .. ((opts or {}).description or ""))
|
|
end,
|
|
}, {
|
|
__index = function()
|
|
return function() return {} end
|
|
end,
|
|
})
|
|
|
|
require("default.hypr.helpers")
|
|
|
|
o.bind("A", "listed menu", { menu = "theme" })
|
|
o.bind("B", "unlisted menu", { menu = "setup.power" })
|
|
o.bind("C", "listed panel", { panel = "omarchy.emojis" })
|
|
o.bind("D", "unlisted panel", { panel = "omarchy.wifiqr" })
|
|
o.bind("E", "listed audio", { audio = "raise" })
|
|
o.bind("F", "unlisted audio", { audio = "+1" })
|
|
o.bind("G", "listed ipc", { ipc = "media.next" })
|
|
o.bind("H", "unlisted ipc", { ipc = "media.sourceNext" })
|
|
|
|
for _, file in ipairs({ "utilities", "clipboard", "media" }) do
|
|
dofile(os.getenv("OMARCHY_PATH") .. "/default/hypr/bindings/" .. file .. ".lua")
|
|
end
|
|
LUA
|
|
}
|
|
|
|
bindings=$(list_bindings)
|
|
|
|
expect_binding() {
|
|
local expected="$1"
|
|
local message="$2"
|
|
grep -Fxq "$expected" <<<"$bindings" || fail "$message: $(grep -F "$(cut -f3 <<<"$expected")" <<<"$bindings")"
|
|
}
|
|
|
|
expect_binding $'global\tomarchy:menu.theme\tlisted menu' "a listed menu route binds its global shortcut"
|
|
expect_binding $'exec\tomarchy-menu toggle \'setup.power\'\tunlisted menu' "an unlisted menu route falls back to the command"
|
|
expect_binding $'global\tomarchy:panel.omarchy.emojis\tlisted panel' "a listed panel binds its global shortcut"
|
|
expect_binding $'exec\tomarchy-shell shell toggle \'omarchy.wifiqr\'\tunlisted panel' "an unlisted panel falls back to the command"
|
|
expect_binding $'global\tomarchy:audio.raise\tlisted audio' "a listed volume key binds its global shortcut"
|
|
expect_binding $'exec\tomarchy-audio-output-volume \'+1\'\tunlisted audio' "an unlisted volume step falls back to the script"
|
|
expect_binding $'global\tomarchy:ipc.media.next\tlisted ipc' "a listed IPC call binds its global shortcut"
|
|
expect_binding $'exec\tomarchy-shell \'media\' \'sourceNext\'\tunlisted ipc' "an unlisted IPC call falls back to omarchy-shell"
|
|
pass "shell bindings use global shortcuts only for what the shell registers"
|
|
|
|
# Every default binding that toggles a listed route or panel goes through its
|
|
# shortcut, and none toggles one through a command any more.
|
|
! grep -E $'^exec\t(omarchy-menu toggle|omarchy-shell shell toggle) ' <<<"$bindings" | grep -v $'\tunlisted ' ||
|
|
fail "default bindings toggle menus and panels through global shortcuts"
|
|
expect_binding $'global\tomarchy:menu.root\tOmarchy menu' "SUPER+SPACE opens the menu through its shortcut"
|
|
expect_binding $'global\tomarchy:menu.theme\tTheme menu' "the theme menu binding uses its shortcut"
|
|
expect_binding $'global\tomarchy:panel.omarchy.clipboard\tClipboard manager' "the clipboard binding uses its shortcut"
|
|
expect_binding $'global\tomarchy:audio.raise\tVolume up' "the volume up key steps the volume in the shell"
|
|
expect_binding $'global\tomarchy:audio.lower\tVolume down' "the volume down key steps the volume in the shell"
|
|
expect_binding $'global\tomarchy:audio.mute-toggle\tMute' "the mute key toggles mute in the shell"
|
|
expect_binding $'global\tomarchy:ipc.media.playPause\tPlay' "the play key reaches the media service directly"
|
|
expect_binding $'global\tomarchy:ipc.notifications.dismissOne\tDismiss last notification' "dismissing a notification reaches the service directly"
|
|
! grep -E $'^exec\tomarchy-shell (media|notifications) ' <<<"$bindings" ||
|
|
fail "default media and notification keys reach their services through global shortcuts"
|
|
pass "default bindings toggle menus and panels through global shortcuts"
|
|
|
|
# The shell and the helpers read the same list, in the same format.
|
|
while IFS= read -r line; do
|
|
[[ -z $line || $line == \#* ]] && continue
|
|
[[ $line =~ ^(menu|panel|audio|ipc)\ [^[:space:]]+$ ]] || fail "shortcuts lines are a kind and a target: $line"
|
|
if [[ $line == ipc\ * ]]; then
|
|
[[ $line =~ ^ipc\ (media|notifications)\.[A-Za-z]+$ ]] || fail "ipc shortcuts name a mapped target and method: $line"
|
|
fi
|
|
done <"$shortcuts"
|
|
grep -q 'path: shell.omarchyPath + "/default/omarchy/shortcuts"' "$ROOT/shell/shell.qml" ||
|
|
fail "the shell registers the shortcuts the helpers bind"
|
|
grep -q 'paths.omarchy_path .. "/default/omarchy/shortcuts"' "$ROOT/default/hypr/helpers.lua" ||
|
|
fail "the helpers bind the shortcuts the shell registers"
|
|
# An ipc shortcut runs the service's own IPC handler, so it behaves exactly as
|
|
# the omarchy-shell call it replaces.
|
|
for service in services/media notifications; do
|
|
grep -Pzq 'function runShortcut\(method\) \{\n if \(typeof ipcHandler\[method\] !== "function"\) return false\n ipcHandler\[method\]\(\)' "$ROOT/shell/plugins/$service/Service.qml" ||
|
|
fail "$service runs ipc shortcuts through its IPC handler"
|
|
grep -Pzq 'IpcHandler \{\n id: ipcHandler' "$ROOT/shell/plugins/$service/Service.qml" ||
|
|
fail "$service names its IPC handler for shortcuts"
|
|
done
|
|
pass "the shell and the helpers share one shortcut list"
|
|
|
|
# Every default menu binding target is a real menu route.
|
|
run_node_test <<'JS'
|
|
const fs = require('fs')
|
|
const menu = requireFromRoot('shell/plugins/menu/MenuModel.js')
|
|
const entries = menu.parseMenuJsonc(fs.readFileSync(path.join(root, 'default/omarchy/omarchy-menu.jsonc'), 'utf8'))
|
|
const items = {}
|
|
const order = []
|
|
for (const entry of entries) { items[entry.id] = entry; order.push(entry.id) }
|
|
items.root = items.root || { id: 'root' }
|
|
|
|
const lines = fs.readFileSync(path.join(root, 'default/omarchy/shortcuts'), 'utf8').split('\n')
|
|
for (const line of lines) {
|
|
const match = /^menu (\S+)$/.exec(line)
|
|
if (!match) continue
|
|
const route = match[1]
|
|
assert(route === 'root' || items[menu.resolveRoute(items, order, route)], `shortcut menu route resolves: ${route}`)
|
|
}
|
|
JS
|
|
pass "every shortcut menu route resolves in the menu"
|