bindings: Add capability to unregister user defined raw escape sequence

zyedidia · Oct 15, 2023 · c04e8fa · c04e8fa
1 parent 07ab1c2
commit c04e8fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/internal/action/bindings.go b/internal/action/bindings.go
@@ -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) {
@@ -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
@@ -258,9 +261,6 @@ func TryBindKey(k, v string, overwrite bool) (bool, error) {
 			return false, errors.New("Error reading bindings.json: " + err.Error())
 		}
 
-		// Convert possible received string of raw escape sequence
-		k = strings.ReplaceAll(k, "\\x1b", "\x1b")
-
 		key, err := findEvent(k)
 		if err != nil {
 			return false, err
@@ -325,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"])

diff --git a/internal/action/command.go b/internal/action/command.go
@@ -660,6 +660,9 @@ func (h *BufPane) BindCmd(args []string) {
 		return
 	}
 
+	// Convert possible received string of raw escape sequence
+	args[0] = strings.ReplaceAll(args[0], "\\x1b", "\x1b")
+
 	_, err := TryBindKey(args[0], args[1], true)
 	if err != nil {
 		InfoBar.Error(err)
@@ -673,6 +676,9 @@ func (h *BufPane) UnbindCmd(args []string) {
 		return
 	}
 
+	// Convert possible received string of raw escape sequence
+	args[0] = strings.ReplaceAll(args[0], "\\x1b", "\x1b")
+
 	err := UnbindKey(args[0])
 	if err != nil {
 		InfoBar.Error(err)