Reworking Keymaps

wdgt_menu.go

@@ -47,7 +47,7 @@ type Menu struct {
 	expanded     bool
 	vimMode      bool
 
-	keyMap, customKeyMap KeyMap
+	keyMap *KeyMap
 }
 
 type MenuType int
@@ -69,19 +69,18 @@ func (w *Menu) Init(id string, style tcell.Style) {
 	w.id = id
 	w.style = style
 	w.visible = true
-	w.keyMap = NewKeyMap(map[tcell.Key]func(ev *tcell.EventKey) bool{
-		tcell.KeyRight: w.MoveRight,
-		tcell.KeyLeft:  w.MoveLeft,
-		tcell.KeyUp:    w.MoveUp,
-		tcell.KeyDown:  w.MoveDown,
-		tcell.KeyEnter: func(ev *tcell.EventKey) bool {
+	w.keyMap = NewKeyMap(
+		NewKey(BuildEK(tcell.KeyRight), w.MoveRight),
+		NewKey(BuildEK(tcell.KeyLeft), w.MoveLeft),
+		NewKey(BuildEK(tcell.KeyUp), w.MoveUp),
+		NewKey(BuildEK(tcell.KeyDown), w.MoveDown),
+		NewKey(BuildEK(tcell.KeyEnter), func(ev *tcell.EventKey) bool {
 			if w.onPressed != nil {
 				return w.onPressed()
 			}
 			return false
-		},
-	})
-	w.customKeyMap = BlankKeyMap()
+		}),
+	)
 	w.focusable = true
 }
 func (w *Menu) Id() string { return w.id }
@@ -124,22 +123,8 @@ func (w *Menu) handleResizeV(_ *tcell.EventResize) {
 	}
 }
 
-func (w *Menu) SetKeyMap(km KeyMap, def bool) {
-	if def {
-		w.keyMap = km
-	} else {
-		w.customKeyMap = km
-	}
-}
-func (w *Menu) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
-func (w *Menu) RemoveFromKeyMap(km KeyMap) {
-	for k := range km.Keys {
-		w.customKeyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.customKeyMap.RemoveRune(r)
-	}
-}
+func (w *Menu) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *Menu) SetKeyMap(km *KeyMap) { w.keyMap = km }
 
 func (w *Menu) HandleKey(ev *tcell.EventKey) bool {
 	if !w.active {
@@ -152,8 +137,7 @@ func (w *Menu) HandleKey(ev *tcell.EventKey) bool {
 		}
 		return true
 	}
-	b1, b2 := w.keyMap.Handle(ev), w.customKeyMap.Handle(ev)
-	if b1 || b2 {
+	if w.keyMap.Handle(ev) {
 		return true
 	}