Reworking Keymaps

wdgt_alert.go

@@ -44,7 +44,7 @@ type Alert struct {
 	btnLayout        *LinearLayout
 	btnOk, btnCancel *Button
 
-	keyMap, customKeyMap KeyMap
+	keyMap *KeyMap
 
 	logger func(string, ...any)
 }
@@ -82,15 +82,14 @@ func (w *Alert) Init(id string, style tcell.Style) {
 	w.btnOk.SetActive(true)
 	w.btnLayout.Add(w.btnOk)
 
-	w.keyMap = NewKeyMap(map[tcell.Key]func(ev *tcell.EventKey) bool{
-		tcell.KeyTab:   w.SelectNext,
-		tcell.KeyRight: w.SelectNext,
-		tcell.KeyDown:  w.SelectNext,
-		tcell.KeyLeft:  w.SelectNext,
-		tcell.KeyUp:    w.SelectNext,
-		tcell.KeyEnter: w.Do,
-	})
-	w.customKeyMap = BlankKeyMap()
+	w.keyMap = NewKeyMap(
+		NewKey(BuildEK(tcell.KeyTab), w.SelectNext),
+		NewKey(BuildEK(tcell.KeyRight), w.SelectNext),
+		NewKey(BuildEK(tcell.KeyDown), w.SelectNext),
+		NewKey(BuildEK(tcell.KeyLeft), w.SelectNext),
+		NewKey(BuildEK(tcell.KeyUp), w.SelectNext),
+		NewKey(BuildEK(tcell.KeyEnter), w.Do),
+	)
 	w.focusable = true
 }
 func (w *Alert) Id() string { return w.id }
@@ -101,36 +100,14 @@ func (w *Alert) HandleResize(ev *tcell.EventResize) {
 	w.layout.HandleResize(tcell.NewEventResize(w.w-2, w.h-2))
 }
 
-func (w *Alert) SetKeyMap(km KeyMap, def bool) {
-	if def {
-		w.keyMap = km
-	} else {
-		w.customKeyMap = km
-	}
-}
-
-func (w *Alert) AddToKeyMap(km KeyMap) {
-	w.customKeyMap.Merge(km)
-}
-
-func (w *Alert) RemoveFromKeyMap(km KeyMap) {
-	for k := range km.Keys {
-		w.keyMap.Remove(k)
-		w.customKeyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.keyMap.RemoveRune(r)
-		w.customKeyMap.RemoveRune(r)
-	}
-}
+func (w *Alert) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *Alert) SetKeyMap(km *KeyMap) { w.keyMap = km }
 
 func (w *Alert) HandleKey(ev *tcell.EventKey) bool {
 	if !w.active {
 		return false
 	}
-	b1 := w.keyMap.Handle(ev)
-	b2 := w.customKeyMap.Handle(ev)
-	return b1 || b2
+	return w.keyMap.Handle(ev)
 }
 
 func (w *Alert) HandleTime(ev *tcell.EventTime) {