Re-bind Q to quit on all but the nickname scene

pkg/client/engine.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"reflect"
 	"time"
+	"unicode"
 
 	"github.com/gorilla/websocket"
 	"github.com/nsf/termbox-go"
@@ -73,7 +74,7 @@ func Run() (err error) {
 		case event := <-terminalEvents:
 			log.Printf("Received terminal event (type=%d)", event.Type)
 
-			if shouldInterrupt(event) {
+			if shouldInterrupt(event, currentScene) {
 				log.Println("Interrupting terminal")
 				termbox.Interrupt()
 
@@ -178,7 +179,11 @@ func receiveMessages(c *websocket.Conn, messageQueue chan<- common.AnyMessage, m
 	}
 }
 
-func shouldInterrupt(event termbox.Event) bool {
+func shouldInterrupt(event termbox.Event, scene scenes.Scene) bool {
+	if unicode.ToLower(event.Ch) == 'q' && !scene.HasFreeKeyboardInput() {
+		return true
+	}
+
 	return event.Key == termbox.KeyCtrlC || event.Key == termbox.KeyEsc
 }
 

pkg/client/scenes/nickname.go

@@ -114,6 +114,10 @@ func (n *Nickname) Draw() {
 	setCursor(offset(center, cursorX, 4))
 }
 
+func (n *Nickname) HasFreeKeyboardInput() bool {
+	return true
+}
+
 func (n *Nickname) load() error {
 	configPath, err := n.configPath()
 	if err != nil {

pkg/client/scenes/scene.go

@@ -14,6 +14,7 @@ type Scene interface {
 	OnTerminalEvent(event termbox.Event) error
 	Tick() bool
 	Draw()
+	HasFreeKeyboardInput() bool
 }
 
 // types for Scene setup method.
@@ -45,3 +46,7 @@ func (s *scene) Tick() bool {
 	// Default implementation is a no-op.
 	return false
 }
+
+func (s *scene) HasFreeKeyboardInput() bool {
+	return false
+}