Wonkiness on layout

wdgt_cli.go

@@ -54,7 +54,7 @@ type Cli struct {
 
 	commands []*CliCommand
 
-	keyMap KeyMap
+	keyMap, customKeyMap KeyMap
 }
 
 // TODO: Fix Command/SubCommand finding
@@ -81,14 +81,20 @@ func (w *Cli) HandleResize(ev *tcell.EventResize) {
 	}
 }
 
-func (w *Cli) SetKeyMap(km KeyMap)   { w.keyMap = km }
-func (w *Cli) AddToKeyMap(km KeyMap) { w.keyMap.Merge(km) }
+func (w *Cli) SetKeyMap(km KeyMap, def bool) {
+	if def {
+		w.keyMap = km
+	} else {
+		w.customKeyMap = km
+	}
+}
+func (w *Cli) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
 func (w *Cli) RemoveFromKeyMap(km KeyMap) {
 	for k := range km.Keys {
-		w.keyMap.Remove(k)
+		w.customKeyMap.Remove(k)
 	}
 	for r := range km.Runes {
-		w.keyMap.RemoveRune(r)
+		w.customKeyMap.RemoveRune(r)
 	}
 }
 
@@ -108,7 +114,8 @@ func (w *Cli) HandleKey(ev *tcell.EventKey) bool {
 			w.value = w.value[:w.cursor] + w.value[w.cursor+1:]
 		}
 	}
-	if ok := w.keyMap.Handle(ev); ok {
+	b1, b2 := w.keyMap.Handle(ev), w.customKeyMap.Handle(ev)
+	if b1 || b2 {
 		return true
 	}