Reworking Keymaps

wdgt_filepicker.go

@@ -49,7 +49,7 @@ type FilePicker struct {
 
 	error error
 
-	keyMap, customKeyMap KeyMap
+	keyMap *KeyMap
 
 	logger func(string, ...any)
 }
@@ -77,7 +77,6 @@ func (w *FilePicker) Init(id string, style tcell.Style) {
 	w.focusable = true
 
 	w.keyMap = BlankKeyMap()
-	w.customKeyMap = BlankKeyMap()
 
 	w.refreshFileList()
 }
@@ -96,30 +95,14 @@ func (w *FilePicker) HandleResize(ev *tcell.EventResize) {
 	w.Log("%s: HandleResize(%d, %d)", w.id, wd, ht)
 }
 
-func (w *FilePicker) SetKeyMap(km KeyMap, def bool) {
-	if def {
-		w.keyMap = km
-	} else {
-		w.customKeyMap = km
-	}
-}
-func (w *FilePicker) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
-func (w *FilePicker) RemoveFromKeyMap(km KeyMap) {
-	for k := range km.Keys {
-		w.customKeyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.customKeyMap.RemoveRune(r)
-	}
-}
+func (w *FilePicker) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *FilePicker) SetKeyMap(km *KeyMap) { w.keyMap = km }
 
 func (w *FilePicker) 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 *FilePicker) HandleTime(ev *tcell.EventTime) {