Reworking Keymaps

wdgt_table.go

@@ -52,7 +52,7 @@ type Table struct {
 
 	columnWidths []int
 
-	keyMap, customKeyMap KeyMap
+	keyMap *KeyMap
 }
 
 var _ Widget = (*Table)(nil)
@@ -85,36 +85,20 @@ func (w *Table) Init(id string, style tcell.Style) {
 	w.border = wh.BRD_CSIMPLE
 	w.focusable = true
 	w.keyMap = BlankKeyMap()
-	w.customKeyMap = BlankKeyMap()
 }
 func (w *Table) Id() string { return w.id }
 func (w *Table) HandleResize(ev *tcell.EventResize) {
 	w.w, w.h = ev.Size()
 }
 
-func (w *Table) SetKeyMap(km KeyMap, def bool) {
-	if def {
-		w.keyMap = km
-	} else {
-		w.customKeyMap = km
-	}
-}
-func (w *Table) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
-func (w *Table) RemoveFromKeyMap(km KeyMap) {
-	for k := range km.Keys {
-		w.customKeyMap.Remove(k)
-	}
-	for r := range km.Runes {
-		w.customKeyMap.RemoveRune(r)
-	}
-}
+func (w *Table) GetKeyMap() *KeyMap   { return w.keyMap }
+func (w *Table) SetKeyMap(km *KeyMap) { w.keyMap = km }
 
 func (w *Table) HandleKey(ev *tcell.EventKey) bool {
 	if !w.active {
 		return false
 	}
-	b1, b2 := w.keyMap.Handle(ev), w.customKeyMap.Handle(ev)
-	return b1 || b2
+	return w.keyMap.Handle(ev)
 }
 func (w *Table) HandleTime(ev *tcell.EventTime) {}
 func (w *Table) Draw(screen tcell.Screen) {