Skip to content

bindings: Allow raw escape sequence to be bound with bind #2959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmaluka merged 2 commits into from
Mar 14, 2024
Merged

bindings: Allow raw escape sequence to be bound with bind #2959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcc7205
bindings: Allow raw escape sequence to be bound with `bind`
JoeKar Oct 11, 2023
6fa1274
bindings: Add capability to unregister user defined raw escape sequence
JoeKar Oct 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion internal/action/bindings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ func BindKey(k, v string, bind func(e Event, a string)) {
return
}

if strings.HasPrefix(k, "\x1b") {
screen.Screen.RegisterRawSeq(k)
}

bind(event, v)

// switch e := event.(type) {
Expand Down Expand Up @@ -153,7 +157,6 @@ modSearch:
k = k[5:]
modifiers |= tcell.ModShift
case strings.HasPrefix(k, "\x1b"):
screen.Screen.RegisterRawSeq(k)
return RawEvent{
esc: k,
}, true
Expand Down Expand Up @@ -322,6 +325,10 @@ func UnbindKey(k string) error {
}
}

if strings.HasPrefix(k, "\x1b") {
screen.Screen.UnregisterRawSeq(k)
}

defaults := DefaultBindings("buffer")
if a, ok := defaults[k]; ok {
BindKey(k, a, Binder["buffer"])
Expand Down
11 changes: 8 additions & 3 deletions internal/action/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,14 +634,19 @@ func (h *BufPane) ShowCmd(args []string) {
InfoBar.Message(option)
}

func parseKeyArg(arg string) string {
// If this is a raw escape sequence, convert it to its raw byte form
return strings.ReplaceAll(arg, "\\x1b", "\x1b")
}

// ShowKeyCmd displays the action that a key is bound to
func (h *BufPane) ShowKeyCmd(args []string) {
if len(args) < 1 {
InfoBar.Error("Please provide a key to show")
return
}

event, err := findEvent(args[0])
event, err := findEvent(parseKeyArg(args[0]))
if err != nil {
InfoBar.Error(err)
return
Expand All @@ -660,7 +665,7 @@ func (h *BufPane) BindCmd(args []string) {
return
}

_, err := TryBindKey(args[0], args[1], true)
_, err := TryBindKey(parseKeyArg(args[0]), args[1], true)
if err != nil {
InfoBar.Error(err)
}
Expand All @@ -673,7 +678,7 @@ func (h *BufPane) UnbindCmd(args []string) {
return
}

err := UnbindKey(args[0])
err := UnbindKey(parseKeyArg(args[0]))
if err != nil {
InfoBar.Error(err)
}
Expand Down