Reworking Keymaps

wdgt_spinner.go

@@ -36,7 +36,7 @@ type Spinner struct {
 	frames       []rune
 	lastTick     time.Time
 	tickInterval time.Duration
-	keyMap       KeyMap
+	keyMap       *KeyMap
 }
 
 var _ Widget = (*Spinner)(nil)
@@ -60,16 +60,10 @@ func (w *Spinner) Init(id string, st tcell.Style) {
 }
 func (w *Spinner) Id() string                         { return w.id }
 func (w *Spinner) HandleResize(ev *tcell.EventResize) {}
-func (w *Spinner) SetKeyMap(km KeyMap, def bool)      { w.keyMap = km }
-func (w *Spinner) AddToKeyMap(km KeyMap)              { w.keyMap.Merge(km) }
-func (w *Spinner) RemoveFromKeyMap(km KeyMap) {
-	for k := range km.Keys {
-		w.keyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.keyMap.RemoveRune(r)
-	}
-}
+
+func (w *Spinner) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *Spinner) SetKeyMap(km *KeyMap) { w.keyMap = km }
+
 func (w *Spinner) HandleKey(ev *tcell.EventKey) bool { return false }
 func (w *Spinner) HandleTime(ev *tcell.EventTime) {
 	w.currentFrame = (w.currentFrame + 1) % len(w.frames)