1 files changed, 51 insertions, 5 deletions
diff --git a/toolkit/gocui/keybindings.go b/toolkit/gocui/keybindings.go
index cf948fe..dbe1fe2 100644
--- a/toolkit/gocui/keybindings.go
+++ b/toolkit/gocui/keybindings.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+	"os"
 	"github.com/awesome-gocui/gocui"
 	"git.wit.org/wit/gui/toolkit"
 )
@@ -21,7 +22,7 @@ func defaultKeybindings(g *gocui.Gui) error {
 	if err := g.SetKeybinding("", gocui.MouseRelease, gocui.ModNone, mouseUp); err != nil {
 		return err
 	}
-	if err := g.SetKeybinding("", gocui.MouseLeft, gocui.ModNone, globalDown); err != nil {
+	if err := g.SetKeybinding("", gocui.MouseLeft, gocui.ModNone, mouseDown); err != nil {
 		return err
 	}
 	if err := g.SetKeybinding("", gocui.MouseLeft, gocui.ModMouseCtrl, ctrlDown); err != nil {
@@ -47,7 +48,7 @@ func addDebugKeys(g *gocui.Gui) {
 		func(g *gocui.Gui, v *gocui.View) error {
 			log(logNow, "gocui.SetKeyBinding() dumpTree() START")
 			// me.rootNode.dumpTree(true)
-			fakeStartWidth = me.DevelOffsetW
+			fakeStartWidth = me.FakeW
 			fakeStartHeight = me.TabH + me.FramePadH
 			if (showDebug) {
 				me.rootNode.showFake()
@@ -59,6 +60,12 @@ func addDebugKeys(g *gocui.Gui) {
 			return nil
 	})
 
+	// display the help menu
+	g.SetKeybinding("", '?', gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			helplayout()
+			return nil
+	})
 	// hide all widgets
 	g.SetKeybinding("", 'h', gocui.ModNone,
 		func(g *gocui.Gui, v *gocui.View) error {
@@ -73,6 +80,26 @@ func addDebugKeys(g *gocui.Gui) {
 			return nil
 	})
 
+	// list all widgets
+	g.SetKeybinding("", 'L', gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			me.rootNode.listWidgets()
+			return nil
+	})
+
+	// log to output window
+	g.SetKeybinding("", 'o', gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			if me.logStdout.Visible() {
+				me.logStdout.SetVisible(false)
+				setOutput(os.Stdout)
+			} else {
+				me.logStdout.SetVisible(true)
+				setOutput(me.logStdout.tk)
+			}
+			return nil
+	})
+
 	// exit
 	g.SetKeybinding("", 'q', gocui.ModNone,
 		func(g *gocui.Gui, v *gocui.View) error {
@@ -86,9 +113,28 @@ func addDebugKeys(g *gocui.Gui) {
 	})
 	g.SetKeybinding("", gocui.KeyCtrlD, gocui.ModNone,
 		func(g *gocui.Gui, v *gocui.View) error {
-			var a toolkit.Action
-			a.ActionType = toolkit.EnableDebug
-			me.callback <- a
+			if (showDebug) {
+				var a toolkit.Action
+				a.B = true
+				a.ActionType = toolkit.EnableDebug
+				me.callback <- a
+				logInfo = true
+				logVerbose = true
+			} else {
+				logInfo = false
+				logVerbose = false
+			}
+			return nil
+	})
+	g.SetKeybinding("", gocui.KeyCtrlV, gocui.ModNone,
+		func(g *gocui.Gui, v *gocui.View) error {
+			if (logVerbose) {
+				logInfo = false
+				logVerbose = false
+			} else {
+				logInfo = true
+				logVerbose = true
+			}
 			return nil
 	})