Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-07 19:59:14 -04:00
Code Packages Releases Activity

refactor(Hyprland): updated the default close/kill keybinds for lua

Browse Source
This commit is contained in:
purian23
2026-06-02 23:16:05 -04:00
parent d2905072c0
commit d51b34797c
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/internal/config/embedded/hypr-binds.lua
+1 -1
View File
@@ -38,7 +38,7 @@ hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd([[dms ipc call brightness increme
hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd([[dms ipc call brightness decrement 5 ""]]), { locked = true, repeating = true }) hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd([[dms ipc call brightness decrement 5 ""]]), { locked = true, repeating = true })
-- === Window Management === -- === Window Management ===
hl.bind("SUPER + Q", hl.dsp.window.kill()) hl.bind("SUPER + Q", hl.dsp.window.close())
hl.bind("SUPER + F", hl.dsp.window.fullscreen({ mode = "maximized", action = "toggle" })) hl.bind("SUPER + F", hl.dsp.window.fullscreen({ mode = "maximized", action = "toggle" }))
hl.bind("SUPER + SHIFT + F", hl.dsp.window.fullscreen({ mode = "fullscreen", action = "toggle" })) hl.bind("SUPER + SHIFT + F", hl.dsp.window.fullscreen({ mode = "fullscreen", action = "toggle" }))
hl.bind("SUPER + SHIFT + T", hl.dsp.window.float({ action = "toggle" })) hl.bind("SUPER + SHIFT + T", hl.dsp.window.float({ action = "toggle" }))
core/internal/keybinds/providers/hyprland.go
+1 -1
View File
@@ -732,7 +732,7 @@ func luaActionStringFromKnownHyprlandAction(action string) (string, bool) {
case "execr": case "execr":
return fmt.Sprintf(`hl.dsp.exec_raw(%s)`, strconv.Quote(params)), true return fmt.Sprintf(`hl.dsp.exec_raw(%s)`, strconv.Quote(params)), true
case "killactive": case "killactive":
return `hl.dsp.window.kill()`, true return `hl.dsp.window.close()`, true
case "forcekillactive": case "forcekillactive":
return `hl.dsp.window.kill()`, true return `hl.dsp.window.kill()`, true
case "closewindow": case "closewindow":
core/internal/keybinds/providers/hyprland_parser.go
+2 -2
View File
@@ -1074,7 +1074,7 @@ func luaExprToDispatcherParams(expr string) (dispatcher, params string) {
if arg := luaCallStringArgValue(expr, "hl.dsp.window.close"); arg != "" { if arg := luaCallStringArgValue(expr, "hl.dsp.window.close"); arg != "" {
return "closewindow", arg return "closewindow", arg
} }
return "closewindow", "" return "killactive", ""
case strings.HasPrefix(expr, "hl.dsp.window.kill("): case strings.HasPrefix(expr, "hl.dsp.window.kill("):
if window := luaTableStringField(expr, "window"); window != "" { if window := luaTableStringField(expr, "window"); window != "" {
return "killwindow", window return "killwindow", window
@@ -1082,7 +1082,7 @@ func luaExprToDispatcherParams(expr string) (dispatcher, params string) {
if arg := luaCallStringArgValue(expr, "hl.dsp.window.kill"); arg != "" { if arg := luaCallStringArgValue(expr, "hl.dsp.window.kill"); arg != "" {
return "killwindow", arg return "killwindow", arg
} }
return "killactive", "" return "forcekillactive", ""
case strings.HasPrefix(expr, "hl.dsp.window.fullscreen("): case strings.HasPrefix(expr, "hl.dsp.window.fullscreen("):
switch luaTableStringField(expr, "mode") { switch luaTableStringField(expr, "mode") {
case "maximized", "maximize": case "maximized", "maximize":
core/internal/keybinds/providers/hyprland_parser_test.go
+4
View File
@@ -75,6 +75,8 @@ func TestHyprlandLuaBindRoundTripHelpers(t *testing.T) {
{`hl.dispatch([[customdispatcher arg one]])`, "customdispatcher", "arg one"}, {`hl.dispatch([[customdispatcher arg one]])`, "customdispatcher", "arg one"},
{`hl.dsp.window.fullscreen({ mode = "maximized", action = "toggle" })`, "fullscreen", "1"}, {`hl.dsp.window.fullscreen({ mode = "maximized", action = "toggle" })`, "fullscreen", "1"},
{`hl.dsp.window.float({ action = "on" })`, "setfloating", ""}, {`hl.dsp.window.float({ action = "on" })`, "setfloating", ""},
{`hl.dsp.window.close()`, "killactive", ""},
{`hl.dsp.window.kill()`, "forcekillactive", ""},
{`hl.dsp.window.close({ window = "class:^(kitty)$" })`, "closewindow", "class:^(kitty)$"}, {`hl.dsp.window.close({ window = "class:^(kitty)$" })`, "closewindow", "class:^(kitty)$"},
{`hl.dsp.focus({ workspace = "e+1" })`, "workspace", "e+1"}, {`hl.dsp.focus({ workspace = "e+1" })`, "workspace", "e+1"},
{`hl.dsp.focus({ workspace = "2", on_current_monitor = true })`, "focusworkspaceoncurrentmonitor", "2"}, {`hl.dsp.focus({ workspace = "2", on_current_monitor = true })`, "focusworkspaceoncurrentmonitor", "2"},
@@ -162,6 +164,8 @@ func TestLuaActionStringFromHyprlangActionUsesNativeDispatchers(t *testing.T) {
action string action string
want string want string
}{ }{
{"killactive", `hl.dsp.window.close()`},
{"forcekillactive", `hl.dsp.window.kill()`},
{"workspace 1", `hl.dsp.focus({ workspace = "1" })`}, {"workspace 1", `hl.dsp.focus({ workspace = "1" })`},
{"movetoworkspace 2", `hl.dsp.window.move({ workspace = "2" })`}, {"movetoworkspace 2", `hl.dsp.window.move({ workspace = "2" })`},
{"movetoworkspacesilent special:magic", `hl.dsp.window.move({ workspace = "special:magic", follow = false })`}, {"movetoworkspacesilent special:magic", `hl.dsp.window.move({ workspace = "special:magic", follow = false })`},