Reworking Keymaps

wdgt_menu_item.go

@@ -51,7 +51,7 @@ type MenuItem struct {
 	expanded     bool
 	disabled     bool
 
-	keyMap, customKeyMap KeyMap
+	keyMap *KeyMap
 }
 
 var _ Widget = (*MenuItem)(nil)
@@ -66,19 +66,18 @@ func (w *MenuItem) 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.KeyUp:   w.MoveUp,
-		tcell.KeyDown: w.MoveDown,
-		tcell.KeyEnter: func(ev *tcell.EventKey) bool {
+	w.keyMap = NewKeyMap(
+		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()
 			} else if len(w.items) > w.cursor && w.items[w.cursor].HandleKey(ev) {
 				return true
 			}
 			return false
-		},
-	})
-	w.customKeyMap = BlankKeyMap()
+		}),
+	)
 
 	for i := range w.items {
 		w.items[i].SetActive(i == w.cursor)
@@ -91,22 +90,8 @@ func (w *MenuItem) HandleResize(ev *tcell.EventResize) {
 	// TODO: Trickle-down HandleResize
 }
 
-func (w *MenuItem) SetKeyMap(km KeyMap, def bool) {
-	if def {
-		w.keyMap = km
-	} else {
-		w.customKeyMap = km
-	}
-}
-func (w *MenuItem) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
-func (w *MenuItem) RemoveFromKeyMap(km KeyMap) {
-	for k := range km.Keys {
-		w.customKeyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.customKeyMap.RemoveRune(r)
-	}
-}
+func (w *MenuItem) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *MenuItem) SetKeyMap(km *KeyMap) { w.keyMap = km }
 
 func (w *MenuItem) HandleKey(ev *tcell.EventKey) bool {
 	if !w.active {
@@ -127,8 +112,7 @@ func (w *MenuItem) HandleKey(ev *tcell.EventKey) bool {
 		}
 	}
 	// Look for a sub-item that's selected
-	b1, b2 := w.keyMap.Handle(ev), w.customKeyMap.Handle(ev)
-	return b1 || b2
+	return w.keyMap.Handle(ev)
 }
 
 func (w *MenuItem) HandleTime(ev *tcell.EventTime) {