Reworking Keymaps

wdgt_checkbox.go

@@ -45,8 +45,8 @@ type Checkbox struct {
 	x, y      int
 	w, h      int
 
-	keyMap, customKeyMap KeyMap
-	stateRunes           []rune
+	keyMap     *KeyMap
+	stateRunes []rune
 }
 
 var _ Widget = (*Checkbox)(nil)
@@ -63,43 +63,22 @@ func (w *Checkbox) Init(id string, style tcell.Style) {
 	w.visible = true
 	w.stateRunes = []rune{'X', ' ', '-'}
 	w.focusable = true
-	w.keyMap = KeyMap{
-		Keys: map[tcell.Key]func(ev *tcell.EventKey) bool{
-			tcell.KeyEnter: w.ToggleState,
-		},
-		Runes: map[rune]func(ev *tcell.EventKey) bool{
-			' ': w.ToggleState,
-		},
-	}
-	w.customKeyMap = BlankKeyMap()
+	w.keyMap = NewKeyMap(
+		NewKey(BuildEK(tcell.KeyEnter), w.ToggleState),
+		NewKey(BuildEKr(' '), w.ToggleState),
+	)
 }
 func (w *Checkbox) Id() string                         { return w.id }
 func (w *Checkbox) HandleResize(ev *tcell.EventResize) { w.w, w.h = ev.Size() }
 
-func (w *Checkbox) SetKeyMap(km KeyMap, def bool) {
-	if def {
-		w.keyMap = km
-	} else {
-		w.customKeyMap = km
-	}
-}
-func (w *Checkbox) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
-func (w *Checkbox) RemoveFromKeyMap(km KeyMap) {
-	for k := range km.Keys {
-		w.customKeyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.customKeyMap.RemoveRune(r)
-	}
-}
+func (w *Checkbox) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *Checkbox) SetKeyMap(km *KeyMap) { w.keyMap = km }
 
 func (w *Checkbox) 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 *Checkbox) HandleTime(ev *tcell.EventTime) {}
 func (w *Checkbox) Draw(screen tcell.Screen) {