Reworking Keymaps

wdgt_top_menu_layout.go

@@ -43,8 +43,8 @@ type TopMenuLayout struct {
 	visible   bool
 	focusable bool
 
-	layoutFlags          LayoutFlag
-	keyMap, customKeyMap KeyMap
+	layoutFlags LayoutFlag
+	keyMap      *KeyMap
 
 	logger func(string, ...any)
 }
@@ -68,18 +68,17 @@ func (w *TopMenuLayout) Init(id string, s tcell.Style) {
 	w.menu.SetType(MenuTypeH)
 
 	w.widget = NewBlankWidget("blank")
-	w.keyMap = NewKeyMap(map[tcell.Key]func(ev *tcell.EventKey) bool{
-		tcell.KeyEscape: func(ev *tcell.EventKey) bool {
+	w.keyMap = NewKeyMap(
+		NewKey(BuildEK(tcell.KeyEscape), func(ev *tcell.EventKey) bool {
 			return w.ToggleMenu()
-		},
-	})
-	w.keyMap.AddRune(' ', func(ev *tcell.EventKey) bool {
-		if ev.Modifiers()&tcell.ModAlt != 0 {
-			return w.ToggleMenu()
-		}
-		return false
-	})
-	w.customKeyMap = BlankKeyMap()
+		}),
+		NewKey(BuildEKr(' '), func(ev *tcell.EventKey) bool {
+			if ev.Modifiers()&tcell.ModAlt != 0 {
+				return w.ToggleMenu()
+			}
+			return false
+		}),
+	)
 }
 
 func (w *TopMenuLayout) ToggleMenu() bool {
@@ -122,29 +121,14 @@ func (w *TopMenuLayout) HandleResize(ev *tcell.EventResize) {
 	}
 }
 
-func (w *TopMenuLayout) SetKeyMap(km KeyMap, def bool) {
-	if def {
-		w.keyMap = km
-	} else {
-		w.customKeyMap = km
-	}
-}
-func (w *TopMenuLayout) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
-func (w *TopMenuLayout) RemoveFromKeyMap(km KeyMap) {
-	for k := range km.Keys {
-		w.customKeyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.customKeyMap.RemoveRune(r)
-	}
-}
+func (w *TopMenuLayout) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *TopMenuLayout) SetKeyMap(km *KeyMap) { w.keyMap = km }
 
 func (w *TopMenuLayout) HandleKey(ev *tcell.EventKey) bool {
 	if !w.active {
 		return false
 	}
-	b1, b2 := w.keyMap.Handle(ev), w.customKeyMap.Handle(ev)
-	if b1 || b2 {
+	if w.keyMap.Handle(ev) {
 		return true
 	}
 	if w.menu != nil && w.menu.Active() {