Fix EventStream.match randomness behaviour

block_main.go

@@ -1,19 +0,0 @@
-// +build ignore
-
-package main
-
-import "github.com/gizak/termui"
-
-func main() {
-	termui.Init()
-
-	termui.UseTheme("helloworld")
-	b := termui.NewBlock()
-	b.Width = 20
-	b.Height = 30
-	b.BorderLabel = "[HELLO](fg-red,bg-white) [WORLD](fg-blue,bg-green)"
-
-	termui.Render(b)
-	<-termui.EventCh()
-	termui.Close()
-}

events.go

@@ -9,8 +9,8 @@
 package termui
 
 import (
+	"path"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
 
@@ -145,32 +145,12 @@ func NewSysEvtCh() chan Event {
 
 var DefaultEvtStream = NewEvtStream()
 
-/*
-type evtCtl struct {
-	in      chan Event
-	out     chan Event
-	suspend chan int
-	recover chan int
-	close   chan int
-}
-
-func newEvtCtl() evtCtl {
-	ec := evtCtl{}
-	ec.in = make(chan Event)
-	ec.suspend = make(chan int)
-	ec.recover = make(chan int)
-	ec.close = make(chan int)
-	ec.out = make(chan Event)
-	return ec
-}
-
-*/
-//
 type EvtStream struct {
+	sync.RWMutex
 	srcMap      map[string]chan Event
 	stream      chan Event
 	wg          sync.WaitGroup
-	sigStopLoop chan int
+	sigStopLoop chan Event
 	Handlers    map[string]func(Event)
 }