From 8e991054e7e0306773939fa47d5f6f29af24bed6 Mon Sep 17 00:00:00 2001
From: tkarrass <tkarrass@bitsetter.de>
Date: Sat, 6 Feb 2016 11:11:09 +0100
Subject: [PATCH] Basic minimalistic frame pushing

---
 cmd/client.go  | 24 ++++++++++++++----------
 cmd/server.go  |  5 ++---
 data/screen.go | 25 +++++++++++++++++++++----
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/cmd/client.go b/cmd/client.go
index 76e4cfd..687b8ac 100644
--- a/cmd/client.go
+++ b/cmd/client.go
@@ -42,13 +42,14 @@ func render() {
 }
 
 func runClient(cmd *cobra.Command, args []string) {
-	data.InitNC()
-	defer data.ExitNC()
-
 	c := make(chan os.Signal)
 	signal.Notify(c, os.Interrupt, os.Kill)
 	signal.Notify(c, syscall.SIGTERM)
 
+	data.InitNC(c)
+	// really important???
+	defer data.ExitNC()
+
 	fmt.Println("running client ...")
 
 	if len(args) < 1 {
@@ -67,13 +68,6 @@ func runClient(cmd *cobra.Command, args []string) {
 	go render()
 	run := true
 	for run {
-		// block until sigkill:
-		select {
-		case <-c:
-			// funzt noch nicht:
-			run = false
-		default:
-		}
 		var oFrame data.Frame
 		// always use new decoder - reusing may lead to errors
 		gd := gob.NewDecoder(con)
@@ -83,6 +77,16 @@ func runClient(cmd *cobra.Command, args []string) {
 			run = false
 		}
 		renderQueue <- oFrame
+
+		select {
+		case <-c:
+			// funzt noch nicht:
+			run = false
+		default:
+			if data.GetChar() != 0 {
+				data.ExitNC()
+			}
+		}
 	}
 
 }
diff --git a/cmd/server.go b/cmd/server.go
index 7c6a97a..436c69a 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -68,11 +68,10 @@ func serveClients() {
 			if id > 0 {
 				enc := gob.NewEncoder(client.con)
 				enc.Encode(oFrame)
-				log.Println("ID:", id, "Client:", client)
-
+				//log.Println("ID:", id, "Client:", client)
 			}
 		}
-		time.Sleep(time.Second)
+		time.Sleep(time.Second / 25)
 	}
 }
 
diff --git a/data/screen.go b/data/screen.go
index d28e423..f5b04dd 100644
--- a/data/screen.go
+++ b/data/screen.go
@@ -9,7 +9,8 @@ import (
 )
 
 var (
-	win *nc.Window
+	win    *nc.Window
+	ncquit = make(chan bool)
 )
 
 func RenderFrame(f *Frame) {
@@ -19,20 +20,36 @@ func RenderFrame(f *Frame) {
 	}
 }
 
-func InitNC() {
+func InitNC(killchan chan<- os.Signal) {
 	var err error
 	win, err = nc.Init()
 	if err != nil {
 		log.Fatal(err)
 		os.Exit(1)
 	}
+	win.Timeout(1)
+	go func() {
+		select {
+		case <-ncquit:
+			log.Println("Exiting NC")
+			killchan <- os.Kill
+		}
+	}()
 }
 
 func ExitNC() {
 	//if win != nil {
-
-	//	}
 	nc.End()
+	ncquit <- true
+	//	}
+}
+
+func GetChar() int {
+	if win != nil {
+		k := win.GetChar()
+		return int(k)
+	}
+	return 0
 }
 
 func TestNC() (int, int) {