Reworking Keymaps

wdgt_timefield.go

@@ -57,8 +57,8 @@ type TimeField struct {
 
 	widgets []Widget
 
-	cursor               int
-	keyMap, customKeyMap KeyMap
+	cursor int
+	keyMap *KeyMap
 }
 
 // TODO: Allow changing the format.
@@ -87,11 +87,10 @@ func (w *TimeField) Init(id string, style tcell.Style) {
 		w.fldHour, w.fldMinute, w.fldSecond, w.btnNow,
 	)
 
-	w.keyMap = NewKeyMap(map[tcell.Key]func(ev *tcell.EventKey) bool{
-		tcell.KeyHome: w.handleHome,
-		tcell.KeyEnd:  w.handleEnd,
-	})
-	w.customKeyMap = BlankKeyMap()
+	w.keyMap = NewKeyMap(
+		NewKey(BuildEK(tcell.KeyHome), w.handleHome),
+		NewKey(BuildEK(tcell.KeyEnd), w.handleEnd),
+	)
 	w.visible = true
 	w.focusable = true
 }
@@ -139,22 +138,8 @@ func (w *TimeField) HandleResize(ev *tcell.EventResize) {
 	}
 }
 
-func (w *TimeField) SetKeyMap(km KeyMap, def bool) {
-	if def {
-		w.keyMap = km
-	} else {
-		w.customKeyMap = km
-	}
-}
-func (w *TimeField) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
-func (w *TimeField) RemoveFromKeyMap(km KeyMap) {
-	for k := range km.Keys {
-		w.customKeyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.customKeyMap.RemoveRune(r)
-	}
-}
+func (w *TimeField) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *TimeField) SetKeyMap(km *KeyMap) { w.keyMap = km }
 
 func (w *TimeField) HandleKey(ev *tcell.EventKey) bool {
 	if !w.active {
@@ -162,8 +147,7 @@ func (w *TimeField) HandleKey(ev *tcell.EventKey) bool {
 	} else if ev.Key() == tcell.KeyTab {
 		return w.handleTab(ev)
 	}
-	b1, b2 := w.keyMap.Handle(ev), w.customKeyMap.Handle(ev)
-	if b1 || b2 {
+	if w.keyMap.Handle(ev) {
 		return true
 	}
 	if w.cursor <= len(w.widgets) {